From 9b94416d61e1bc976efcff922cff554835cc36e5 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Wed, 14 Feb 2007 04:09:17 +0000 Subject: [PATCH] allow single raycast to be performed on objects --- src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp | 3 +++ src/BulletCollision/CollisionDispatch/btCollisionWorld.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp index b1b1a8b61..d63644e43 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp @@ -178,6 +178,8 @@ void btCollisionWorld::removeCollisionObject(btCollisionObject* collisionObject) } } + + void btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTransform& rayToTrans, btCollisionObject* collisionObject, const btCollisionShape* collisionShape, @@ -186,6 +188,7 @@ void btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra { btSphereShape pointShape(btScalar(0.0)); + pointShape.setMargin(0.f); if (collisionShape->isConvex()) { diff --git a/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/src/BulletCollision/CollisionDispatch/btCollisionWorld.h index 345a68ca1..d8e28bb35 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionWorld.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.h @@ -216,7 +216,7 @@ public: /// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest. /// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape. /// This allows more customization. - void rayTestSingle(const btTransform& rayFromTrans,const btTransform& rayToTrans, + static void rayTestSingle(const btTransform& rayFromTrans,const btTransform& rayToTrans, btCollisionObject* collisionObject, const btCollisionShape* collisionShape, const btTransform& colObjWorldTransform,