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

Fixed compilation error 

Former-commit-id: febc503b22cedaa4edf0efe3677cf38a205d7230
This commit is contained in:
Lynix 2014-07-29 10:30:49 +02:00
parent 454a5b1281
commit d9cce5d7ce
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,16 +150,16 @@ NzVector4<T> NzMatrix4<T>::GetColumn(unsigned int column) const
///FIXME: Est-ce une bonne idée de gérer la matrice de cette façon ? ///FIXME: Est-ce une bonne idée de gérer la matrice de cette façon ?
#if NAZARA_MATH_SAFE #if NAZARA_MATH_SAFE
if (row > 3) if (column > 3)
{ {
NzStringStream ss; NzStringStream ss;
ss << "Row out of range: (" << row << ") > 3"; ss << "Row out of range: (" << column << ") > 3";
throw std::out_of_range(ss.ToString()); throw std::out_of_range(ss.ToString());
} }
#endif #endif
T* ptr = (&m11) + row*4; T* ptr = (&m11) + column*4;
return NzVector4<T>(ptr); return NzVector4<T>(ptr);
} }
@ -469,17 +469,17 @@ NzVector4<T> NzMatrix4<T>::GetRow(unsigned int row) const
///FIXME: Est-ce une bonne idée de gérer la matrice de cette façon ? ///FIXME: Est-ce une bonne idée de gérer la matrice de cette façon ?
#if NAZARA_MATH_SAFE #if NAZARA_MATH_SAFE
if (column > 3) if (row > 3)
{ {
NzStringStream ss; NzStringStream ss;
ss << "Column out of range: (" << column << ") > 3"; ss << "Column out of range: (" << row << ") > 3";
throw std::out_of_range(ss.ToString()); throw std::out_of_range(ss.ToString());
} }
#endif #endif
T* ptr = &m11; T* ptr = &m11;
return NzVector4<T>(ptr[column], ptr[column+4], ptr[column+8], ptr[column+12]); return NzVector4<T>(ptr[row], ptr[row+4], ptr[row+8], ptr[row+12]);
} }
template<typename T> template<typename T>