Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-09-30 14:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete comments plainly marking the altered source code

Browse Source
This commit is contained in:
Stephen Gold
2020-02-23 21:48:25 -08:00
parent 75b05d93ff
commit abb2e4ee23
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -800,14 +800,14 @@ public:
///don't do CCD when the collision filters are not matching
if (!ClosestConvexResultCallback::needsCollision(proxy0))
return false;
if (m_pairCache->getOverlapFilterCallback()) { // stephengold added 2020-02-12
btBroadphaseProxy* proxy1 = m_me->getBroadphaseHandle(); // stephengold added 2020-02-12
bool collides = m_pairCache->needsBroadphaseCollision(proxy0, proxy1); // stephengold added 2020-02-12
if (!collides) // stephengold added 2020-02-12
{ // stephengold added 2020-02-12
return false; // stephengold added 2020-02-12
} // stephengold added 2020-02-12
} // stephengold added 2020-02-12
if (m_pairCache->getOverlapFilterCallback()) {
btBroadphaseProxy* proxy1 = m_me->getBroadphaseHandle();
bool collides = m_pairCache->needsBroadphaseCollision(proxy0, proxy1);
if (!collides)
{
return false;
}
}
btCollisionObject* otherObj = (btCollisionObject*)proxy0->m_clientObject;