From ce90041239d6987ee47d1ef971c6b396ce8cf6e1 Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Wed, 1 Aug 2012 17:59:32 +0000 Subject: game engine: Fix CcdPhysicsEnvironment functions that accessed m_solverInfo The functions had no effect because m_solverInfo wasn't used anywhere. Now we get the solver info from the dynamics world directly instead of using our own copy. --- source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 6 +++--- source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'source/gameengine/Physics/Bullet') diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 3b49607ff1b..79898cdc0d4 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -830,16 +830,16 @@ void CcdPhysicsEnvironment::setCcdMode(int ccdMode) void CcdPhysicsEnvironment::setSolverSorConstant(float sor) { - m_solverInfo.m_sor = sor; + m_dynamicsWorld->getSolverInfo().m_sor = sor; } void CcdPhysicsEnvironment::setSolverTau(float tau) { - m_solverInfo.m_tau = tau; + m_dynamicsWorld->getSolverInfo().m_tau = tau; } void CcdPhysicsEnvironment::setSolverDamping(float damping) { - m_solverInfo.m_damping = damping; + m_dynamicsWorld->getSolverInfo().m_damping = damping; } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 8d9c770b8c3..c499a1ef75c 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -83,8 +83,6 @@ protected: int m_profileTimings; bool m_enableSatCollisionDetection; - btContactSolverInfo m_solverInfo; - void processFhSprings(double curTime,float timeStep); public: -- cgit v1.2.3