Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.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/CollisionDispatch/btCollisionDispatcher.h (modified) (5 diffs)

code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h

@@ -14 +14 @@
 */
 
-#ifndef COLLISION__DISPATCHER_H
-#define COLLISION__DISPATCHER_H
+#ifndef BT_COLLISION__DISPATCHER_H
+#define BT_COLLISION__DISPATCHER_H
 
 #include "BulletCollision/BroadphaseCollision/btDispatcher.h"
@@ -43 +43 @@
 class btCollisionDispatcher : public btDispatcher
 {
+
+protected:
+
         int             m_dispatcherFlags;
-        
+
         btAlignedObjectArray<btPersistentManifold*>     m_manifoldsPtr;
 
@@ -65 +68 @@
         {
                 CD_STATIC_STATIC_REPORTED = 1,
-                CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2
+                CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2,
+                CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION = 4
         };
 
@@ -75 +79 @@
         void    setDispatcherFlags(int flags)
         {
-        (void) flags;
-                m_dispatcherFlags = 0;
+                m_dispatcherFlags = flags;
         }
 
@@ -154 +157 @@
         }
 
+        virtual btPoolAllocator*        getInternalManifoldPool()
+        {
+                return m_persistentManifoldPoolAllocator;
+        }
+
+        virtual const btPoolAllocator*  getInternalManifoldPool() const
+        {
+                return m_persistentManifoldPoolAllocator;
+        }
+
 };
 
-#endif //COLLISION__DISPATCHER_H
+#endif //BT_COLLISION__DISPATCHER_H