Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp

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/btConvexConcaveCollisionAlgorithm.cpp (modified) (2 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp

@@ -96 +96 @@
         if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && (m_dispatchInfoPtr->m_debugDraw->getDebugMode() &btIDebugDraw::DBG_DrawWireframe ))
         {
-                btVector3 color(255,255,0);
+                btVector3 color(1,1,0);
                 btTransform& tr = ob->getWorldTransform();
                 m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color);
@@ -122 +122 @@
                 
                 btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
-                ///this should use the btDispatcher, so the actual registered algorithm is used
-                //              btConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexBody,m_triBody);
-
-                m_resultOut->setShapeIdentifiers(-1,-1,partId,triangleIndex);
-        //      cvxcvxalgo.setShapeIdentifiers(-1,-1,partId,triangleIndex);
-//              cvxcvxalgo.processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
+
+                if (m_resultOut->getBody0Internal() == m_triBody)
+                {
+                        m_resultOut->setShapeIdentifiersA(partId,triangleIndex);
+                }
+                else
+                {
+                        m_resultOut->setShapeIdentifiersB(partId,triangleIndex);
+                }
+        
                 colAlgo->processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
                 colAlgo->~btCollisionAlgorithm();