External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-04 17:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace M_PI_4 in test_affine with CGLM_PI_4

Browse Source 
As in the previous commit, because it's non-standard and depending on
your settings it can fail to compile because of it.
This commit is contained in:
Carsten Hartenfels
2018-09-19 20:46:37 +02:00
parent d3c50147cb
commit b00f2b9ccc
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/src/test_affine.c
View File

@@ -12,7 +12,7 @@ test_affine(void **state) {
mat4 t1, t2, t3, t4, t5; mat4 t1, t2, t3, t4, t5;
/* test translate is postmultiplied */ /* test translate is postmultiplied */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glmc_mat4_mul(t1, t2, t3); /* R * T */ glmc_mat4_mul(t1, t2, t3); /* R * T */
@@ -21,16 +21,16 @@ test_affine(void **state) {
test_assert_mat4_eq(t1, t3); test_assert_mat4_eq(t1, t3);
/* test rotate is postmultiplied */ /* test rotate is postmultiplied */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glmc_mat4_mul(t2, t1, t3); /* T * R */ glmc_mat4_mul(t2, t1, t3); /* T * R */
glm_rotate(t2, M_PI_4, GLM_YUP); glm_rotate(t2, CGLM_PI_4, GLM_YUP);
test_assert_mat4_eq(t2, t3); test_assert_mat4_eq(t2, t3);
/* test scale is postmultiplied */ /* test scale is postmultiplied */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glm_scale_make(t4, (vec3){3, 5, 6}); glm_scale_make(t4, (vec3){3, 5, 6});
@@ -41,7 +41,7 @@ test_affine(void **state) {
test_assert_mat4_eq(t3, t5); test_assert_mat4_eq(t3, t5);
/* test translate_x */ /* test translate_x */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){34, 0, 0}); glm_translate_make(t2, (vec3){34, 0, 0});
glmc_mat4_mul(t1, t2, t3); /* R * T */ glmc_mat4_mul(t1, t2, t3); /* R * T */
@@ -49,7 +49,7 @@ test_affine(void **state) {
test_assert_mat4_eq(t1, t3); test_assert_mat4_eq(t1, t3);
/* test translate_y */ /* test translate_y */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){0, 57, 0}); glm_translate_make(t2, (vec3){0, 57, 0});
glmc_mat4_mul(t1, t2, t3); /* R * T */ glmc_mat4_mul(t1, t2, t3); /* R * T */
@@ -57,7 +57,7 @@ test_affine(void **state) {
test_assert_mat4_eq(t1, t3); test_assert_mat4_eq(t1, t3);
/* test translate_z */ /* test translate_z */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){0, 0, 36}); glm_translate_make(t2, (vec3){0, 0, 36});
glmc_mat4_mul(t1, t2, t3); /* R * T */ glmc_mat4_mul(t1, t2, t3); /* R * T */
@@ -65,43 +65,43 @@ test_affine(void **state) {
test_assert_mat4_eq(t1, t3); test_assert_mat4_eq(t1, t3);
/* test rotate_x */ /* test rotate_x */
glmc_rotate_make(t1, M_PI_4, (vec3){1, 0, 0}); glmc_rotate_make(t1, CGLM_PI_4, (vec3){1, 0, 0});
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glmc_mat4_mul(t2, t1, t3); /* T * R */ glmc_mat4_mul(t2, t1, t3); /* T * R */
glm_rotate_x(t2, M_PI_4, t2); glm_rotate_x(t2, CGLM_PI_4, t2);
test_assert_mat4_eq(t2, t3); test_assert_mat4_eq(t2, t3);
/* test rotate_y */ /* test rotate_y */
glmc_rotate_make(t1, M_PI_4, (vec3){0, 1, 0}); glmc_rotate_make(t1, CGLM_PI_4, (vec3){0, 1, 0});
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glmc_mat4_mul(t2, t1, t3); /* T * R */ glmc_mat4_mul(t2, t1, t3); /* T * R */
glm_rotate_y(t2, M_PI_4, t2); glm_rotate_y(t2, CGLM_PI_4, t2);
test_assert_mat4_eq(t2, t3); test_assert_mat4_eq(t2, t3);
/* test rotate_z */ /* test rotate_z */
glmc_rotate_make(t1, M_PI_4, (vec3){0, 0, 1}); glmc_rotate_make(t1, CGLM_PI_4, (vec3){0, 0, 1});
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glmc_mat4_mul(t2, t1, t3); /* T * R */ glmc_mat4_mul(t2, t1, t3); /* T * R */
glm_rotate_z(t2, M_PI_4, t2); glm_rotate_z(t2, CGLM_PI_4, t2);
test_assert_mat4_eq(t2, t3); test_assert_mat4_eq(t2, t3);
/* test rotate */ /* test rotate */
glmc_rotate_make(t1, M_PI_4, (vec3){0, 0, 1}); glmc_rotate_make(t1, CGLM_PI_4, (vec3){0, 0, 1});
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glmc_mat4_mul(t2, t1, t3); /* T * R */ glmc_mat4_mul(t2, t1, t3); /* T * R */
glmc_rotate(t2, M_PI_4, (vec3){0, 0, 1}); glmc_rotate(t2, CGLM_PI_4, (vec3){0, 0, 1});
test_assert_mat4_eq(t3, t2); test_assert_mat4_eq(t3, t2);
/* test scale_uni */ /* test scale_uni */
glmc_rotate_make(t1, M_PI_4, GLM_YUP); glmc_rotate_make(t1, CGLM_PI_4, GLM_YUP);
glm_translate_make(t2, (vec3){34, 57, 36}); glm_translate_make(t2, (vec3){34, 57, 36});
glm_scale_make(t4, (vec3){3, 3, 3}); glm_scale_make(t4, (vec3){3, 3, 3});