Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp

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/btDefaultCollisionConfiguration.cpp (modified) (2 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp

@@ -46 +46 @@
         void* mem = btAlignedAlloc(sizeof(btVoronoiSimplexSolver),16);
         m_simplexSolver = new (mem)btVoronoiSimplexSolver();
-        
-#define USE_EPA 1
-#ifdef USE_EPA
-        mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver),16);
-        m_pdSolver = new (mem)btGjkEpaPenetrationDepthSolver;
-#else
-        mem = btAlignedAlloc(sizeof(btMinkowskiPenetrationDepthSolver),16);
-        m_pdSolver = new (mem)btMinkowskiPenetrationDepthSolver;
-#endif//USE_EPA 
-        
-
+
+        if (constructionInfo.m_useEpaPenetrationAlgorithm)
+        {
+                mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver),16);
+                m_pdSolver = new (mem)btGjkEpaPenetrationDepthSolver;
+        }else
+        {
+                mem = btAlignedAlloc(sizeof(btMinkowskiPenetrationDepthSolver),16);
+                m_pdSolver = new (mem)btMinkowskiPenetrationDepthSolver;
+        }
+        
         //default CreationFunctions, filling the m_doubleDispatch table
         mem = btAlignedAlloc(sizeof(btConvexConvexAlgorithm::CreateFunc),16);
@@ -103 +103 @@
         int sl = sizeof(btConvexSeparatingDistanceUtil);
         sl = sizeof(btGjkPairDetector);
-        int     collisionAlgorithmMaxElementSize = btMax(maxSize,maxSize2);
+        int     collisionAlgorithmMaxElementSize = btMax(maxSize,constructionInfo.m_customCollisionAlgorithmMaxElementSize);
+        collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize2);
         collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize3);