From 6d48fd6172528e58d0a250b662fe4372c2ec32a9 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 22 Jul 2010 20:24:03 +0000 Subject: [PATCH] fix: start with localtime = 0 fix: drawSphere function in btIDebugDraw should be virtual --- src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp | 2 +- src/LinearMath/btIDebugDraw.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp index a88ed1caf..e53dde854 100644 --- a/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp +++ b/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp @@ -52,7 +52,7 @@ btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroa :btDynamicsWorld(dispatcher,pairCache,collisionConfiguration), m_constraintSolver(constraintSolver), m_gravity(0,-10,0), -m_localTime(btScalar(1.)/btScalar(60.)), +m_localTime(0), m_synchronizeAllMotionStates(false), m_profileTimings(0) { diff --git a/src/LinearMath/btIDebugDraw.h b/src/LinearMath/btIDebugDraw.h index 1ca303182..e7849f648 100644 --- a/src/LinearMath/btIDebugDraw.h +++ b/src/LinearMath/btIDebugDraw.h @@ -59,7 +59,7 @@ class btIDebugDraw drawLine (from, to, fromColor); } - void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) + virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) { btVector3 start = transform.getOrigin();