diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-29 08:24:52 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-29 08:24:52 +0300 |
| commit | e720f86a836b9343388beafb56be5be9956a3629 (patch) | |
| tree | a703505b43d0936b433dd0fc177644ebdbc2b64b /extern/bullet2/src/BulletCollision/BroadphaseCollision | |
| parent | c5db2965fad723982857c9099114360330f90146 (diff) | |
updated to latest Bullet 2.x
Diffstat (limited to 'extern/bullet2/src/BulletCollision/BroadphaseCollision')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h | 2 | ||||
| -rw-r--r-- | extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h index 7b35df09db6..3ad2467886b 100644 --- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h +++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h @@ -44,6 +44,8 @@ CONCAVE_SHAPES_START_HERE, TRIANGLE_MESH_SHAPE_PROXYTYPE, ///used for demo integration FAST/Swift collision library and Bullet FAST_CONCAVE_MESH_PROXYTYPE, + //terrain + TERRAIN_SHAPE_PROXYTYPE, ///Used for GIMPACT Trimesh integration GIMPACT_SHAPE_PROXYTYPE, diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h index 415c398a101..1a471398638 100644 --- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h +++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h @@ -29,6 +29,7 @@ enum btCollisionDispatcherId }; class btPersistentManifold; +class btStackAlloc; struct btDispatcherInfo { @@ -45,7 +46,8 @@ struct btDispatcherInfo m_useContinuous(false), m_debugDraw(0), m_enableSatConvex(false), - m_enableSPU(false) + m_enableSPU(false), + m_stackAllocator(0) { } @@ -57,6 +59,7 @@ struct btDispatcherInfo class btIDebugDraw* m_debugDraw; bool m_enableSatConvex; bool m_enableSPU; + btStackAlloc* m_stackAllocator; }; |