← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
13
13
3. This notice may not be removed or altered from any source distribution.
14
14
*/
15
15
 
16
 
#ifndef COLLISION__DISPATCHER_H
17
 
#define COLLISION__DISPATCHER_H
 
16
#ifndef BT_COLLISION__DISPATCHER_H
 
17
#define BT_COLLISION__DISPATCHER_H
18
18
 
19
19
#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
20
20
#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
67
67
        enum DispatcherFlags
68
68
        {
69
69
                CD_STATIC_STATIC_REPORTED = 1,
70
 
                CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2
 
70
                CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2,
 
71
                CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION = 4
71
72
        };
72
73
 
73
74
        int     getDispatcherFlags() const
90
91
 
91
92
        btPersistentManifold**  getInternalManifoldPointer()
92
93
        {
93
 
                return &m_manifoldsPtr[0];
 
94
                return m_manifoldsPtr.size()? &m_manifoldsPtr[0] : 0;
94
95
        }
95
96
 
96
97
         btPersistentManifold* getManifoldByIndexInternal(int index)
155
156
                m_collisionConfiguration = config;
156
157
        }
157
158
 
 
159
        virtual btPoolAllocator*        getInternalManifoldPool()
 
160
        {
 
161
                return m_persistentManifoldPoolAllocator;
 
162
        }
 
163
 
 
164
        virtual const btPoolAllocator*  getInternalManifoldPool() const
 
165
        {
 
166
                return m_persistentManifoldPoolAllocator;
 
167
        }
 
168
 
158
169
};
159
170
 
160
 
#endif //COLLISION__DISPATCHER_H
 
171
#endif //BT_COLLISION__DISPATCHER_H
161
172