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

Fix issues with btSortedOverlappingPairCache, both for btAxisSweep3 and btDbvtBroadphase.

Browse Source
This commit is contained in:
erwin.coumans
2009-02-09 22:57:52 +00:00
parent cf751f5493
commit 98436a85c3
5 changed files with 80 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
View File

@@ -229,8 +229,13 @@ class btBroadphasePairSortPredicate
bool operator() ( const btBroadphasePair& a, const btBroadphasePair& b )
{
return a.m_pProxy0->m_uniqueId > b.m_pProxy0->m_uniqueId ||
(a.m_pProxy0 == b.m_pProxy0 && a.m_pProxy1->m_uniqueId > b.m_pProxy1->m_uniqueId) ||
const int uidA0 = a.m_pProxy0 ? a.m_pProxy0->m_uniqueId : -1;
const int uidB0 = b.m_pProxy0 ? b.m_pProxy0->m_uniqueId : -1;
const int uidA1 = a.m_pProxy1 ? a.m_pProxy1->m_uniqueId : -1;
const int uidB1 = b.m_pProxy1 ? b.m_pProxy1->m_uniqueId : -1;
return uidA0 > uidB0 ||
(a.m_pProxy0 == b.m_pProxy0 && uidA1 > uidB1) ||
(a.m_pProxy0 == b.m_pProxy0 && a.m_pProxy1 == b.m_pProxy1 && a.m_algorithm > b.m_algorithm);
}
};