Changeset 2882 for code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) (3 diffs)

code/trunk/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h

@@ -56 +56 @@
 
         btScalar        m_contactBreakingThreshold;
+        btScalar        m_contactProcessingThreshold;
 
         
@@ -71 +72 @@
         btPersistentManifold();
 
-        btPersistentManifold(void* body0,void* body1,int , btScalar contactBreakingThreshold)
+        btPersistentManifold(void* body0,void* body1,int , btScalar contactBreakingThreshold,btScalar contactProcessingThreshold)
                 : m_body0(body0),m_body1(body1),m_cachedPoints(0),
-                m_contactBreakingThreshold(contactBreakingThreshold)
+                m_contactBreakingThreshold(contactBreakingThreshold),
+                m_contactProcessingThreshold(contactProcessingThreshold)
         {
                 
@@ -112 +114 @@
         ///@todo: get this margin from the current physics / collision environment
         btScalar        getContactBreakingThreshold() const;
+
+        btScalar        getContactProcessingThreshold() const
+        {
+                return m_contactProcessingThreshold;
+        }
         
         int getCacheEntry(const btManifoldPoint& newPoint) const;