ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix travis

Browse Source
This commit is contained in:
Vincent Lejeune 2014-09-07 00:33:34 +02:00
parent b9a595e666
commit 4822b8a75e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/irrlicht/include/matrix4.h
View File

@ -48,7 +48,9 @@ namespace core
class CMatrix4 class CMatrix4
{ {
private: private:
#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
float M_raw[24]; float M_raw[24];
#endif
public: public:
//! Constructor Flags //! Constructor Flags
@ -407,8 +409,12 @@ namespace core
bool equals(const core::CMatrix4<T>& other, const T tolerance=(T)ROUNDING_ERROR_f64) const; bool equals(const core::CMatrix4<T>& other, const T tolerance=(T)ROUNDING_ERROR_f64) const;
private: private:
#if defined(WIN32) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
//! Matrix data, stored in row-major order //! Matrix data, stored in row-major order
T* M = (T*)((uintptr_t)&M_raw[4] & ~0xF); T* M = (T*)((uintptr_t)&M_raw[4] & ~0xF);
#else
T M[16];
#endif
#if defined ( USE_MATRIX_TEST ) #if defined ( USE_MATRIX_TEST )
//! Flag is this matrix is identity matrix //! Flag is this matrix is identity matrix
mutable u32 definitelyIdentityMatrix; mutable u32 definitelyIdentityMatrix;