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

more broadphase/pair cache/MultiSAP improvements.

Browse Source
This commit is contained in:
erwin.coumans
2008-03-14 03:19:15 +00:00
parent d51c9f3247
commit fbffa3a031
3 changed files with 67 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
View File

@@ -204,12 +204,13 @@ void btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
}
} else
{
#ifdef USE_HASH_PAIRCACHE
if (!m_pairCache->hasDeferredRemoval())
{
if ( m_pairCache->findPair(proxy0,proxy1))
{
m_pairCache->removeOverlappingPair(proxy0,proxy1,dispatcher);
}
#endif //USE_HASH_PAIRCACHE
}
}
}
@@ -220,9 +221,7 @@ void btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
}
#ifndef USE_HASH_PAIRCACHE
if (m_ownsPairCache)
if (m_ownsPairCache && m_pairCache->hasDeferredRemoval())
{
btBroadphasePairArray& overlappingPairArray = m_pairCache->getOverlappingPairArray();
@@ -296,7 +295,6 @@ void btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
#endif//CLEAN_INVALID_PAIRS
}
#endif //USE_HASH_PAIRCACHE
}
}