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

apply improvement, to allow btCompoundShape per-shape collision filtering

Browse Source 
Fixes old issue 67
This commit is contained in:
Erwin Coumans
2018-12-22 17:02:58 -08:00
parent 6661b1ac71
commit e5fb1aa1d5
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
View File

@@ -113,6 +113,12 @@ public:
const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(m_compoundColObjWrap->getCollisionShape()); const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(m_compoundColObjWrap->getCollisionShape());
btAssert(index < compoundShape->getNumChildShapes()); btAssert(index < compoundShape->getNumChildShapes());
if (gCompoundChildShapePairCallback)
{
if (!gCompoundChildShapePairCallback(m_otherObjWrap->getCollisionShape(), childShape))
return;
}
//backup //backup
btTransform orgTrans = m_compoundColObjWrap->getWorldTransform(); btTransform orgTrans = m_compoundColObjWrap->getWorldTransform();
@@ -130,11 +136,6 @@ public:
btVector3 aabbMin1, aabbMax1; btVector3 aabbMin1, aabbMax1;
m_otherObjWrap->getCollisionShape()->getAabb(m_otherObjWrap->getWorldTransform(), aabbMin1, aabbMax1); m_otherObjWrap->getCollisionShape()->getAabb(m_otherObjWrap->getWorldTransform(), aabbMin1, aabbMax1);
if (gCompoundChildShapePairCallback)
{
if (!gCompoundChildShapePairCallback(m_otherObjWrap->getCollisionShape(), childShape))
return;
}
if (TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1)) if (TestAabbAgainstAabb2(aabbMin0, aabbMax0, aabbMin1, aabbMax1))
{ {