Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h (modified) (3 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

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