game engine: Fix CcdPhysicsEnvironment functions that accessed m_solverInfo
authorSergej Reich <sergej.reich@googlemail.com>
Wed, 1 Aug 2012 17:59:32 +0000 (17:59 +0000)
committerSergej Reich <sergej.reich@googlemail.com>
Wed, 1 Aug 2012 17:59:32 +0000 (17:59 +0000)
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
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h

index 3b49607ff1bf6d5e31a1b8ac747f0f19f3d56497..79898cdc0d4f20e242fca1070cb7501677de4085 100644 (file)
@@ -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;
 }
 
 
index 8d9c770b8c3cf8c5167d2a0afc4b415fdb26d9a6..c499a1ef75c0fdd861328c4aab1809b64aadb344 100644 (file)
@@ -83,8 +83,6 @@ protected:
        int     m_profileTimings;
        bool m_enableSatCollisionDetection;
 
-       btContactSolverInfo     m_solverInfo;
-       
        void    processFhSprings(double curTime,float timeStep);
 
        public: