diff options
author | ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2007-10-22 22:23:10 +0000 |
---|---|---|
committer | ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2007-10-22 22:23:10 +0000 |
commit | ec76f2e0a3fc1497a4b7e2ebb33835c4b09a264e (patch) | |
tree | 2e126d6076e630acef9a1283b9819e3a2937b3d3 /src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h | |
parent | 1b70c4e5c97d3b5d4ddf35e3f916f6fbb02cb654 (diff) | |
download | bullet3-ec76f2e0a3fc1497a4b7e2ebb33835c4b09a264e.tar.gz |
- keep track of all memory allocations (gNumAllignedAllocs/gNumAllignedFree)
All memory allocations in Bullet go through btAlignedAlloc/btAlignedFree
Fix in hinge constraint constructors, thanks Marcus Hennix!
Diffstat (limited to 'src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h')
-rw-r--r-- | src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h index 20f6ecd6e..2e99f1db1 100644 --- a/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h +++ b/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h @@ -17,6 +17,9 @@ subject to the following restrictions: #define BT_DEFAULT_COLLISION_CONFIGURATION #include "btCollisionConfiguration.h" +class btVoronoiSimplexSolver; +class btGjkEpaPenetrationDepthSolver; + ///btCollisionConfiguration allows to configure Bullet collision detection ///stack allocator, pool memory allocators @@ -35,6 +38,9 @@ class btDefaultCollisionConfiguration : public btCollisionConfiguration btPoolAllocator* m_collisionAlgorithmPool; bool m_ownsCollisionAlgorithmPool; + //default simplex/penetration depth solvers + btVoronoiSimplexSolver* m_simplexSolver; + btGjkEpaPenetrationDepthSolver* m_pdSolver; //default CreationFunctions, filling the m_doubleDispatch table btCollisionAlgorithmCreateFunc* m_convexConvexCreateFunc; |