From 883c5fa0daeae7c60718fea0a4e064075232249d Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 9 Dec 2012 01:44:18 +0100 Subject: [PATCH] Fixed node derived formula Former-commit-id: da4c46e3086640147b3503928ef05e03f3c8e4cb --- src/Nazara/Utility/Node.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Nazara/Utility/Node.cpp b/src/Nazara/Utility/Node.cpp index 1f8e459f1..3f300174f 100644 --- a/src/Nazara/Utility/Node.cpp +++ b/src/Nazara/Utility/Node.cpp @@ -459,11 +459,11 @@ void NzNode::UpdateDerived() const if (m_inheritRotation) { - m_derivedRotation = m_parent->m_derivedRotation * m_initialRotation * m_rotation; + m_derivedRotation = m_initialRotation * m_parent->m_derivedRotation * m_rotation; m_derivedRotation.Normalize(); } else - m_derivedRotation = m_initialRotation * m_rotation; + m_derivedRotation = m_initialRotation * m_rotation; ///FIXME: Besoin d'une normalisation ? m_derivedScale = m_initialScale * m_scale; if (m_inheritScale) @@ -476,9 +476,9 @@ void NzNode::UpdateDerived() const } else { - m_derivedRotation = m_rotation; - m_derivedScale = m_scale; - m_derivedTranslation = m_translation; + m_derivedRotation = m_initialRotation * m_rotation; + m_derivedScale = m_initialScale * m_scale; + m_derivedTranslation = m_initialTranslation + m_translation; } m_derivedUpdated = true;