Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp (modified) (3 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btManifoldResult.cpp

@@ -48 +48 @@
                 m_body0(body0),
                 m_body1(body1)
+#ifdef DEBUG_PART_INDEX
+                ,m_partId0(-1),
+        m_partId1(-1),
+        m_index0(-1),
+        m_index1(-1)
+#endif //DEBUG_PART_INDEX
 {
         m_rootTransA = body0->getWorldTransform();
@@ -89 +95 @@
 
    //BP mod, store contact triangles.
-   newPt.m_partId0 = m_partId0;
-   newPt.m_partId1 = m_partId1;
-   newPt.m_index0  = m_index0;
-   newPt.m_index1  = m_index1;
+        if (isSwapped)
+        {
+                newPt.m_partId0 = m_partId1;
+                newPt.m_partId1 = m_partId0;
+                newPt.m_index0  = m_index1;
+                newPt.m_index1  = m_index0;
+        } else
+        {
+                newPt.m_partId0 = m_partId0;
+                newPt.m_partId1 = m_partId1;
+                newPt.m_index0  = m_index0;
+                newPt.m_index1  = m_index1;
+        }
         //printf("depth=%f\n",depth);
         ///@todo, check this for any side effects
@@ -113 +128 @@
                 btCollisionObject* obj0 = isSwapped? m_body1 : m_body0;
                 btCollisionObject* obj1 = isSwapped? m_body0 : m_body1;
-                (*gContactAddedCallback)(m_manifoldPtr->getContactPoint(insertIndex),obj0,m_partId0,m_index0,obj1,m_partId1,m_index1);
+                (*gContactAddedCallback)(m_manifoldPtr->getContactPoint(insertIndex),obj0,newPt.m_partId0,newPt.m_index0,obj1,newPt.m_partId1,newPt.m_index1);
         }