Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp (modified) (2 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp

@@ -69 +69 @@
         m_numVertices = 0;
         m_needsUpdate = true;
-        m_lastW = btVector3(btScalar(1e30),btScalar(1e30),btScalar(1e30));
+        m_lastW = btVector3(btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT),btScalar(BT_LARGE_FLOAT));
         m_cachedBC.reset();
 }
@@ -290 +290 @@
         for (i=0;i<numverts;i++)
         {
+#ifdef BT_USE_EQUAL_VERTEX_THRESHOLD
+                if ( m_simplexVectorW[i].distance2(w) <= m_equalVertexThreshold)
+#else
                 if (m_simplexVectorW[i] == w)
+#endif
                         found = true;
         }