diff options
author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-06 06:13:07 +0400 |
---|---|---|
committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-05-06 06:13:07 +0400 |
commit | 5813ae55d4033778c477f21ac17185f8ac46f427 (patch) | |
tree | 559a6f4a9c94f6d099f966541aa3e9e0ae2b9f4e /source/gameengine/Physics/Sumo | |
parent | 762b07f13de640d9bf5c22b2875a9cd2989b79f9 (diff) |
Fix Bug #1243: http://projects.blender.org/tracker/?func=detail&aid=1243&group_id=9&atid=125
Use external velocity (velocity set by the game engine - not the physics engine) for Motion Actuators.
Diffstat (limited to 'source/gameengine/Physics/Sumo')
-rw-r--r-- | source/gameengine/Physics/Sumo/SumoPhysicsController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp index 9780b151775..3407f2120e8 100644 --- a/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp +++ b/source/gameengine/Physics/Sumo/SumoPhysicsController.cpp @@ -242,7 +242,7 @@ void SumoPhysicsController::SetAngularVelocity(float ang_velX,float ang_velY,fl MT_Matrix3x3 orn; GetWorldOrientation(orn); - m_sumoObj->setAngularVelocity(local ? + m_sumoObj->setExternalAngularVelocity(local ? orn * ang_vel : ang_vel); } @@ -256,7 +256,7 @@ void SumoPhysicsController::SetLinearVelocity(float lin_velX,float lin_velY,flo GetWorldOrientation(orn); MT_Vector3 lin_vel(lin_velX,lin_velY,lin_velZ); - m_sumoObj->setLinearVelocity(local ? + m_sumoObj->setExternalLinearVelocity(local ? orn * lin_vel : lin_vel); } |