Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h

Timestamp:

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

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h (modified) (2 diffs)

code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h

@@ -47 +47 @@
                 m_useEpa(true),
                 m_allowedCcdPenetration(btScalar(0.04)),
+                m_useConvexConservativeDistanceUtil(true),
+                m_convexConservativeDistanceThreshold(0.0f),
                 m_stackAllocator(0)
         {
@@ -52 +54 @@
         }
         btScalar        m_timeStep;
-        int             m_stepCount;
-        int             m_dispatchFunc;
+        int                     m_stepCount;
+        int                     m_dispatchFunc;
         mutable btScalar        m_timeOfImpact;
-        bool    m_useContinuous;
+        bool            m_useContinuous;
         class btIDebugDraw*     m_debugDraw;
-        bool    m_enableSatConvex;
-        bool    m_enableSPU;
-        bool    m_useEpa;
+        bool            m_enableSatConvex;
+        bool            m_enableSPU;
+        bool            m_useEpa;
         btScalar        m_allowedCcdPenetration;
+        bool            m_useConvexConservativeDistanceUtil;
+        btScalar        m_convexConservativeDistanceThreshold;
         btStackAlloc*   m_stackAllocator;
-        
 };