kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Had to make the patch for casting a little more complicated.

Browse Source 
m_MotionState->getWorldOrientation((float)worldquat[1],
        (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);

Is now:

#ifdef dDOUBLE
      m_MotionState->getWorldOrientation((float)worldquat[1],
        (float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
#else
      m_MotionState->getWorldOrientation(worldquat[1],
        worldquat[2],worldquat[3],worldquat[0]);
#endif


Kent
--
mein@cs.umn.edu
This commit is contained in:
Kent Mein 2002-12-03 15:52:47 +00:00
parent 671a355e9f
commit 50ec450e64
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/gameengine/Physics/BlOde/OdePhysicsController.cpp
View File

@ -261,8 +261,13 @@ bool ODEPhysicsController::SynchronizeMotionStates(float time)
dQuaternion worldquat;
float worldpos[3];
#ifdef dDOUBLE
m_MotionState->getWorldOrientation((float)worldquat[1],
(float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
#else
m_MotionState->getWorldOrientation(worldquat[1],
worldquat[2],worldquat[3],worldquat[0]);
#endif
m_MotionState->getWorldPosition(worldpos[0],worldpos[1],worldpos[2]);
float scaling[3];
@ -346,8 +351,13 @@ bool ODEPhysicsController::SynchronizeMotionStates(float time)
dQuaternion worldquat;
float worldpos[3];
#ifdef dDOUBLE
m_MotionState->getWorldOrientation((float)worldquat[1],
(float)worldquat[2],(float)worldquat[3],(float)worldquat[0]);
#else
m_MotionState->getWorldOrientation(worldquat[1],
worldquat[2],worldquat[3],worldquat[0]);
#endif
m_MotionState->getWorldPosition(worldpos[0],worldpos[1],worldpos[2]);
float scaling[3];
@ -470,7 +480,14 @@ void ODEPhysicsController::SetLinearVelocity(float lin_velX,float lin_velY,float
dMatrix3 worldmat;
dVector3 localvel;
dQuaternion worldquat;
m_MotionState->getWorldOrientation(worldquat[1],worldquat[2],worldquat[3],worldquat[0]);
#ifdef dDOUBLE
m_MotionState->getWorldOrientation((float)worldquat[1],
(float)worldquat[2], (float)worldquat[3],(float)worldquat[0]);
#else
m_MotionState->getWorldOrientation(worldquat[1],worldquat[2],
worldquat[3],worldquat[0]);
#endif
dQtoR (worldquat, worldmat);
dMULTIPLY0_331 (localvel,worldmat,vel);