From 9b467e94da0791663b53f75e4fbf3ff1ead77285 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 10 Feb 2016 10:30:06 -0800 Subject: [PATCH] constify and explicit override --- libraries/physics/src/ThreadSafeDynamicsWorld.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/physics/src/ThreadSafeDynamicsWorld.h b/libraries/physics/src/ThreadSafeDynamicsWorld.h index de37554f56..e9708149da 100644 --- a/libraries/physics/src/ThreadSafeDynamicsWorld.h +++ b/libraries/physics/src/ThreadSafeDynamicsWorld.h @@ -40,14 +40,14 @@ public: int stepSimulationWithSubstepCallback(btScalar timeStep, int maxSubSteps = 1, btScalar fixedTimeStep = btScalar(1.)/btScalar(60.), SubStepCallback onSubStep = []() { }); - void synchronizeMotionStates(); + virtual void synchronizeMotionStates() override; // btDiscreteDynamicsWorld::m_localTime is the portion of real-time that has not yet been simulated // but is used for MotionState::setWorldTransform() extrapolation (a feature that Bullet uses to provide // smoother rendering of objects when the physics simulation loop is ansynchronous to the render loop). float getLocalTimeAccumulation() const { return m_localTime; } - VectorOfMotionStates& getChangedMotionStates() { return _changedMotionStates; } + const VectorOfMotionStates& getChangedMotionStates() const { return _changedMotionStates; } private: // call this instead of non-virtual btDiscreteDynamicsWorld::synchronizeSingleMotionState()