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/NarrowPhaseCollision/btGjkEpa.h | |
parent | c5db2965fad723982857c9099114360330f90146 (diff) |
updated to latest Bullet 2.x
Diffstat (limited to 'extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h')
-rw-r--r-- | extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h index d26ac9cdfe5..359829f8f31 100644 --- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h +++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h @@ -23,6 +23,8 @@ Nov.2006 #define _05E48D53_04E0_49ad_BB0A_D74FE62E7366_ #include "BulletCollision/CollisionShapes/btConvexShape.h" +class btStackAlloc; + ///btGjkEpaSolver contributed under zlib by Nathanael Presson struct btGjkEpaSolver { @@ -44,6 +46,7 @@ struct sResults static bool Collide(btConvexShape* shape0,const btTransform& wtrs0, btConvexShape* shape1,const btTransform& wtrs1, btScalar radialmargin, + btStackAlloc* stackAlloc, sResults& results); }; |