diff options
Diffstat (limited to 'source/gameengine/Physics')
4 files changed, 3 insertions, 13 deletions
diff --git a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp index 52d3888f58c..1992bbe3421 100755 --- a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp +++ b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.cpp @@ -62,5 +62,5 @@ DT_Bool SumoPHYCallbackBridge::SolidToPHY(void *client_object1, return m_phyCallback(m_orgClientData, ctrl1,ctrl2,0); +} -}
\ No newline at end of file diff --git a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h index 343fd7ce938..4f4d84182ae 100755 --- a/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h +++ b/source/gameengine/Physics/Sumo/SumoPHYCallbackBridge.h @@ -24,4 +24,5 @@ public: }; -#endif //SUMO_PHY_CALLBACK_BRIDGE_H
\ No newline at end of file + +#endif //SUMO_PHY_CALLBACK_BRIDGE_H diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp index 5ff47b475d1..57922e856c4 100644 --- a/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp +++ b/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp @@ -36,10 +36,6 @@ #include "MT_Quaternion.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - SumoPhysicsController::SumoPhysicsController( class SM_Scene* sumoScene, class SM_Object* sumoObj, diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp index 2b29b2602a8..6cd5d513357 100644 --- 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> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - - SumoPhysicsEnvironment::SumoPhysicsEnvironment() { m_fixedTimeStep = 1.f/60.f; @@ -101,7 +96,6 @@ bool SumoPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep) } else { m_currentTime += timeStep; - float ticrate = 1.f/timeStep; result = m_sumoScene->proceed(m_currentTime, timeStep); } return result; @@ -257,4 +251,3 @@ PHY_IPhysicsController* SumoPhysicsEnvironment::CreateConeController(float coner return ctrl; } - |