Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h

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/CollisionDispatch/btDefaultCollisionConfiguration.h (modified) (3 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h

@@ -28 +28 @@
         int                                     m_defaultMaxPersistentManifoldPoolSize;
         int                                     m_defaultMaxCollisionAlgorithmPoolSize;
+        int                                     m_customCollisionAlgorithmMaxElementSize;
         int                                     m_defaultStackAllocatorSize;
+        int                                     m_useEpaPenetrationAlgorithm;
 
         btDefaultCollisionConstructionInfo()
@@ -36 +38 @@
                 m_defaultMaxPersistentManifoldPoolSize(4096),
                 m_defaultMaxCollisionAlgorithmPoolSize(4096),
-                m_defaultStackAllocatorSize(0)
+                m_customCollisionAlgorithmMaxElementSize(0),
+                m_defaultStackAllocatorSize(0),
+                m_useEpaPenetrationAlgorithm(true)
         {
         }
@@ -109 +113 @@
         }
 
+        virtual btVoronoiSimplexSolver* getSimplexSolver()
+        {
+                return m_simplexSolver;
+        }
+
 
         virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1);