mewin/glm
1
0
Fork 0
Code Releases Activity

Removed ambiguity in fmat4x4 constructor

Browse Source
This commit is contained in:
Jesse Talavera-Greenberg 2015-10-07 16:12:45 -04:00
parent 08bf6e78c9
commit e55eb1e08b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtx/simd_mat4.inl
View File

@ -62,8 +62,8 @@ GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
} }
#ifdef GLM_STATIC_CONST_MEMBERS #ifdef GLM_STATIC_CONST_MEMBERS
const fmat4x4SIMD fmat4x4SIMD::ZERO(0); const fmat4x4SIMD fmat4x4SIMD::ZERO(static_cast<float>(0));
const fmat4x4SIMD fmat4x4SIMD::IDENTITY(1); const fmat4x4SIMD fmat4x4SIMD::IDENTITY(static_cast<float>(1));
#endif #endif
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////

4
test/gtx/gtx_simd_mat4.cpp
View File

@ -256,8 +256,8 @@ int test_compute_gtx()
int test_static_const() { int test_static_const() {
int Error(0); int Error(0);
Error += glm::simdMat4(1) == glm::simdMat4::IDENTITY ? 0 : 1; Error += glm::mat4_cast(glm::simdMat4(static_cast<float>(1))) == glm::mat4_cast(glm::simdMat4::IDENTITY) ? 0 : 1;
Error += glm::simdMat4(0) == glm::simdMat4::ZERO ? 0 : 1; Error += glm::mat4_cast(glm::simdMat4(static_cast<float>(0))) == glm::mat4_cast(glm::simdMat4::ZERO) ? 0 : 1;
return Error; return Error;
} }