diff options
author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-08 15:34:50 +0400 |
---|---|---|
committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-04-08 15:34:50 +0400 |
commit | 5398f1ba77d25ff27a4e8275a1453e7ddb2f2f0d (patch) | |
tree | 7407e63eceef245cc430c344a1f1a7e543a68667 /source/gameengine/Ketsji/KX_ObjectActuator.cpp | |
parent | fc080d30d6134becd0792e2236e33ff98e5b7e9b (diff) |
Added resolveCombinedVelocities()
Fixed drot actuator. The rotation matrix was being mutilated by passing a float[9] instead of float[12].
Diffstat (limited to 'source/gameengine/Ketsji/KX_ObjectActuator.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_ObjectActuator.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 1d913fe6e44..1f4e61f8139 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -82,20 +82,13 @@ bool KX_ObjectActuator::Update(double curtime,double deltatime) // it should reconcile the externally set velocity with it's // own velocity. if (m_active_combined_velocity) { - static bool update_resolve_warning = 0; - if (!update_resolve_warning) { - update_resolve_warning = 1; - std::cout << "FIXME: KX_ObjectActuator::Update ResolveCombinedVelocities undefined!" << std::endl; - } - //if (parent->GetSumoObject()) { - //parent->GetPhysicsController()->ResolveCombinedVelocities( - // m_linear_velocity, - // m_angular_velocity, - // (m_bitLocalFlag.LinearVelocity) != 0, - // (m_bitLocalFlag.AngularVelocity) != 0 - //); - m_active_combined_velocity = false; - //} + parent->ResolveCombinedVelocities( + m_linear_velocity, + m_angular_velocity, + (m_bitLocalFlag.LinearVelocity) != 0, + (m_bitLocalFlag.AngularVelocity) != 0 + ); + m_active_combined_velocity = false; return false; } else { return false; |