forked from bartvdbraak/blender
Update MSVC project file for latest Bullet revision. Remove compound patch as it is now included in Bullet trunk.
This commit is contained in:
parent
7f293488d1
commit
17478eeb23
39
extern/bullet2/bullet_compound_raycast.patch
vendored
39
extern/bullet2/bullet_compound_raycast.patch
vendored
@ -1,39 +0,0 @@
|
|||||||
Index: src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
|
|
||||||
===================================================================
|
|
||||||
--- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (r‚vision 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
39
extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
vendored
39
extern/bullet2/make/msvc_7_0/Bullet_vc7.vcproj
vendored
@ -382,36 +382,6 @@ ECHO Done
|
|||||||
<File
|
<File
|
||||||
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
|
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btJacobianEntry.h">
|
||||||
</File>
|
</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
|
<File
|
||||||
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
|
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btPoint2PointConstraint.cpp">
|
||||||
</File>
|
</File>
|
||||||
@ -442,12 +412,6 @@ ECHO Done
|
|||||||
<File
|
<File
|
||||||
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
|
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSolverConstraint.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.cpp">
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btSorLcp.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
|
RelativePath="..\..\src\BulletDynamics\ConstraintSolver\btTypedConstraint.cpp">
|
||||||
</File>
|
</File>
|
||||||
@ -1057,9 +1021,6 @@ ECHO Done
|
|||||||
<File
|
<File
|
||||||
RelativePath="..\..\src\LinearMath\btScalar.h">
|
RelativePath="..\..\src\LinearMath\btScalar.h">
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\..\src\LinearMath\btSimdMinMax.h">
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\src\LinearMath\btStackAlloc.h">
|
RelativePath="..\..\src\LinearMath\btStackAlloc.h">
|
||||||
</File>
|
</File>
|
||||||
|
Loading…
Reference in New Issue
Block a user