From ba9ad75f5879e5514037c60176f30904fd0d979d Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 29 Jan 2013 01:59:04 +0100 Subject: [PATCH] Model::Update no longer skin mesh Former-commit-id: 4179cdac6d14941c4e8c00eecb943779451246d1 --- src/Nazara/3D/Model.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Nazara/3D/Model.cpp b/src/Nazara/3D/Model.cpp index 9b6e8224a..36a00a6aa 100644 --- a/src/Nazara/3D/Model.cpp +++ b/src/Nazara/3D/Model.cpp @@ -408,13 +408,8 @@ void NzModel::SetSequence(unsigned int sequenceIndex) void NzModel::Update(float elapsedTime) { - #if NAZARA_3D_SAFE if (!m_animation) - { - NazaraError("Model has no animation"); return; - } - #endif m_interpolation += m_currentSequence->frameRate * elapsedTime; 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); }