diff options
Diffstat (limited to 'extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h')
| -rw-r--r-- | extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h index 35248c841c6..10ff0718d92 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.h @@ -33,6 +33,7 @@ class BoxTriangleCallback : public TriangleCallback float m_timeStep; int m_stepCount; bool m_useContinuous; + float m_collisionMarginTriangle; public: @@ -40,7 +41,7 @@ public: BoxTriangleCallback(Dispatcher* dispatcher,BroadphaseProxy* proxy0,BroadphaseProxy* proxy1); - void SetTimeStepAndCounters(float timeStep,int stepCount, bool useContinuous); + void SetTimeStepAndCounters(float timeStep,int stepCount, float collisionMarginTriangle,bool useContinuous); virtual ~BoxTriangleCallback(); |