Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h (modified) (3 diffs)

code/branches/questsystem5/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;