Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix in user collision filtering for btCollisionWorld::rayTestSingle: it was not properly overridden.

Browse Source 
Thanks Paul Dubois, See Issue 397
This commit is contained in:
erwin.coumans
2011-02-27 03:52:33 +00:00
parent 2049fb2cfa
commit 18371e7876
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
View File

@@ -436,7 +436,11 @@ void btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra
{ {
m_closestHitFraction = m_userCallback->m_closestHitFraction; 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) virtual btScalar addSingleResult (btCollisionWorld::LocalRayResult &r, bool b)
{ {
btCollisionWorld::LocalShapeInfo shapeInfo; btCollisionWorld::LocalShapeInfo shapeInfo;
@@ -735,6 +739,10 @@ void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
{ {
m_closestHitFraction = m_userCallback->m_closestHitFraction; 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) virtual btScalar addSingleResult (btCollisionWorld::LocalConvexResult& r, bool b)
{ {
btCollisionWorld::LocalShapeInfo shapeInfo; btCollisionWorld::LocalShapeInfo shapeInfo;