Fixed node derived formula
Former-commit-id: da4c46e3086640147b3503928ef05e03f3c8e4cb
This commit is contained in:
parent
a15a54494f
commit
883c5fa0da
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue