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

Fixed node derived formula 

Former-commit-id: da4c46e3086640147b3503928ef05e03f3c8e4cb
This commit is contained in:
Lynix 2012-12-09 01:44:18 +01:00
parent a15a54494f
commit 883c5fa0da
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Utility/Node.cpp
View File

@ -459,11 +459,11 @@ void NzNode::UpdateDerived() const
if (m_inheritRotation) 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(); m_derivedRotation.Normalize();
} }
else else
m_derivedRotation = m_initialRotation * m_rotation; m_derivedRotation = m_initialRotation * m_rotation; ///FIXME: Besoin d'une normalisation ?
m_derivedScale = m_initialScale * m_scale; m_derivedScale = m_initialScale * m_scale;
if (m_inheritScale) if (m_inheritScale)
@ -476,9 +476,9 @@ void NzNode::UpdateDerived() const
} }
else else
{ {
m_derivedRotation = m_rotation; m_derivedRotation = m_initialRotation * m_rotation;
m_derivedScale = m_scale; m_derivedScale = m_initialScale * m_scale;
m_derivedTranslation = m_translation; m_derivedTranslation = m_initialTranslation + m_translation;
} }
m_derivedUpdated = true; m_derivedUpdated = true;