diff options
Diffstat (limited to 'source/gameengine/Ketsji/KX_IPO_SGController.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_IPO_SGController.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp index be1a4b4ef3a..2258572b563 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -50,7 +50,7 @@ typedef unsigned long uint_ptr; #include "DNA_ipo_types.h" #include "BLI_math.h" -// All objects should start on frame 1! Will we ever need an object to +// All objects should start on frame 1! Will we ever need an object to // start on another frame, the 1.0 should change. KX_IpoSGController::KX_IpoSGController() : m_ipo_as_force(false), @@ -145,7 +145,7 @@ bool KX_IpoSGController::Update(double currentTime) m_ipo_xform.GetPosition(); m_game_object->GetPhysicsController()->ApplyForce(vec, false); } - } + } else { // Local ipo should be defined with the object position at (0,0,0) // Local transform is applied to the object based on initial position @@ -231,8 +231,8 @@ bool KX_IpoSGController::Update(double currentTime) else if (m_ipo_channels_active[OB_ROT_X] || m_ipo_channels_active[OB_ROT_Y] || m_ipo_channels_active[OB_ROT_Z]) { if (m_ipo_euler_initialized) { // assume all channel absolute - // All 3 channels should be specified but if they are not, we will take - // the value at the start of the game to avoid angle sign reversal + // All 3 channels should be specified but if they are not, we will take + // the value at the start of the game to avoid angle sign reversal double yaw = m_ipo_start_euler[0], pitch = m_ipo_start_euler[1], roll = m_ipo_start_euler[2]; //RotX and dRotX @@ -250,7 +250,7 @@ bool KX_IpoSGController::Update(double currentTime) else if (m_ipo_channels_active[OB_DROT_Y]) { pitch += m_ipo_xform.GetDeltaEulerAngles()[1]; } - + //RotZ and dRotZ if (m_ipo_channels_active[OB_ROT_Z]) { roll = (m_ipo_channels_active[OB_DROT_Z] ? (m_ipo_xform.GetEulerAngles()[2] + m_ipo_xform.GetDeltaEulerAngles()[2]) : m_ipo_xform.GetEulerAngles()[2] ); @@ -308,7 +308,7 @@ bool KX_IpoSGController::Update(double currentTime) else if (m_ipo_channels_active[OB_DSIZE_Y] && m_ipo_start_initialized) { newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + ((!m_ipo_add)?m_ipo_start_scale[1] : 0.0f)); } - + //RotZ and dRotZ if (m_ipo_channels_active[OB_SIZE_Z]) { newScale[2] = (m_ipo_channels_active[OB_DSIZE_Z] ? (m_ipo_xform.GetScaling()[2] + m_ipo_xform.GetDeltaScaling()[2]) : m_ipo_xform.GetScaling()[2]); |