diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 90755da3de27..f399e3a99d58 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -399,8 +399,6 @@ bool KX_KetsjiEngine::NextFrame() #endif KX_SetActiveScene(scene); - scene->GetPhysicsEnvironment()->EndFrame(); - // Process sensors, and controllers m_logger.StartLog(tc_logic, m_kxsystem->GetTimeInSeconds()); scene->LogicBeginFrame(m_frameTime, framestep); @@ -423,7 +421,6 @@ bool KX_KetsjiEngine::NextFrame() scene->UpdateParents(m_frameTime); m_logger.StartLog(tc_physics, m_kxsystem->GetTimeInSeconds()); - scene->GetPhysicsEnvironment()->BeginFrame(); // Perform physics calculations on the scene. This can involve // many iterations of the physics solver. diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index b4de995890af..f8e9b84bd1a8 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -703,10 +703,6 @@ void CcdPhysicsEnvironment::UpdateCcdPhysicsControllerShape(CcdShapeConstruction } } -void CcdPhysicsEnvironment::BeginFrame() -{ -} - void CcdPhysicsEnvironment::DebugDrawWorld() { if (m_dynamicsWorld->getDebugDrawer() && m_dynamicsWorld->getDebugDrawer()->getDebugMode() > 0) diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 49c3f7bbc836..2f0c552dc90e 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -130,11 +130,6 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment { return m_numTimeSubSteps; } - - virtual void BeginFrame(); - virtual void EndFrame() - { - } /// Perform an integration step of duration 'timeStep'. virtual bool ProceedDeltaTime(double curTime, float timeStep, float interval); diff --git a/source/gameengine/Physics/Common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/Common/PHY_IPhysicsEnvironment.h index 7e80c6b84b12..4284380e0a80 100644 --- a/source/gameengine/Physics/Common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/Common/PHY_IPhysicsEnvironment.h @@ -112,8 +112,6 @@ class PHY_IPhysicsEnvironment virtual ~PHY_IPhysicsEnvironment() { } - virtual void BeginFrame() = 0; - virtual void EndFrame() = 0; /// Perform an integration step of duration 'timeStep'. virtual bool ProceedDeltaTime(double curTime, float timeStep, float interval) = 0; /// draw debug lines (make sure to call this during the render phase, otherwise lines are not drawn properly) diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp index 9bfcc072ee0e..5a1e62307e33 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp @@ -45,16 +45,6 @@ DummyPhysicsEnvironment::~DummyPhysicsEnvironment() //destroy physicsengine data } -void DummyPhysicsEnvironment::BeginFrame() -{ - // beginning of logic frame: apply forces -} - -void DummyPhysicsEnvironment::EndFrame() -{ - // end of logic frame: clear forces -} - bool DummyPhysicsEnvironment::ProceedDeltaTime(double curTime, float timeStep, float interval) { //step physics simulation, typically perform diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h index c637ffb2d78f..ffa60c61feed 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h @@ -48,8 +48,6 @@ class DummyPhysicsEnvironment : public PHY_IPhysicsEnvironment public: DummyPhysicsEnvironment (); virtual ~DummyPhysicsEnvironment (); - virtual void BeginFrame(); - virtual void EndFrame(); // Perform an integration step of duration 'timeStep'. virtual bool ProceedDeltaTime(double curTime, float timeStep, float interval); virtual void SetFixedTimeStep(bool useFixedTimeStep, float fixedTimeStep);