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

Added Matrix4::(Make)ViewMatrix 

Former-commit-id: 4a21da456f90c5d0c53c291885b3a214be893b5e
This commit is contained in:
Lynix 2013-06-10 16:41:25 +02:00
parent f3d0618ae6
commit 7f9455b947
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Math/Matrix4.hpp
View File

@ -66,6 +66,7 @@ class NzMatrix4
NzMatrix4& MakeTranslation(const NzVector3<T>& translation); NzMatrix4& MakeTranslation(const NzVector3<T>& translation);
NzMatrix4& MakeTransform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation); NzMatrix4& MakeTransform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation);
NzMatrix4& MakeTransform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation, const NzVector3<T>& scale); NzMatrix4& MakeTransform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation, const NzVector3<T>& scale);
NzMatrix4& MakeViewMatrix(const NzVector3<T>& translation, const NzQuaternion<T>& rotation);
NzMatrix4& MakeZero(); NzMatrix4& MakeZero();
NzMatrix4& Set(T r11, T r12, T r13, T r14, NzMatrix4& Set(T r11, T r12, T r13, T r14,
@ -118,6 +119,7 @@ class NzMatrix4
static NzMatrix4 Translate(const NzVector3<T>& translation); static NzMatrix4 Translate(const NzVector3<T>& translation);
static NzMatrix4 Transform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation); static NzMatrix4 Transform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation);
static NzMatrix4 Transform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation, const NzVector3<T>& scale); static NzMatrix4 Transform(const NzVector3<T>& translation, const NzQuaternion<T>& rotation, const NzVector3<T>& scale);
static NzMatrix4 ViewMatrix(const NzVector3<T>& translation, const NzQuaternion<T>& rotation);
static NzMatrix4 Zero(); static NzMatrix4 Zero();
private: private:

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

@ -709,9 +709,16 @@ NzMatrix4<T>& NzMatrix4<T>::MakeTransform(const NzVector3<T>& translation, const
MakeTransform(translation, rotation); MakeTransform(translation, rotation);
// Ensuite on fait une mise à l'échelle des valeurs déjà présentes // Ensuite on fait une mise à l'échelle des valeurs déjà présentes
ApplyScale(scale); return ApplyScale(scale);
}
return *this; template<typename T>
NzMatrix4<T>& NzMatrix4<T>::MakeViewMatrix(const NzVector3<T>& translation, const NzQuaternion<T>& rotation)
{
// Une matrice de vue doit appliquer une transformation opposée à la matrice "monde"
NzQuaternionf invRot = rotation.GetConjugate(); // Inverse de la rotation
return MakeTransform(-(invRot*translation), invRot);
} }
template<typename T> template<typename T>
@ -765,6 +772,7 @@ NzMatrix4<T>& NzMatrix4<T>::Set(const T matrix[16])
template<typename T> template<typename T>
NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4& matrix) NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4& matrix)
{ {
// Le membre isIdentity est copié en même temps que les valeurs
std::memcpy(this, &matrix, sizeof(NzMatrix4)); std::memcpy(this, &matrix, sizeof(NzMatrix4));
return *this; return *this;
@ -774,12 +782,12 @@ template<typename T>
template<typename U> template<typename U>
NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4<U>& matrix) NzMatrix4<T>& NzMatrix4<T>::Set(const NzMatrix4<U>& matrix)
{ {
Set(F(matrix.m11), F(matrix.m12), F(matrix.m13), F(matrix.m14), Set(F(matrix[ 0]), F(matrix[ 1]), F(matrix[ 2]), F(matrix[ 3]),
F(matrix.m21), F(matrix.m22), F(matrix.m23), F(matrix.m24), F(matrix[ 4]), F(matrix[ 5]), F(matrix[ 6]), F(matrix[ 7]),
F(matrix.m31), F(matrix.m32), F(matrix.m33), F(matrix.m34), F(matrix[ 8]), F(matrix[ 9]), F(matrix[10]), F(matrix[11]),
F(matrix.m41), F(matrix.m42), F(matrix.m43), F(matrix.m44)); F(matrix[12]), F(matrix[13]), F(matrix[14]), F(matrix[15]));
m_isIdentity = matrix.IsIdentity(); m_isIdentity = false;
return *this; return *this;
} }
@ -884,6 +892,7 @@ NzVector4<T> NzMatrix4<T>::Transform(const NzVector4<T>& vector) const
template<typename T> template<typename T>
NzMatrix4<T>& NzMatrix4<T>::Transpose() NzMatrix4<T>& NzMatrix4<T>::Transpose()
{ {
// N'affecte pas l'identité (La transposée d'une matrice identité est la matrice identité elle-même)
std::swap(m12, m21); std::swap(m12, m21);
std::swap(m13, m31); std::swap(m13, m31);
std::swap(m14, m41); std::swap(m14, m41);
@ -1091,6 +1100,15 @@ NzMatrix4<T> NzMatrix4<T>::Transform(const NzVector3<T>& translation, const NzQu
return mat; return mat;
} }
template<typename T>
NzMatrix4<T> NzMatrix4<T>::ViewMatrix(const NzVector3<T>& translation, const NzQuaternion<T>& rotation)
{
NzMatrix4 mat;
mat.MakeViewMatrix(translation, rotation);
return mat;
}
template<typename T> template<typename T>
NzMatrix4<T> NzMatrix4<T>::Zero() NzMatrix4<T> NzMatrix4<T>::Zero()
{ {