From 381e66349a2bac432def418874017e53eace122c Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Mon, 14 Oct 2019 19:08:34 +0300 Subject: [PATCH] win,test: fix test build for windows and suppress warnings --- include/cglm/bezier.h | 6 +-- test/include/common.h | 7 +++- test/runner.c | 4 -- test/src/test_mat3.h | 8 ++-- test/src/test_mat4.h | 10 ++--- test/src/test_quat.h | 36 +++++++++--------- test/src/test_vec3.h | 70 +++++++++++++++++------------------ test/src/test_vec4.h | 46 +++++++++++------------ win/cglm-test.vcxproj | 6 +++ win/cglm-test.vcxproj.filters | 18 +++++++++ 10 files changed, 116 insertions(+), 95 deletions(-) diff --git a/include/cglm/bezier.h b/include/cglm/bezier.h index 5dac859..2bbe09f 100644 --- a/include/cglm/bezier.h +++ b/include/cglm/bezier.h @@ -22,9 +22,9 @@ #define GLM_BEZIER_MAT ((mat4)GLM_BEZIER_MAT_INIT) #define GLM_HERMITE_MAT ((mat4)GLM_HERMITE_MAT_INIT) -#define CGLM_DECASTEL_EPS 1e-9 -#define CGLM_DECASTEL_MAX 1000 -#define CGLM_DECASTEL_SMALL 1e-20 +#define CGLM_DECASTEL_EPS 1e-9f +#define CGLM_DECASTEL_MAX 1000.0f +#define CGLM_DECASTEL_SMALL 1e-20f /*! * @brief cubic bezier interpolation diff --git a/test/include/common.h b/test/include/common.h index ac7059a..3c32b9f 100644 --- a/test/include/common.h +++ b/test/include/common.h @@ -52,6 +52,9 @@ typedef struct test_entry_t { #define TEST_ENTRY(FUN) { #FUN, test_ ## FUN, 0, 0 }, #define TEST_LIST static test_entry_t tests[] = +/* __VA_ARGS__ workaround for MSVC: https://stackoverflow.com/a/5134656 */ +#define EXPAND(x) x + #define TEST_OK 1 #define TEST_SUCCESS return (test_status_t){NULL, TEST_OK}; @@ -63,9 +66,9 @@ typedef struct test_entry_t { #define TEST_IMPL_ARG3(arg1, arg2, arg3, ...) arg3 #define TEST_IMPL_CHOOSER(...) \ - TEST_IMPL_ARG3(__VA_ARGS__, TEST_IMPL_ARG2, TEST_IMPL_ARG1) + EXPAND(TEST_IMPL_ARG3(__VA_ARGS__, TEST_IMPL_ARG2, TEST_IMPL_ARG1)) -#define TEST_IMPL(...) TEST_IMPL_CHOOSER(__VA_ARGS__)(__VA_ARGS__) +#define TEST_IMPL(...) EXPAND(TEST_IMPL_CHOOSER(__VA_ARGS__)(__VA_ARGS__)) #define ASSERT_EXT(expr, msg) \ if (!(expr)) { \ diff --git a/test/runner.c b/test/runner.c index 80c4e8f..7d4d858 100644 --- a/test/runner.c +++ b/test/runner.c @@ -71,10 +71,6 @@ main(int argc, const char * argv[]) { fprintf(stderr, "\n" RESET); passed++; } - - struct timespec t; - t.tv_nsec = 100000000 * 0.5; -// nanosleep(&t, NULL); } if (failed == 0) { diff --git a/test/src/test_mat3.h b/test/src/test_mat3.h index 87947df..8e2bc5e 100644 --- a/test/src/test_mat3.h +++ b/test/src/test_mat3.h @@ -134,11 +134,11 @@ TEST_IMPL(GLM_PREFIX, mat3_quat) { vec3 axis1; vec3 axis2 = {1.9f, 2.3f, 4.5f}; - GLM(quat)(q1, GLM_PI_4, 1.9f, 2.3f, 4.5f); + GLM(quat)(q1, GLM_PI_4f, 1.9f, 2.3f, 4.5f); GLM(quat_mat3)(q1, m1); GLM(mat3_quat)(m1, q2); - GLM(rotate_make)(m2, GLM_PI_4, axis2); + GLM(rotate_make)(m2, GLM_PI_4f, axis2); GLM(mat3_quat)(m1, q3); GLM(quat_axis)(q3, axis1); @@ -148,7 +148,7 @@ TEST_IMPL(GLM_PREFIX, mat3_quat) { GLM(mat4_pick3)(m2, m3); - ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4)) + ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4f)) ASSERTIFY(test_assert_vec3_eq(axis1, axis2)) ASSERTIFY(test_assert_vec4_eq(q1, q2)) ASSERTIFY(test_assert_mat3_eq(m1, m3)) @@ -187,7 +187,7 @@ TEST_IMPL(GLM_PREFIX, mat3_scale) { scale = rand() % 100; - GLM(mat3_scale)(m1, scale); + GLM(mat3_scale)(m1, (float)scale); for (i = 0; i < 3; i++) { for (j = 0; j < 3; j++) { diff --git a/test/src/test_mat4.h b/test/src/test_mat4.h index 9463714..8f24bac 100644 --- a/test/src/test_mat4.h +++ b/test/src/test_mat4.h @@ -244,11 +244,11 @@ TEST_IMPL(GLM_PREFIX, mat4_quat) { vec3 axis1; vec3 axis2 = {1.9f, 2.3f, 4.5f}; - GLM(quat)(q1, GLM_PI_4, 1.9f, 2.3f, 4.5f); + GLM(quat)(q1, GLM_PI_4f, 1.9f, 2.3f, 4.5f); GLM(quat_mat4)(q1, m1); GLM(mat4_quat)(m1, q2); - GLM(rotate_make)(m2, GLM_PI_4, axis2); + GLM(rotate_make)(m2, GLM_PI_4f, axis2); GLM(mat4_quat)(m1, q3); GLM(quat_axis)(q3, axis1); @@ -256,7 +256,7 @@ TEST_IMPL(GLM_PREFIX, mat4_quat) { GLM(vec3_normalize)(axis1); GLM(vec3_normalize)(axis2); - ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4)) + ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4f)) ASSERTIFY(test_assert_vec3_eq(axis1, axis2)) ASSERTIFY(test_assert_vec4_eq(q1, q2)) ASSERTIFY(test_assert_mat4_eq(m1, m2)) @@ -295,7 +295,7 @@ TEST_IMPL(GLM_PREFIX, mat4_scale_p) { scale = rand() % 100; - GLM(mat4_scale_p)(m1, scale); + GLM(mat4_scale_p)(m1, (float)scale); for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { @@ -314,7 +314,7 @@ TEST_IMPL(GLM_PREFIX, mat4_scale) { scale = rand() % 100; - GLM(mat4_scale)(m1, scale); + GLM(mat4_scale)(m1, (float)scale); for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { diff --git a/test/src/test_quat.h b/test/src/test_quat.h index 0001f44..b16732a 100644 --- a/test/src/test_quat.h +++ b/test/src/test_quat.h @@ -456,11 +456,11 @@ TEST_IMPL(GLM_PREFIX, quat_mat4) { vec3 axis2 = {1.9f, 2.3f, 4.5f}; int i; - GLM(quat)(q1, GLM_PI_4, 1.9f, 2.3f, 4.5f); + GLM(quat)(q1, GLM_PI_4f, 1.9f, 2.3f, 4.5f); GLM(quat_mat4)(q1, m1); GLM(mat4_quat)(m1, q2); - GLM(rotate_make)(m2, GLM_PI_4, axis2); + GLM(rotate_make)(m2, GLM_PI_4f, axis2); GLM(mat4_quat)(m1, q3); GLM(quat_axis)(q3, axis1); @@ -468,7 +468,7 @@ TEST_IMPL(GLM_PREFIX, quat_mat4) { GLM(vec3_normalize)(axis1); GLM(vec3_normalize)(axis2); - ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4)) + ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4f)) ASSERTIFY(test_assert_vec3_eq(axis1, axis2)) ASSERTIFY(test_assert_vec4_eq(q1, q2)) ASSERTIFY(test_assert_mat4_eq(m1, m2)) @@ -500,14 +500,14 @@ TEST_IMPL(GLM_PREFIX, quat_mat4t) { vec3 axis2 = {1.9f, 2.3f, 4.5f}; int i; - GLM(quat)(q1, GLM_PI_4, 1.9f, 2.3f, 4.5f); + GLM(quat)(q1, GLM_PI_4f, 1.9f, 2.3f, 4.5f); GLM(quat_mat4t)(q1, m1); glm_mat4_transpose(m1); GLM(mat4_quat)(m1, q2); - GLM(rotate_make)(m2, GLM_PI_4, axis2); + GLM(rotate_make)(m2, GLM_PI_4f, axis2); GLM(mat4_quat)(m1, q3); GLM(quat_axis)(q3, axis1); @@ -515,7 +515,7 @@ TEST_IMPL(GLM_PREFIX, quat_mat4t) { GLM(vec3_normalize)(axis1); GLM(vec3_normalize)(axis2); - ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4)) + ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4f)) ASSERTIFY(test_assert_vec3_eq(axis1, axis2)) ASSERTIFY(test_assert_vec4_eq(q1, q2)) ASSERTIFY(test_assert_mat4_eq(m1, m2)) @@ -552,14 +552,14 @@ TEST_IMPL(GLM_PREFIX, quat_mat3) { vec3 axis2 = {1.9f, 2.3f, 4.5f}; int i; - GLM(quat)(q1, GLM_PI_4, 1.9f, 2.3f, 4.5f); + GLM(quat)(q1, GLM_PI_4f, 1.9f, 2.3f, 4.5f); GLM(quat_mat3)(q1, m3); glm_mat4_identity(m1); glm_mat4_ins3(m3, m1); GLM(mat4_quat)(m1, q2); - GLM(rotate_make)(m2, GLM_PI_4, axis2); + GLM(rotate_make)(m2, GLM_PI_4f, axis2); GLM(mat4_quat)(m1, q3); GLM(quat_axis)(q3, axis1); @@ -567,7 +567,7 @@ TEST_IMPL(GLM_PREFIX, quat_mat3) { GLM(vec3_normalize)(axis1); GLM(vec3_normalize)(axis2); - ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4)) + ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4f)) ASSERTIFY(test_assert_vec3_eq(axis1, axis2)) ASSERTIFY(test_assert_vec4_eq(q1, q2)) ASSERTIFY(test_assert_mat4_eq(m1, m2)) @@ -606,7 +606,7 @@ TEST_IMPL(GLM_PREFIX, quat_mat3t) { vec3 axis2 = {1.9f, 2.3f, 4.5f}; int i; - GLM(quat)(q1, GLM_PI_4, 1.9f, 2.3f, 4.5f); + GLM(quat)(q1, GLM_PI_4f, 1.9f, 2.3f, 4.5f); GLM(quat_mat3t)(q1, m3); glm_mat3_transpose(m3); @@ -615,7 +615,7 @@ TEST_IMPL(GLM_PREFIX, quat_mat3t) { GLM(mat4_quat)(m1, q2); - GLM(rotate_make)(m2, GLM_PI_4, axis2); + GLM(rotate_make)(m2, GLM_PI_4f, axis2); GLM(mat4_quat)(m1, q3); GLM(quat_axis)(q3, axis1); @@ -623,7 +623,7 @@ TEST_IMPL(GLM_PREFIX, quat_mat3t) { GLM(vec3_normalize)(axis1); GLM(vec3_normalize)(axis2); - ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4)) + ASSERT(test_eq(glm_quat_angle(q3), GLM_PI_4f)) ASSERTIFY(test_assert_vec3_eq(axis1, axis2)) ASSERTIFY(test_assert_vec4_eq(q1, q2)) ASSERTIFY(test_assert_mat4_eq(m1, m2)) @@ -719,8 +719,8 @@ TEST_IMPL(GLM_PREFIX, quat_slerp) { GLM(quat_slerp)(q1, q2, 1.0f, q3); ASSERTIFY(test_assert_quat_eq(q1, q3)); - glm_quatv(q1, glm_rad(30.001), v1); - glm_quatv(q2, glm_rad(30.002), v1); + glm_quatv(q1, glm_rad(30.001f), v1); + glm_quatv(q2, glm_rad(30.002f), v1); GLM(quat_slerp)(q1, q2, 0.7f, q3); glm_quat_lerp(q1, q2, 0.7f, q4); ASSERTIFY(test_assert_quat_eq(q3, q4)); @@ -751,14 +751,12 @@ TEST_IMPL(GLM_PREFIX, quat_look) { glm_look(v1, (vec3){-1.0f, 0.0f, 0.0f}, GLM_YUP, m2); ASSERTIFY(test_assert_mat4_eq(m1, m2)); - glm_quat(q1, glm_rad(180.0f), 0.0f, 1.0f, 0.0f); + glm_quat(q1, glm_rad(180.0f), 1.0f, 0.0f, 0.0f); GLM(quat_look)(v1, q1, m1); - + glm_look(v1, (vec3){0.0f, 0.0f, 1.0f}, GLM_YUP, m2); - glm_mat4_print(m1, stderr); - glm_mat4_print(m2, stderr); ASSERTIFY(test_assert_mat4_eq(m1, m2)); - + TEST_SUCCESS } diff --git a/test/src/test_vec3.h b/test/src/test_vec3.h index 9b99525..4583950 100644 --- a/test/src/test_vec3.h +++ b/test/src/test_vec3.h @@ -781,12 +781,12 @@ TEST_IMPL(GLM_PREFIX, vec3_angle) { a = GLM(vec3_angle)(v1, v2); ASSERT(!isinf(a)) ASSERT(!isnan(a)) - ASSERT(test_eq(a, GLM_PI_4)) + ASSERT(test_eq(a, GLM_PI_4f)) a = GLM(vec3_angle)(v1, v3); ASSERT(!isinf(a)) ASSERT(!isnan(a)) - ASSERT(test_eq(a, GLM_PI_2)) + ASSERT(test_eq(a, GLM_PI_2f)) TEST_SUCCESS } @@ -795,56 +795,56 @@ TEST_IMPL(GLM_PREFIX, vec3_rotate) { vec3 v1 = {1.0f, 0.0f, 0.0f}, v2 = {1.0f, 1.0f, 1.0f}; /* rotate X around Y = -Z */ - GLM(vec3_rotate)(v1, GLM_PI_2, GLM_YUP); + GLM(vec3_rotate)(v1, GLM_PI_2f, GLM_YUP); ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], -1.0f)) /* rotate -Z around X = Y */ - GLM(vec3_rotate)(v1, GLM_PI_2, GLM_XUP); + GLM(vec3_rotate)(v1, GLM_PI_2f, GLM_XUP); ASSERT(test_eq(v1[0], 0.0f)) ASSERT(test_eq(v1[1], 1.0f)) ASSERT(test_eq(v1[2], 0.0f)) /* rotate Y around Z = -X */ - GLM(vec3_rotate)(v1, GLM_PI_2, GLM_ZUP); + GLM(vec3_rotate)(v1, GLM_PI_2f, GLM_ZUP); ASSERT(test_eq(v1[0], -1.0f)) ASSERT(test_eq(v1[1], 0.0f)) ASSERT(test_eq(v1[2], 0.0f)) /* rotate v2 around Y by 90deg */ - GLM(vec3_rotate)(v2, GLM_PI_2, GLM_YUP); + GLM(vec3_rotate)(v2, GLM_PI_2f, GLM_YUP); ASSERT(test_eq(v2[0], 1.0f)) ASSERT(test_eq(v2[1], 1.0f)) ASSERT(test_eq(v2[2], -1.0f)) /* rotate v2 around Y by 90deg */ - GLM(vec3_rotate)(v2, GLM_PI_2, GLM_YUP); + GLM(vec3_rotate)(v2, GLM_PI_2f, GLM_YUP); ASSERT(test_eq(v2[0], -1.0f)) ASSERT(test_eq(v2[1], 1.0f)) ASSERT(test_eq(v2[2], -1.0f)) /* rotate v2 around Y by 90deg */ - GLM(vec3_rotate)(v2, GLM_PI_2, GLM_YUP); + GLM(vec3_rotate)(v2, GLM_PI_2f, GLM_YUP); ASSERT(test_eq(v2[0], -1.0f)) ASSERT(test_eq(v2[1], 1.0f)) ASSERT(test_eq(v2[2], 1.0f)) /* rotate v2 around X by 90deg */ - GLM(vec3_rotate)(v2, GLM_PI_2, GLM_XUP); + GLM(vec3_rotate)(v2, GLM_PI_2f, GLM_XUP); ASSERT(test_eq(v2[0], -1.0f)) ASSERT(test_eq(v2[1], -1.0f)) ASSERT(test_eq(v2[2], 1.0f)) /* rotate v2 around Z by 90deg */ - GLM(vec3_rotate)(v2, GLM_PI_2, GLM_ZUP); + GLM(vec3_rotate)(v2, GLM_PI_2f, GLM_ZUP); ASSERT(test_eq(v2[0], 1.0f)) ASSERT(test_eq(v2[1], -1.0f)) @@ -857,9 +857,9 @@ TEST_IMPL(GLM_PREFIX, vec3_rotate_m4) { vec3 v1 = {1.0f, 0.0f, 0.0f}, v2 = {1.0f, 1.0f, 1.0f}; mat4 x, y, z; - glm_rotate_make(x, GLM_PI_2, GLM_XUP); - glm_rotate_make(y, GLM_PI_2, GLM_YUP); - glm_rotate_make(z, GLM_PI_2, GLM_ZUP); + glm_rotate_make(x, GLM_PI_2f, GLM_XUP); + glm_rotate_make(y, GLM_PI_2f, GLM_YUP); + glm_rotate_make(z, GLM_PI_2f, GLM_ZUP); /* rotate X around Y = -Z */ GLM(vec3_rotate_m4)(y, v1, v1); @@ -926,9 +926,9 @@ TEST_IMPL(GLM_PREFIX, vec3_rotate_m3) { mat4 x0, y0, z0; mat3 x, y, z; - glm_rotate_make(x0, GLM_PI_2, GLM_XUP); - glm_rotate_make(y0, GLM_PI_2, GLM_YUP); - glm_rotate_make(z0, GLM_PI_2, GLM_ZUP); + glm_rotate_make(x0, GLM_PI_2f, GLM_XUP); + glm_rotate_make(y0, GLM_PI_2f, GLM_YUP); + glm_rotate_make(z0, GLM_PI_2f, GLM_ZUP); glm_mat4_pick3(x0, x); glm_mat4_pick3(y0, y); @@ -1131,17 +1131,17 @@ TEST_IMPL(GLM_PREFIX, vec3_ortho) { a = glm_vec3_angle(v1, v5); ASSERT(!isinf(a)) ASSERT(!isnan(a)) - ASSERT(test_eq(a, GLM_PI_2)) + ASSERT(test_eq(a, GLM_PI_2f)) a = glm_vec3_angle(v2, v6); ASSERT(!isinf(a)) ASSERT(!isnan(a)) - ASSERT(test_eq(a, GLM_PI_2)) + ASSERT(test_eq(a, GLM_PI_2f)) a = glm_vec3_angle(v3, v7); ASSERT(!isinf(a)) ASSERT(!isnan(a)) - ASSERT(test_eq(a, GLM_PI_2)) + ASSERT(test_eq(a, GLM_PI_2f)) TEST_SUCCESS } @@ -1314,14 +1314,14 @@ TEST_IMPL(GLM_PREFIX, vec3_smoothstep_uni) { vec3 v2; GLM(vec3_smoothstep_uni)(-200.0f, -100.0f, v1, v2); - ASSERT(test_eq_th(v2[0], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[2], 1.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[2], 1.0f, 1e-5f)) GLM(vec3_smoothstep_uni)(-250.0f, -200.0f, v1, v2); - ASSERT(test_eq_th(v2[0], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[2], 1.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[2], 1.0f, 1e-5f)) GLM(vec3_smoothstep_uni)(-200.0f, 200, v1, v2); ASSERT(v2[0] > 0.0f && v2[0] < 0.25f) @@ -1342,19 +1342,19 @@ TEST_IMPL(GLM_PREFIX, vec3_smoothstep) { vec3 v2; GLM(vec3_smoothstep)(e1_0, e1_1, v1, v2); - ASSERT(test_eq_th(v2[0], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 0.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 0.0f, 1e-5f)) ASSERT(v2[2] > 0.0f && v2[2] < 0.1f) GLM(vec3_smoothstep)(e2_0, e2_1, v1, v2); ASSERT(v2[0] > 0.0f && v2[0] < 0.25f) ASSERT(v2[1] > 0.0f && v2[1] < 0.15f) - ASSERT(test_eq_th(v2[2], 1.0f, 1e-5)) + ASSERT(test_eq_th(v2[2], 1.0f, 1e-5f)) GLM(vec3_smoothstep)(e3_0, e3_1, v1, v2); - ASSERT(test_eq_th(v2[0], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[2], 0.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[2], 0.0f, 1e-5f)) TEST_SUCCESS } @@ -1368,7 +1368,7 @@ TEST_IMPL(GLM_PREFIX, vec3_smoothinterp) { vec3 e3_1 = {100.0f, 200.0f, 10.0f}; vec3 v2; - GLM(vec3_smoothinterp)(e1_0, e1_1, 0.5, v2); + GLM(vec3_smoothinterp)(e1_0, e1_1, 0.5f, v2); ASSERT(v2[0] >= e1_0[0] && v2[0] <= e1_1[0]) ASSERT(v2[1] >= e1_0[1] && v2[1] <= e1_1[1]) ASSERT(v2[2] >= e1_0[2] && v2[2] <= e1_1[2]) @@ -1395,17 +1395,17 @@ TEST_IMPL(GLM_PREFIX, vec3_smoothinterpc) { vec3 e3_1 = {100.0f, 200.0f, 10.0f}; vec3 v2; - GLM(vec3_smoothinterpc)(e1_0, e1_1, -0.5, v2); + GLM(vec3_smoothinterpc)(e1_0, e1_1, -0.5f, v2); ASSERT(v2[0] >= e1_0[0] && v2[0] <= e1_1[0]) ASSERT(v2[1] >= e1_0[1] && v2[1] <= e1_1[1]) ASSERT(v2[2] >= e1_0[2] && v2[2] <= e1_1[2]) - GLM(vec3_smoothinterpc)(e2_0, e2_1, 0.5, v2); + GLM(vec3_smoothinterpc)(e2_0, e2_1, 0.5f, v2); ASSERT(v2[0] >= e2_0[0] && v2[0] <= e2_1[0]) ASSERT(v2[1] >= e2_0[1] && v2[1] <= e2_1[1]) ASSERT(v2[2] >= e2_0[2] && v2[2] <= e2_1[2]) - GLM(vec3_smoothinterpc)(e3_0, e3_1, 2.0, v2); + GLM(vec3_smoothinterpc)(e3_0, e3_1, 2.0f, v2); ASSERT(v2[0] >= e3_0[0] && v2[0] <= e3_1[0]) ASSERT(v2[1] >= e3_0[1] && v2[1] <= e3_1[1]) ASSERT(v2[2] >= e3_0[2] && v2[2] <= e3_1[2]) diff --git a/test/src/test_vec4.h b/test/src/test_vec4.h index 6fa9763..5e20c63 100644 --- a/test/src/test_vec4.h +++ b/test/src/test_vec4.h @@ -942,18 +942,18 @@ TEST_IMPL(GLM_PREFIX, vec4_smoothstep_uni) { vec4 v2; GLM(vec4_smoothstep_uni)(-200.0f, -100.0f, v1, v2); - ASSERT(test_eq_th(v2[0], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[2], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[3], 1.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[2], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[3], 1.0f, 1e-5f)) GLM(vec4_smoothstep_uni)(-250.0f, -200.0f, v1, v2); - ASSERT(test_eq_th(v2[0], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[2], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[3], 1.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[2], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[3], 1.0f, 1e-5f)) - GLM(vec4_smoothstep_uni)(-200.0f, 200, v1, v2); + GLM(vec4_smoothstep_uni)(-200.0f, 200.0f, v1, v2); ASSERT(v2[0] > 0.0f && v2[0] < 0.25f) ASSERT(test_eq(v2[1], 0.0f)) ASSERT(v2[2] > 0.0f && v2[2] < 0.5f) @@ -973,22 +973,22 @@ TEST_IMPL(GLM_PREFIX, vec4_smoothstep) { vec4 v2; GLM(vec4_smoothstep)(e1_0, e1_1, v1, v2); - ASSERT(test_eq_th(v2[0], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 0.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 0.0f, 1e-5f)) ASSERT(v2[2] > 0.0f && v2[2] < 0.1f) ASSERT(v2[3] > 0.0f && v2[3] < 0.1f) GLM(vec4_smoothstep)(e2_0, e2_1, v1, v2); ASSERT(v2[0] > 0.0f && v2[0] < 0.25f) ASSERT(v2[1] > 0.0f && v2[1] < 0.15f) - ASSERT(test_eq_th(v2[2], 1.0f, 1e-5)) - ASSERT(test_eq_th(v2[3], 1.0f, 1e-5)) + ASSERT(test_eq_th(v2[2], 1.0f, 1e-5f)) + ASSERT(test_eq_th(v2[3], 1.0f, 1e-5f)) GLM(vec4_smoothstep)(e3_0, e3_1, v1, v2); - ASSERT(test_eq_th(v2[0], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[1], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[2], 0.0f, 1e-5)) - ASSERT(test_eq_th(v2[3], 0.0f, 1e-5)) + ASSERT(test_eq_th(v2[0], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[1], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[2], 0.0f, 1e-5f)) + ASSERT(test_eq_th(v2[3], 0.0f, 1e-5f)) TEST_SUCCESS } @@ -1002,19 +1002,19 @@ TEST_IMPL(GLM_PREFIX, vec4_smoothinterp) { vec4 e3_1 = {100.0f, 200.0f, 10.0f, 10.0f}; vec4 v2; - GLM(vec4_smoothinterp)(e1_0, e1_1, 0.5, v2); + GLM(vec4_smoothinterp)(e1_0, e1_1, 0.5f, v2); ASSERT(v2[0] >= e1_0[0] && v2[0] <= e1_1[0]) ASSERT(v2[1] >= e1_0[1] && v2[1] <= e1_1[1]) ASSERT(v2[2] >= e1_0[2] && v2[2] <= e1_1[2]) ASSERT(v2[3] >= e1_0[3] && v2[3] <= e1_1[3]) - GLM(vec4_smoothinterp)(e2_0, e2_1, 0.5, v2); + GLM(vec4_smoothinterp)(e2_0, e2_1, 0.5f, v2); ASSERT(v2[0] >= e2_0[0] && v2[0] <= e2_1[0]) ASSERT(v2[1] >= e2_0[1] && v2[1] <= e2_1[1]) ASSERT(v2[2] >= e2_0[2] && v2[2] <= e2_1[2]) ASSERT(v2[3] >= e2_0[3] && v2[3] <= e2_1[3]) - GLM(vec4_smoothinterp)(e3_0, e3_1, 1.0, v2); + GLM(vec4_smoothinterp)(e3_0, e3_1, 1.0f, v2); ASSERT(v2[0] >= e3_0[0] && v2[0] <= e3_1[0]) ASSERT(v2[1] >= e3_0[1] && v2[1] <= e3_1[1]) ASSERT(v2[2] >= e3_0[2] && v2[2] <= e3_1[2]) @@ -1032,19 +1032,19 @@ TEST_IMPL(GLM_PREFIX, vec4_smoothinterpc) { vec4 e3_1 = {100.0f, 200.0f, 10.0f, 10.0f}; vec4 v2; - GLM(vec4_smoothinterpc)(e1_0, e1_1, -0.5, v2); + GLM(vec4_smoothinterpc)(e1_0, e1_1, -0.5f, v2); ASSERT(v2[0] >= e1_0[0] && v2[0] <= e1_1[0]) ASSERT(v2[1] >= e1_0[1] && v2[1] <= e1_1[1]) ASSERT(v2[2] >= e1_0[2] && v2[2] <= e1_1[2]) ASSERT(v2[3] >= e1_0[3] && v2[3] <= e1_1[3]) - GLM(vec4_smoothinterpc)(e2_0, e2_1, 0.5, v2); + GLM(vec4_smoothinterpc)(e2_0, e2_1, 0.5f, v2); ASSERT(v2[0] >= e2_0[0] && v2[0] <= e2_1[0]) ASSERT(v2[1] >= e2_0[1] && v2[1] <= e2_1[1]) ASSERT(v2[2] >= e2_0[2] && v2[2] <= e2_1[2]) ASSERT(v2[3] >= e2_0[3] && v2[3] <= e2_1[3]) - GLM(vec4_smoothinterpc)(e3_0, e3_1, 2.0, v2); + GLM(vec4_smoothinterpc)(e3_0, e3_1, 2.0f, v2); ASSERT(v2[0] >= e3_0[0] && v2[0] <= e3_1[0]) ASSERT(v2[1] >= e3_0[1] && v2[1] <= e3_1[1]) ASSERT(v2[2] >= e3_0[2] && v2[2] <= e3_1[2]) diff --git a/win/cglm-test.vcxproj b/win/cglm-test.vcxproj index c833e6c..d6927da 100644 --- a/win/cglm-test.vcxproj +++ b/win/cglm-test.vcxproj @@ -36,6 +36,12 @@ + + + + + + diff --git a/win/cglm-test.vcxproj.filters b/win/cglm-test.vcxproj.filters index c68818e..f5ec13b 100644 --- a/win/cglm-test.vcxproj.filters +++ b/win/cglm-test.vcxproj.filters @@ -61,5 +61,23 @@ include + + src + + + src + + + src + + + src + + + src + + + src + \ No newline at end of file