abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Simplify conditions in SetAnimation

Browse Source 
Introduced in d3f57744d9.
There are 2 mane cases when entity cannot play animation.
1st there are not bones
2nd animation is not valid

These conditions are merged into one.

Differential Revision: https://code.wildfiregames.com/D2416
Reviewed by: @Stan
This was SVN commit r23495.
This commit is contained in:
Angen 2020-02-13 19:24:08 +00:00
parent 8707763eb2
commit a3a5b2fd08
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/graphics/Model.cpp
View File

@ -450,7 +450,7 @@ void CModel::ValidatePosition()
// return false on error, else true
bool CModel::SetAnimation(CSkeletonAnim* anim, bool once)
{
m_Anim = NULL; // in case something fails
m_Anim = nullptr; // in case something fails
if (anim)
{
@ -459,22 +459,12 @@ bool CModel::SetAnimation(CSkeletonAnim* anim, bool once)
if (once)
m_Flags |= MODELFLAG_NOLOOPANIMATION;
if (!m_BoneMatrices && anim->m_AnimDef)
{
// not boned, can't animate
// Not rigged or animation is not valid.
if (!m_BoneMatrices || !anim->m_AnimDef)
return false;
}
if (m_BoneMatrices && !anim->m_AnimDef)
if (anim->m_AnimDef->GetNumKeys() != m_pModelDef->GetNumBones())
{
// boned, but animation isn't valid
// (e.g. the default (static) idle animation on an animated unit)
return false;
}
if (anim->m_AnimDef && anim->m_AnimDef->GetNumKeys() != m_pModelDef->GetNumBones())
{
// mismatch between model's skeleton and animation's skeleton
LOGERROR("Mismatch between model's skeleton and animation's skeleton (%s.dae has %lu model bones while the animation %s has %lu animation keys.)",
m_pModelDef->GetName().string8().c_str() ,
static_cast<unsigned long>(m_pModelDef->GetNumBones()),
@ -483,11 +473,11 @@ bool CModel::SetAnimation(CSkeletonAnim* anim, bool once)
return false;
}
// reset the cached bounds when the animation is changed
// Reset the cached bounds when the animation is changed.
m_ObjectBounds.SetEmpty();
InvalidateBounds();
// start anim from beginning
// Start anim from beginning.
m_AnimTime = 0;
}