Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp (modified) (9 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp

@@ -20 +20 @@
 #include "btDispatcher.h"
 #include "btCollisionAlgorithm.h"
+#include "LinearMath/btAabbUtil2.h"
 
 #include <stdio.h>
@@ -136 +137 @@
 {
         gFindPairs++;
-        if(proxy0>proxy1) btSwap(proxy0,proxy1);
+        if(proxy0->m_uniqueId>proxy1->m_uniqueId) 
+                btSwap(proxy0,proxy1);
         int proxyId1 = proxy0->getUid();
         int proxyId2 = proxy1->getUid();
@@ -212 +214 @@
 btBroadphasePair* btHashedOverlappingPairCache::internalAddPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
 {
-        if(proxy0>proxy1) btSwap(proxy0,proxy1);
+        if(proxy0->m_uniqueId>proxy1->m_uniqueId) 
+                btSwap(proxy0,proxy1);
         int proxyId1 = proxy0->getUid();
         int proxyId2 = proxy1->getUid();
@@ -271 +274 @@
 {
         gRemovePairs++;
-        if(proxy0>proxy1) btSwap(proxy0,proxy1);
+        if(proxy0->m_uniqueId>proxy1->m_uniqueId) 
+                btSwap(proxy0,proxy1);
         int proxyId1 = proxy0->getUid();
         int proxyId2 = proxy1->getUid();
@@ -393 +397 @@
 }
 
+void    btHashedOverlappingPairCache::sortOverlappingPairs(btDispatcher* dispatcher)
+{
+        ///need to keep hashmap in sync with pair address, so rebuild all
+        btBroadphasePairArray tmpPairs;
+        int i;
+        for (i=0;i<m_overlappingPairArray.size();i++)
+        {
+                tmpPairs.push_back(m_overlappingPairArray[i]);
+        }
+
+        for (i=0;i<tmpPairs.size();i++)
+        {
+                removeOverlappingPair(tmpPairs[i].m_pProxy0,tmpPairs[i].m_pProxy1,dispatcher);
+        }
+        
+        for (i = 0; i < m_next.size(); i++)
+        {
+                m_next[i] = BT_NULL_PAIR;
+        }
+
+        tmpPairs.quickSort(btBroadphasePairSortPredicate());
+
+        for (i=0;i<tmpPairs.size();i++)
+        {
+                addOverlappingPair(tmpPairs[i].m_pProxy0,tmpPairs[i].m_pProxy1);
+        }
+
+        
+}
 
 
@@ -430 +463 @@
 {
         //don't add overlap with own
-        assert(proxy0 != proxy1);
+        btAssert(proxy0 != proxy1);
 
         if (!needsBroadphaseCollision(proxy0,proxy1))
@@ -461 +494 @@
         if (findIndex < m_overlappingPairArray.size())
         {
-                //assert(it != m_overlappingPairSet.end());
+                //btAssert(it != m_overlappingPairSet.end());
                  btBroadphasePair* pair = &m_overlappingPairArray[findIndex];
                 return pair;
@@ -491 +524 @@
                 {
                         cleanOverlappingPair(*pair,dispatcher);
-
-                        m_overlappingPairArray.swap(i,m_overlappingPairArray.capacity()-1);
+                        pair->m_pProxy0 = 0;
+                        pair->m_pProxy1 = 0;
+                        m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
                         m_overlappingPairArray.pop_back();
                         gOverlappingPairs--;
@@ -592 +626 @@
         processAllOverlappingPairs(&removeCallback,dispatcher);
 }
+
+void    btSortedOverlappingPairCache::sortOverlappingPairs(btDispatcher* dispatcher)
+{
+        //should already be sorted
+}
+