Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (modified) (7 diffs)

code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h

@@ -14 +14 @@
 */
 
-#ifndef _DISPATCHER_H
-#define _DISPATCHER_H
-
+#ifndef BT_DISPATCHER_H
+#define BT_DISPATCHER_H
 #include "LinearMath/btScalar.h"
 
@@ -28 +27 @@
 class btPersistentManifold;
 class btStackAlloc;
+class btPoolAllocator;
 
 struct btDispatcherInfo
@@ -41 +41 @@
                 m_dispatchFunc(DISPATCH_DISCRETE),
                 m_timeOfImpact(btScalar(1.)),
-                m_useContinuous(false),
+                m_useContinuous(true),
                 m_debugDraw(0),
                 m_enableSatConvex(false),
@@ -49 +49 @@
                 m_useConvexConservativeDistanceUtil(false),
                 m_convexConservativeDistanceThreshold(0.0f),
-                m_convexMaxDistanceUseCPT(false),
                 m_stackAllocator(0)
         {
@@ -66 +65 @@
         bool            m_useConvexConservativeDistanceUtil;
         btScalar        m_convexConservativeDistanceThreshold;
-        bool            m_convexMaxDistanceUseCPT;
         btStackAlloc*   m_stackAllocator;
 };
@@ -99 +97 @@
         virtual btPersistentManifold**  getInternalManifoldPointer() = 0;
 
+        virtual btPoolAllocator*        getInternalManifoldPool() = 0;
+
+        virtual const btPoolAllocator*  getInternalManifoldPool() const = 0;
+
         virtual void* allocateCollisionAlgorithm(int size)  = 0;
 
@@ -106 +108 @@
 
 
-#endif //_DISPATCHER_H
+#endif //BT_DISPATCHER_H