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

Changed Matrix4::(Make)Transform argument pos

Browse Source 
To reflect "TRS" transformation
Also removed an useless line


Former-commit-id: b60a70d04797f40f3490b26706740b375fe38421
This commit is contained in:
Lynix
2013-05-01 01:35:17 +02:00
parent 6699ce328f
commit 961c658ae1
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Math/Matrix4.inl
View File

@@ -369,8 +369,6 @@ bool NzMatrix4<T>::GetInverseAffine(NzMatrix4* dest) const
m41 * m12 * m23 +
m41 * m13 * m22;
inv[15] = F(0.0);
T invDet = F(1.0) / det;
for (unsigned int i = 0; i < 16; ++i)
inv[i] *= invDet;
@@ -563,7 +561,7 @@ NzMatrix4<T>& NzMatrix4<T>::MakeTranslation(const NzVector3<T>& translation)
}
template<typename T>
NzMatrix4<T>& NzMatrix4<T>::MakeTransform(const NzVector3<T>& translation, const NzVector3<T>& scale, const NzQuaternion<T>& rotation)
NzMatrix4<T>& NzMatrix4<T>::MakeTransform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation, const NzVector3<T>& scale)
{
// La rotation et la translation peuvent être appliquées directement
SetRotation(rotation);
@@ -922,10 +920,10 @@ NzMatrix4<T> NzMatrix4<T>::Translate(const NzVector3<T>& translation)
}
template<typename T>
NzMatrix4<T> NzMatrix4<T>::Transform(const NzVector3<T>& translation, const NzVector3<T>& scale, const NzQuaternion<T>& rotation)
NzMatrix4<T> NzMatrix4<T>::Transform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation, const NzVector3<T>& scale)
{
NzMatrix4 mat;
mat.MakeTransform(translation, scale, rotation);
mat.MakeTransform(translation, rotation, scale);
return mat;
}