I'll break this commit into two sections in the moto files

[blender-staging.git] / source / gameengine / Physics / Sumo / SumoPhysicsEnvironment.cpp

diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
index 2b29b2602a80281449957a21572786be6829fff0..6cd5d513357bbbb0797b7966b329d1c7ce0b69e3 100644 (file)
--- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
@@ -36,11 +36,6 @@
 #include "SumoPHYCallbackBridge.h"
 #include <SOLID/SOLID.h>
 
 #include "SumoPHYCallbackBridge.h"
 #include <SOLID/SOLID.h>
 

-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-

 SumoPhysicsEnvironment::SumoPhysicsEnvironment()
 {
        m_fixedTimeStep = 1.f/60.f;
 SumoPhysicsEnvironment::SumoPhysicsEnvironment()
 {
        m_fixedTimeStep = 1.f/60.f;


@@ -101,7 +96,6 @@ bool         SumoPhysicsEnvironment::proceedDeltaTime(double  curTime,float timeStep)
        } else
        {
                m_currentTime += timeStep;
        } else
        {
                m_currentTime += timeStep;

-               float ticrate = 1.f/timeStep;

                result = m_sumoScene->proceed(m_currentTime, timeStep);
        }
        return result;
                result = m_sumoScene->proceed(m_currentTime, timeStep);
        }
        return result;


@@ -257,4 +251,3 @@ PHY_IPhysicsController* SumoPhysicsEnvironment::CreateConeController(float coner
        return ctrl;
 }
 
        return ctrl;
 }
 

-