mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed build with GCC 4.7 C++11

Browse Source
This commit is contained in:
Christophe Riccio 2013-12-25 16:02:00 +01:00
parent 7fd1cdc477
commit 4ca881697d
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/gtx/io.inl
View File

@ -187,7 +187,7 @@ namespace detail
if (cerberus) { if (cerberus) {
tmat2x2<T,P> m(a); tmat2x2<T,P> m(a);
if (io::format_guard::order_t::row_major == io::order()) { if (io::format_guard::row_major == io::order()) {
m = transpose(a); m = transpose(a);
} }

2
glm/gtx/simd_mat4.hpp
View File

@ -69,7 +69,7 @@ namespace detail
typedef fmat4x4SIMD type; typedef fmat4x4SIMD type;
typedef fmat4x4SIMD transpose_type; typedef fmat4x4SIMD transpose_type;
GLM_FUNC_DECL GLM_CONSTEXPR length_t length() const; GLM_FUNC_DECL length_t length() const;
fvec4SIMD Data[4]; fvec4SIMD Data[4];

51
glm/gtx/simd_mat4.inl
View File

@ -10,11 +10,37 @@
namespace glm{ namespace glm{
namespace detail{ namespace detail{
GLM_FUNC_QUALIFIER GLM_CONSTEXPR length_t fmat4x4SIMD::length() const GLM_FUNC_QUALIFIER length_t fmat4x4SIMD::length() const
{ {
return 4; return 4;
} }
//////////////////////////////////////
// Accesses
GLM_FUNC_QUALIFIER fvec4SIMD & fmat4x4SIMD::operator[]
(
length_t i
)
{
assert(i < this->length());
return this->Data[i];
}
GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
(
length_t i
) const
{
assert(i < this->length());
return this->Data[i];
}
//////////////////////////////////////////////////////////////
// Constructors
GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD() GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD()
{ {
#ifndef GLM_SIMD_ENABLE_DEFAULT_INIT #ifndef GLM_SIMD_ENABLE_DEFAULT_INIT
@ -83,29 +109,6 @@ GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
this->Data[3] = in[3]; this->Data[3] = in[3];
} }
//////////////////////////////////////
// Accesses
GLM_FUNC_QUALIFIER fvec4SIMD & fmat4x4SIMD::operator[]
(
length_t i
)
{
assert(i < this->length());
return this->Data[i];
}
GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
(
length_t i
) const
{
assert(i < this->length());
return this->Data[i];
}
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
// mat4 operators // mat4 operators