Update MSVC project file for latest Bullet revision. Remove compound patch as it...
authorBenoit Bolsee <benoit.bolsee@online.be>
Sat, 13 Sep 2008 08:05:16 +0000 (08:05 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Sat, 13 Sep 2008 08:05:16 +0000 (08:05 +0000)
extern/bullet2/bullet_compound_raycast.patch [deleted file]
extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj

diff --git a/extern/bullet2/bullet_compound_raycast.patch b/extern/bullet2/bullet_compound_raycast.patch
deleted file mode 100644 (file)
index 2658f7e..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
-===================================================================
---- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (r\82vision 16464)
-+++ src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (copie de travail)
-@@ -379,12 +379,16 @@
-                                       btTransform childTrans = compoundShape->getChildTransform(i);
-                                       const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
-                                       btTransform childWorldTrans = colObjWorldTransform * childTrans;
-+                                      // replace collision shape so that callback can determine the triangle
-+                                      btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
-+                                      collisionObject->setCollisionShape((btCollisionShape*)childCollisionShape);
-                                       rayTestSingle(rayFromTrans,rayToTrans,
-                                               collisionObject,
-                                               childCollisionShape,
-                                               childWorldTrans,
-                                               resultCallback);
--
-+                                      // restore
-+                                      collisionObject->setCollisionShape(saveCollisionShape);
-                               }
-                       }
-               }
-@@ -571,11 +575,16 @@
-                                       btTransform childTrans = compoundShape->getChildTransform(i);
-                                       const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
-                                       btTransform childWorldTrans = colObjWorldTransform * childTrans;
-+                                      // replace collision shape so that callback can determine the triangle
-+                                      btCollisionShape* saveCollisionShape = collisionObject->getCollisionShape();
-+                                      collisionObject->setCollisionShape((btCollisionShape*)childCollisionShape);
-                                       objectQuerySingle(castShape, convexFromTrans,convexToTrans,
-                                               collisionObject,
-                                               childCollisionShape,
-                                               childWorldTrans,
-                                               resultCallback, allowedPenetration);
-+                                      // restore
-+                                      collisionObject->setCollisionShape(saveCollisionShape);
-                               }
-                       }
-               }
index 225a6ead3bea0524d8cc446f1737f1434cc8dc42..186b03ad67d2fe888930750025d4f0fd083c85a7 100644 (file)
@@ -382,36 +382,6 @@ ECHO Done
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
                                        </File>
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
                                        </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.cpp">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeContactJoint.h">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.cpp">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeJoint.h">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeMacros.h">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.cpp">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeQuickstepConstraintSolver.h">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeSolverBody.h">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.cpp">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btOdeTypedJoint.h">
-                                       </File>
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
                                        </File>
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
                                        </File>
@@ -442,12 +412,6 @@ ECHO Done
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
                                        </File>
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
                                        </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp">
-                                       </File>
-                                       <File
-                                               RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h">
-                                       </File>
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
                                        </File>
                                        <File
                                                RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
                                        </File>
@@ -1057,9 +1021,6 @@ ECHO Done
                                <File
                                        RelativePath="..\..\src\LinearMath\btScalar.h">
                                </File>
                                <File
                                        RelativePath="..\..\src\LinearMath\btScalar.h">
                                </File>
-                               <File
-                                       RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
-                               </File>
                                <File
                                        RelativePath="..\..\src\LinearMath\btStackAlloc.h">
                                </File>
                                <File
                                        RelativePath="..\..\src\LinearMath\btStackAlloc.h">
                                </File>