Changeset 10073 for code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch

Timestamp:

May 22, 2014, 2:49:16 PM (11 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp (modified) (2 diffs)

code/branches/presentationFS14/src/external/bullet/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp

@@ -21 +21 @@
 #include "LinearMath/btAabbUtil2.h"
 #include "btManifoldResult.h"
+#include <iostream>
 
 btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
@@ -115 +116 @@
         void    ProcessChildShape(btCollisionShape* childShape,int index)
         {
-                btAssert(index>=0);
+                // std::cout << "PCS: " << childShape << std::endl; // FIXME: (noep) remove DEBUG
+            btAssert(index>=0);
                 btCompoundShape* compoundShape = static_cast<btCompoundShape*>(m_compoundColObj->getCollisionShape());
                 btAssert(index<compoundShape->getNumChildShapes());