Changeset 2882 for code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) (3 diffs)

code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

@@ -70 +70 @@
 
         SOFTBODY_SHAPE_PROXYTYPE,
-
+        HFFLUID_SHAPE_PROXYTYPE,
+        HFFLUID_BUOYANT_CONVEX_SHAPE_PROXYTYPE,
         INVALID_SHAPE_PROXYTYPE,
 
@@ -188 +189 @@
 
                 //keep them sorted, so the std::set operations work
-                if (&proxy0 < &proxy1)
+                if (proxy0.m_uniqueId < proxy1.m_uniqueId)
         { 
             m_pProxy0 = &proxy0; 
@@ -229 +230 @@
                 bool operator() ( const btBroadphasePair& a, const btBroadphasePair& b )
                 {
-                         return a.m_pProxy0 > b.m_pProxy0 || 
-                                (a.m_pProxy0 == b.m_pProxy0 && a.m_pProxy1 > b.m_pProxy1) ||
+                        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); 
                 }