sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Model::Update no longer skin mesh 

Former-commit-id: 4179cdac6d14941c4e8c00eecb943779451246d1
This commit is contained in:
Lynix 2013-01-29 01:59:04 +01:00
parent 00d636fb1c
commit ba9ad75f58
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Nazara/3D/Model.cpp
View File

@ -408,13 +408,8 @@ void NzModel::SetSequence(unsigned int sequenceIndex)
void NzModel::Update(float elapsedTime) void NzModel::Update(float elapsedTime)
{ {
#if NAZARA_3D_SAFE
if (!m_animation) if (!m_animation)
{
NazaraError("Model has no animation");
return; return;
}
#endif
m_interpolation += m_currentSequence->frameRate * elapsedTime; m_interpolation += m_currentSequence->frameRate * elapsedTime;
while (m_interpolation > 1.f) while (m_interpolation > 1.f)
@ -442,5 +437,5 @@ void NzModel::Update(float elapsedTime)
} }
} }
m_mesh->Animate(m_animation, m_currentFrame, m_nextFrame, m_interpolation, &m_skeleton); m_animation->AnimateSkeleton(&m_skeleton, m_currentFrame, m_nextFrame, m_interpolation);
} }