Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp

Timestamp:

Dec 13, 2008, 11:45:51 PM (16 years ago)

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp (modified) (4 diffs)

code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp

@@ -17 +17 @@
 #include "btPersistentManifold.h"
 #include "LinearMath/btTransform.h"
-#include <assert.h>
+
 
 btScalar                                        gContactBreakingThreshold = btScalar(0.02);
@@ -67 +67 @@
                         }
                 }
-                assert(occurance<=0);
+                btAssert(occurance<=0);
 #endif //DEBUG_PERSISTENCY
 
@@ -165 +165 @@
 int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 {
-        assert(validContactDistance(newPoint));
+        btAssert(validContactDistance(newPoint));
 
         int insertIndex = getNumContacts();
@@ -191 +191 @@
 btScalar        btPersistentManifold::getContactBreakingThreshold() const
 {
-        return gContactBreakingThreshold;
+        return m_contactBreakingThreshold;
 }