Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h (modified) (2 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btUnionFind.h

@@ -19 +19 @@
 #include "LinearMath/btAlignedObjectArray.h"
 
-        #define USE_PATH_COMPRESSION 1
+#define USE_PATH_COMPRESSION 1
+
+///see for discussion of static island optimizations by Vroonsh here: http://code.google.com/p/bullet/issues/detail?id=406
+#define STATIC_SIMULATION_ISLAND_OPTIMIZATION 1
 
 struct  btElement
@@ -107 +110 @@
         
                 #ifdef USE_PATH_COMPRESSION
-                                //
-                                m_elements[x].m_id = m_elements[m_elements[x].m_id].m_id;
-                #endif //
+                                const btElement* elementPtr = &m_elements[m_elements[x].m_id];
+                                m_elements[x].m_id = elementPtr->m_id;
+                                x = elementPtr->m_id;                   
+                #else//
                                 x = m_elements[x].m_id;
+                #endif          
                                 //btAssert(x < m_N);
                                 //btAssert(x >= 0);