mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-13 15:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

# Updated unit animation code.

Browse Source 
Added UnitAnimation class, to act as the interface between the entity
and actor. (Currently doesn't work very well, but it does make
animations loop smoothly and sometimes kind of makes them stay
synchronised.)
Fixed corpse animation - it now plays the final frame of the death
animation before turning static.
Fixed update/interpolate timings.
Added JS function saveProfileData.
Updated ffmpeg library.

This was SVN commit r4880.
This commit is contained in:
Ykkrosh
2007-02-10 03:09:52 +00:00
parent 54f381cc1b
commit bdbb2bcb16
24 changed files with 350 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/Model.cpp
+37 -4
View File
@@ -225,20 +225,35 @@ void CModel::Update(float time)
if (m_Anim && m_Anim->m_AnimDef && m_BoneMatrices)
{
// adjust for animation speed
float animtime = time*m_AnimSpeed;
float animTimeDelta = time*m_AnimSpeed;
float oldAnimTime = m_AnimTime;
// update animation time, but don't calculate bone matrices - do that (lazily) when
// something requests them; that saves some calculation work for offscreen models,
// and also assures the world space, inverted bone matrices (required for normal
// skinning) are up to date with respect to m_Transform
m_AnimTime += animtime;
m_AnimTime += animTimeDelta;
float duration = m_Anim->m_AnimDef->GetDuration();
if (m_AnimTime > duration)
{
if (m_Flags & MODELFLAG_NOLOOPANIMATION)
SetAnimation(m_NextAnim);
{
if (m_NextAnim)
SetAnimation(m_NextAnim);
else
{
// Changing to no animation - probably becoming a corpse.
// Make sure the last displayed frame is the final frame
// of the animation.
float nearlyEnd = duration - 1.f; // 1 msec
if (abs(oldAnimTime - nearlyEnd) < 1.f)
SetAnimation(NULL);
else
m_AnimTime = nearlyEnd;
}
}
else
m_AnimTime = fmod(m_AnimTime, duration);
}
@@ -255,6 +270,24 @@ void CModel::Update(float time)
m_Props[i].m_Model->Update(time);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool CModel::NeedsNewAnim(float time) const
{
// TODO: fix UnitAnimation so it correctly loops animated props
if (m_Anim && m_Anim->m_AnimDef && m_BoneMatrices)
{
// adjust for animation speed
float animtime = time * m_AnimSpeed;
float duration = m_Anim->m_AnimDef->GetDuration();
if (m_AnimTime + animtime > duration)
return true;
}
return false;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
// InvalidatePosition
void CModel::InvalidatePosition()