diff options
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/KX_ObjectActuator.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 87c2592ecfd..45436693281 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -276,16 +276,8 @@ bool KX_ObjectActuator::Update() { parent->ApplyRotation(m_drot,(m_bitLocalFlag.DRot) != 0); } - - if (m_bitLocalFlag.ZeroLinearVelocity) { - if (!m_bitLocalFlag.AddOrSetLinV) { - /* No need to select local or world, as the velocity is zero anyway, - * and setLinearVelocity() converts local to world first. We do need to - * pass a true zero vector, as m_linear_velocity is only fuzzily zero. */ - parent->setLinearVelocity(MT_Vector3(0, 0, 0), false); - } - } - else { + if (!m_bitLocalFlag.ZeroLinearVelocity) + { if (m_bitLocalFlag.AddOrSetLinV) { parent->addLinearVelocity(m_linear_velocity,(m_bitLocalFlag.LinearVelocity) != 0); } else { @@ -310,13 +302,8 @@ bool KX_ObjectActuator::Update() } } } - if (m_bitLocalFlag.ZeroAngularVelocity) { - /* No need to select local or world, as the velocity is zero anyway, - * and setAngularVelocity() converts local to world first. We do need to - * pass a true zero vector, as m_angular_velocity is only fuzzily zero. */ - parent->setAngularVelocity(MT_Vector3(0, 0, 0), false); - } - else { + if (!m_bitLocalFlag.ZeroAngularVelocity) + { m_active_combined_velocity = true; if (m_damping > 0) { MT_Vector3 angV; |