diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h index e212e520bda..9c548784829 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -64,7 +64,7 @@ subject to the following restrictions: #ifndef COLLISION_WORLD_H #define COLLISION_WORLD_H - +class btStackAlloc; class btCollisionShape; class btBroadphaseInterface; #include "LinearMath/btVector3.h" @@ -88,6 +88,10 @@ protected: btDispatcher* m_dispatcher1; + btDispatcherInfo m_dispatchInfo; + + btStackAlloc* m_stackAlloc; + btOverlappingPairCache* m_broadphasePairCache; bool m_ownsDispatcher; @@ -95,11 +99,8 @@ protected: public: - //this constructor will create and own a dispatcher and paircache and delete it at destruction - btCollisionWorld(); - //this constructor doesn't own the dispatcher and paircache/broadphase - btCollisionWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache); + btCollisionWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache, int stackSize = 2*1024*1024); virtual ~btCollisionWorld(); @@ -237,7 +238,12 @@ public: void removeCollisionObject(btCollisionObject* collisionObject); virtual void performDiscreteCollisionDetection( btDispatcherInfo& dispatchInfo); - + + btDispatcherInfo& getDispatchInfo() + { + return m_dispatchInfo; + } + }; |