Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-09-09 11:58:53 +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

20
src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
View File

@@ -61,8 +61,8 @@ public:
virtual void cleanOverlappingPair(btBroadphasePair& pair, btDispatcher* dispatcher) = 0;
virtual int getNumOverlappingPairs() const = 0;
virtual bool needsBroadphaseCollision(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1) const = 0; // stephengold added 2020-02-12
virtual btOverlapFilterCallback* getOverlapFilterCallback() = 0; // stephengold added 2020-02-12
virtual bool needsBroadphaseCollision(btBroadphaseProxy * proxy0, btBroadphaseProxy * proxy1) const = 0;
virtual btOverlapFilterCallback* getOverlapFilterCallback() = 0;
virtual void cleanProxyFromPairs(btBroadphaseProxy* proxy, btDispatcher* dispatcher) = 0;
virtual void setOverlapFilterCallback(btOverlapFilterCallback* callback) = 0;
@@ -381,14 +381,14 @@ public:
{
}
bool needsBroadphaseCollision(btBroadphaseProxy*, btBroadphaseProxy*) const // stephengold added 2020-02-12
{ // stephengold added 2020-02-12
return true; // stephengold added 2020-02-12
} // stephengold added 2020-02-12
btOverlapFilterCallback* getOverlapFilterCallback() // stephengold added 2020-02-12
{ // stephengold added 2020-02-12
return 0; // stephengold added 2020-02-12
} // stephengold added 2020-02-12
bool needsBroadphaseCollision(btBroadphaseProxy*, btBroadphaseProxy*) const
{
return true;
}
btOverlapFilterCallback* getOverlapFilterCallback()
{
return 0;
}
virtual void setOverlapFilterCallback(btOverlapFilterCallback* /*callback*/)
{
}

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;