Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.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/btManifoldResult.h (modified) (5 diffs)

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

@@ -29 +29 @@
 extern ContactAddedCallback             gContactAddedCallback;
 
+//#define DEBUG_PART_INDEX 1
 
 
@@ -34 +35 @@
 class btManifoldResult : public btDiscreteCollisionDetectorInterface::Result
 {
+protected:
+
         btPersistentManifold* m_manifoldPtr;
 
@@ -51 +54 @@
 
         btManifoldResult()
+#ifdef DEBUG_PART_INDEX
+                :
+        m_partId0(-1),
+        m_partId1(-1),
+        m_index0(-1),
+        m_index1(-1)
+#endif //DEBUG_PART_INDEX
         {
         }
@@ -72 +82 @@
         }
 
-        virtual void setShapeIdentifiers(int partId0,int index0,        int partId1,int index1)
+        virtual void setShapeIdentifiersA(int partId0,int index0)
         {
-                        m_partId0=partId0;
-                        m_partId1=partId1;
-                        m_index0=index0;
-                        m_index1=index1;                
+                m_partId0=partId0;
+                m_index0=index0;
+        }
+
+        virtual void setShapeIdentifiersB(      int partId1,int index1)
+        {
+                m_partId1=partId1;
+                m_index1=index1;
         }
 
@@ -100 +114 @@
         }
 
+        const btCollisionObject* getBody0Internal() const
+        {
+                return m_body0;
+        }
 
+        const btCollisionObject* getBody1Internal() const
+        {
+                return m_body1;
+        }
+        
 };