mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch 'static-const' of https://github.com/g-truc/glm into static-const

Browse Source
This commit is contained in:
Christophe Riccio
2015-10-07 22:32:59 +02:00
parent 9902e3014f 143c4c336a
commit 869caacac5
49 changed files with 627 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/gtx/gtx_simd_mat4.cpp
View File

@@ -29,6 +29,7 @@
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#define GLM_STATIC_CONST_MEMBERS
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/quaternion.hpp>
@@ -252,6 +253,15 @@ int test_compute_gtx()
return 0;
}
int test_static_const() {
int Error(0);
Error += glm::mat4_cast(glm::simdMat4(static_cast<float>(1))) == glm::mat4_cast(glm::simdMat4::IDENTITY) ? 0 : 1;
Error += glm::mat4_cast(glm::simdMat4(static_cast<float>(0))) == glm::mat4_cast(glm::simdMat4::ZERO) ? 0 : 1;
return Error;
}
int main()
{
int Error = 0;
@@ -313,7 +323,7 @@ int main()
Error += test_compute_glm();
Error += test_compute_gtx();
Error += test_static_const();
float Det = glm::determinant(glm::simdMat4(1.0));
Error += Det == 1.0f ? 0 : 1;

2
test/gtx/gtx_simd_vec4.cpp
View File

@@ -29,6 +29,8 @@
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#define GLM_STATIC_CONST_MEMBERS
#include <glm/glm.hpp>
#include <glm/gtx/simd_vec4.hpp>
#include <cstdio>