Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
- Timestamp:
- May 3, 2011, 5:07:42 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
r8351 r8393 14 14 */ 15 15 16 #ifndef COLLISION__DISPATCHER_H17 #define COLLISION__DISPATCHER_H16 #ifndef BT_COLLISION__DISPATCHER_H 17 #define BT_COLLISION__DISPATCHER_H 18 18 19 19 #include "BulletCollision/BroadphaseCollision/btDispatcher.h" … … 43 43 class btCollisionDispatcher : public btDispatcher 44 44 { 45 46 protected: 47 45 48 int m_dispatcherFlags; 46 49 47 50 btAlignedObjectArray<btPersistentManifold*> m_manifoldsPtr; 48 51 … … 65 68 { 66 69 CD_STATIC_STATIC_REPORTED = 1, 67 CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2 70 CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2, 71 CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION = 4 68 72 }; 69 73 … … 75 79 void setDispatcherFlags(int flags) 76 80 { 77 (void) flags; 78 m_dispatcherFlags = 0; 81 m_dispatcherFlags = flags; 79 82 } 80 83 … … 154 157 } 155 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 156 169 }; 157 170 158 #endif // COLLISION__DISPATCHER_H171 #endif //BT_COLLISION__DISPATCHER_H 159 172
Note: See TracChangeset
for help on using the changeset viewer.