Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp

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.cpp (modified) (2 diffs)

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

@@ -93 +93 @@
         } else
         {
-                mem = btAlignedAlloc(sizeof(btPersistentManifold),16);
-
+                //we got a pool memory overflow, by default we fallback to dynamically allocate memory. If we require a contiguous contact pool then assert.
+                if ((m_dispatcherFlags&CD_DISABLE_CONTACTPOOL_DYNAMIC_ALLOCATION)==0)
+                {
+                        mem = btAlignedAlloc(sizeof(btPersistentManifold),16);
+                } else
+                {
+                        btAssert(0);
+                        //make sure to increase the m_defaultMaxPersistentManifoldPoolSize in the btDefaultCollisionConstructionInfo/btDefaultCollisionConfiguration
+                        return 0;
+                }
         }
         btPersistentManifold* manifold = new(mem) btPersistentManifold (body0,body1,0,contactBreakingThreshold,contactProcessingThreshold);
@@ -173 +181 @@
         {
                 //broadphase filtering already deals with this
-                if ((body0->isStaticObject() || body0->isKinematicObject()) &&
-                        (body1->isStaticObject() || body1->isKinematicObject()))
+                if (body0->isStaticOrKinematicObject() && body1->isStaticOrKinematicObject())
                 {
                         m_dispatcherFlags |= btCollisionDispatcher::CD_STATIC_STATIC_REPORTED;