Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h (modified) (3 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h

@@ -43 +43 @@
 class btCollisionDispatcher : public btDispatcher
 {
-        int m_count;
+        int             m_dispatcherFlags;
         
         btAlignedObjectArray<btPersistentManifold*>     m_manifoldsPtr;
 
-        bool m_useIslands;
-
-        bool    m_staticWarningReported;
-        
         btManifoldResult        m_defaultManifoldResult;
 
@@ -60 +56 @@
 
         btCollisionAlgorithmCreateFunc* m_doubleDispatch[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES];
-        
 
         btCollisionConfiguration*       m_collisionConfiguration;
@@ -66 +61 @@
 
 public:
+
+        enum DispatcherFlags
+        {
+                CD_STATIC_STATIC_REPORTED = 1,
+                CD_USE_RELATIVE_CONTACT_BREAKING_THRESHOLD = 2
+        };
+
+        int     getDispatcherFlags() const
+        {
+                return m_dispatcherFlags;
+        }
+
+        void    setDispatcherFlags(int flags)
+        {
+        (void) flags;
+                m_dispatcherFlags = 0;
+        }
 
         ///registerCollisionCreateFunc allows registration of custom/alternative collision create functions