diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-06-24 03:19:39 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-06-24 03:19:39 +0400 |
| commit | f969b813a49e15f66fcfa669904d615cd827a335 (patch) | |
| tree | 48f70ab64ba6fe5613fe37a8195d0a9e0555c79f /source/gameengine/Ketsji/BL_Action.cpp | |
| parent | 12ca476b8b73798bc2d2550af0c581b570d4b50f (diff) | |
BGE Animations: Making BL_Action::SetFrame() not so dependent on timing. This should smooth out things like setActionFrame().
Diffstat (limited to 'source/gameengine/Ketsji/BL_Action.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Action.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp index 06cf0318859..cf372602431 100644 --- a/source/gameengine/Ketsji/BL_Action.cpp +++ b/source/gameengine/Ketsji/BL_Action.cpp @@ -66,7 +66,8 @@ BL_Action::BL_Action(class KX_GameObject* gameobj) m_blendpose(NULL), m_sg_contr(NULL), m_ptrrna(NULL), - m_done(true) + m_done(true), + m_bcalc_local_time(true) { if (m_obj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE) { @@ -184,6 +185,10 @@ void BL_Action::SetFrame(float frame) else if (frame > max(m_startframe, m_endframe)) frame = max(m_startframe, m_endframe); + m_localtime = frame; + m_bcalc_local_time = false; + +#if 0 // We don't set m_localtime directly since it's recalculated // in the next update. So, we modify the value (m_starttime) // used to calculate m_localtime the next time SetLocalTime() is called. @@ -194,6 +199,7 @@ void BL_Action::SetFrame(float frame) dt = -dt; m_starttime -= dt / (KX_KetsjiEngine::GetAnimFrameRate()*m_speed); +#endif } void BL_Action::SetLocalTime(float curtime) @@ -212,9 +218,16 @@ void BL_Action::Update(float curtime) if (m_done) return; - curtime -= KX_KetsjiEngine::GetSuspendedDelta(); - - SetLocalTime(curtime); + // We only want to calculate the current time we weren't given a frame (e.g., from SetFrame()) + if (m_bcalc_local_time) + { + curtime -= KX_KetsjiEngine::GetSuspendedDelta(); + SetLocalTime(curtime); + } + else + { + m_bcalc_local_time = true; + } // Handle wrap around if (m_localtime < min(m_startframe, m_endframe) || m_localtime > max(m_startframe, m_endframe)) |