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

Fixed interpolation while looping a sequence 

Former-commit-id: dddcb6ba6116ebc0302355bb8cf93eaf6a0b612a
This commit is contained in:
Lynix 2012-11-30 15:22:01 +01:00
parent 73466a5c07
commit b62ae632a0
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ unsigned int NzModel::GetMaterialCount() const
{ {
return m_matCount; return m_matCount;
} }
unsigned int NzModel::GetSkinCount() const unsigned int NzModel::GetSkinCount() const
{ {
return m_skinCount; return m_skinCount;
@ -215,6 +216,9 @@ bool NzModel::SetAnimation(const NzAnimation* animation)
if (m_animation) if (m_animation)
{ {
m_animation->AddResourceReference(); m_animation->AddResourceReference();
m_currentFrame = 0;
m_interpolation = 0.f;
SetSequence(0); SetSequence(0);
} }
@ -297,7 +301,6 @@ void NzModel::SetMesh(const NzMesh* mesh, const NzModelParameters& modelParamete
} }
} }
m_interpolation = 0.f;
m_matCount = mesh->GetMaterialCount(); m_matCount = mesh->GetMaterialCount();
m_materials.resize(m_matCount, NzMaterial::GetDefault()); m_materials.resize(m_matCount, NzMaterial::GetDefault());
if (modelParameters.loadMaterials) if (modelParameters.loadMaterials)
@ -390,9 +393,17 @@ void NzModel::Update(float elapsedTime)
{ {
m_interpolation -= 1.f; m_interpolation -= 1.f;
unsigned lastFrame = m_currentSequence->firstFrame + m_currentSequence->frameCount - 1;
if (m_nextFrame+1 > lastFrame)
{
m_currentFrame = m_currentSequence->firstFrame;
m_nextFrame = m_currentFrame+1;
}
else
{
m_currentFrame = m_nextFrame; m_currentFrame = m_nextFrame;
if (++m_nextFrame >= m_currentSequence->firstFrame+m_currentSequence->frameCount) m_nextFrame++;
m_nextFrame = m_currentSequence->firstFrame; }
} }
m_mesh->Animate(m_animation, m_currentFrame, m_nextFrame, m_interpolation); m_mesh->Animate(m_animation, m_currentFrame, m_nextFrame, m_interpolation);