[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49474] trunk/blender/source/gameengine/ Physics/Bullet: game engine: Fix CcdPhysicsEnvironment functions that accessed m_solverInfo

[Sergej Reich]

Revision: 49474
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49474
Author:   sergof
Date:     2012-08-01 17:59:32 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h

Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2012-08-01 17:54:14 UTC (rev 49473)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp	2012-08-01 17:59:32 UTC (rev 49474)
@@ -830,16 +830,16 @@
 
 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;
 }
 
 

Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h	2012-08-01 17:54:14 UTC (rev 49473)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h	2012-08-01 17:59:32 UTC (rev 49474)
@@ -83,8 +83,6 @@
 	int	m_profileTimings;
 	bool m_enableSatCollisionDetection;
 
-	btContactSolverInfo	m_solverInfo;
-	
 	void	processFhSprings(double curTime,float timeStep);
 
 	public: