diff options
Diffstat (limited to 'extern/bullet2/bullet_compound_raycast.patch')
| -rw-r--r-- | extern/bullet2/bullet_compound_raycast.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/extern/bullet2/bullet_compound_raycast.patch b/extern/bullet2/bullet_compound_raycast.patch deleted file mode 100644 index 2658f7ed56e..00000000000 --- a/extern/bullet2/bullet_compound_raycast.patch +++ /dev/null @@ -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); - } - } - } |