From 18371e787618940bd0769cc4e00182f3f3d1921c Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 27 Feb 2011 03:52:33 +0000 Subject: [PATCH] Fix in user collision filtering for btCollisionWorld::rayTestSingle: it was not properly overridden. Thanks Paul Dubois, See Issue 397 --- .../CollisionDispatch/btCollisionWorld.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp index c8fbfe8ed..c6fb5440f 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp +++ b/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp @@ -436,7 +436,11 @@ void btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra { m_closestHitFraction = m_userCallback->m_closestHitFraction; } - + virtual bool needsCollision(btBroadphaseProxy* p) const + { + return m_userCallback->needsCollision(p); + } + virtual btScalar addSingleResult (btCollisionWorld::LocalRayResult &r, bool b) { btCollisionWorld::LocalShapeInfo shapeInfo; @@ -735,6 +739,10 @@ void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt { m_closestHitFraction = m_userCallback->m_closestHitFraction; } + virtual bool needsCollision(btBroadphaseProxy* p) const + { + return m_userCallback->needsCollision(p); + } virtual btScalar addSingleResult (btCollisionWorld::LocalConvexResult& r, bool b) { btCollisionWorld::LocalShapeInfo shapeInfo;