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

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.h (modified) (4 diffs)

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

@@ -25 +25 @@
 struct btCollisionResult;
 
-///contact breaking and merging threshold
+///maximum contact breaking and merging threshold
 extern btScalar gContactBreakingThreshold;
 
@@ -55 +55 @@
         int     m_cachedPoints;
 
+        btScalar        m_contactBreakingThreshold;
+
         
         /// sort cached points so most isolated points come first
@@ -69 +71 @@
         btPersistentManifold();
 
-        btPersistentManifold(void* body0,void* body1,int bla)
-                : m_body0(body0),m_body1(body1),m_cachedPoints(0)
+        btPersistentManifold(void* body0,void* body1,int , btScalar contactBreakingThreshold)
+                : m_body0(body0),m_body1(body1),m_cachedPoints(0),
+                m_contactBreakingThreshold(contactBreakingThreshold)
         {
-                (void)bla;
+                
         }
 
@@ -107 +110 @@
         }
 
-        /// todo: get this margin from the current physics / collision environment
+        ///@todo: get this margin from the current physics / collision environment
         btScalar        getContactBreakingThreshold() const;