External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-03 16:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix double-promotion warnings in tests

Browse Source
This commit is contained in:
Michael Aganier
2025-05-12 17:38:18 -04:00
parent a886d6e170
commit a761088e15
3 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
test/src/test_common.c
View File

@@ -176,7 +176,7 @@ test_assert_mat4_eq(mat4 m1, mat4 m2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -189,7 +189,7 @@ test_assert_mat4_eqt(mat4 m1, mat4 m2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
ASSERT(fabsf(m1[j][i] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[j][i] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -215,7 +215,7 @@ test_assert_mat2_eqt(mat2 m1, mat2 m2) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
ASSERT(fabsf(m1[j][i] - m2[i][j]) <= 0.0000009); ASSERT(fabsf(m1[j][i] - m2[i][j]) <= 0.0000009f);
} }
} }
@@ -228,7 +228,7 @@ test_assert_mat2_eq(mat2 m1, mat2 m2) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009); ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f);
} }
} }
@@ -284,7 +284,7 @@ test_assert_mat2x3_eq(mat2x3 m1, mat2x3 m2) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -310,7 +310,7 @@ test_assert_mat2x4_eq(mat2x4 m1, mat2x4 m2) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -323,7 +323,7 @@ test_assert_mat3_eq(mat3 m1, mat3 m2) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009); ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f);
} }
} }
@@ -336,7 +336,7 @@ test_assert_mat3_eqt(mat3 m1, mat3 m2) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
ASSERT(fabsf(m1[j][i] - m2[i][j]) <= 0.0000009); ASSERT(fabsf(m1[j][i] - m2[i][j]) <= 0.0000009f);
} }
} }
@@ -392,7 +392,7 @@ test_assert_mat3x2_eq(mat3x2 m1, mat3x2 m2) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -418,7 +418,7 @@ test_assert_mat3x4_eq(mat3x4 m1, mat3x4 m2) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -474,7 +474,7 @@ test_assert_mat4x2_eq(mat4x2 m1, mat4x2 m2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -500,7 +500,7 @@ test_assert_mat4x3_eq(mat4x3 m1, mat4x3 m2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009f)
} }
} }
@@ -509,24 +509,24 @@ test_assert_mat4x3_eq(mat4x3 m1, mat4x3 m2) {
test_status_t test_status_t
test_assert_eqf(float a, float b) { test_assert_eqf(float a, float b) {
ASSERT(fabsf(a - b) <= 0.000009); /* rounding errors */ ASSERT(fabsf(a - b) <= 0.000009f); /* rounding errors */
TEST_SUCCESS TEST_SUCCESS
} }
test_status_t test_status_t
test_assert_vec2_eq(vec2 v1, vec2 v2) { test_assert_vec2_eq(vec2 v1, vec2 v2) {
ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009); /* rounding errors */ ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009f); /* rounding errors */
ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009); ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009f);
TEST_SUCCESS TEST_SUCCESS
} }
test_status_t test_status_t
test_assert_vec3_eq(vec3 v1, vec3 v2) { test_assert_vec3_eq(vec3 v1, vec3 v2) {
ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009); /* rounding errors */ ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009f); /* rounding errors */
ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009); ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009f);
ASSERT(fabsf(v1[2] - v2[2]) <= 0.000009); ASSERT(fabsf(v1[2] - v2[2]) <= 0.000009f);
TEST_SUCCESS TEST_SUCCESS
} }
@@ -540,10 +540,10 @@ test_assert_vec3s_eq(vec3s v1, vec3s v2) {
test_status_t test_status_t
test_assert_vec4_eq(vec4 v1, vec4 v2) { test_assert_vec4_eq(vec4 v1, vec4 v2) {
ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009); /* rounding errors */ ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009f); /* rounding errors */
ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009); ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009f);
ASSERT(fabsf(v1[2] - v2[2]) <= 0.000009); ASSERT(fabsf(v1[2] - v2[2]) <= 0.000009f);
ASSERT(fabsf(v1[3] - v2[3]) <= 0.000009); ASSERT(fabsf(v1[3] - v2[3]) <= 0.000009f);
TEST_SUCCESS TEST_SUCCESS
} }
@@ -557,20 +557,20 @@ test_assert_vec4s_eq(vec4s v1, vec4s v2) {
test_status_t test_status_t
test_assert_quat_eq_abs(versor v1, versor v2) { test_assert_quat_eq_abs(versor v1, versor v2) {
ASSERT(fabsf(fabsf(v1[0]) - fabsf(v2[0])) <= 0.0009); /* rounding errors */ ASSERT(fabsf(fabsf(v1[0]) - fabsf(v2[0])) <= 0.0009f); /* rounding errors */
ASSERT(fabsf(fabsf(v1[1]) - fabsf(v2[1])) <= 0.0009); ASSERT(fabsf(fabsf(v1[1]) - fabsf(v2[1])) <= 0.0009f);
ASSERT(fabsf(fabsf(v1[2]) - fabsf(v2[2])) <= 0.0009); ASSERT(fabsf(fabsf(v1[2]) - fabsf(v2[2])) <= 0.0009f);
ASSERT(fabsf(fabsf(v1[3]) - fabsf(v2[3])) <= 0.0009); ASSERT(fabsf(fabsf(v1[3]) - fabsf(v2[3])) <= 0.0009f);
TEST_SUCCESS TEST_SUCCESS
} }
test_status_t test_status_t
test_assert_quat_eq(versor v1, versor v2) { test_assert_quat_eq(versor v1, versor v2) {
ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009); /* rounding errors */ ASSERT(fabsf(v1[0] - v2[0]) <= 0.000009f); /* rounding errors */
ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009); ASSERT(fabsf(v1[1] - v2[1]) <= 0.000009f);
ASSERT(fabsf(v1[2] - v2[2]) <= 0.000009); ASSERT(fabsf(v1[2] - v2[2]) <= 0.000009f);
ASSERT(fabsf(v1[3] - v2[3]) <= 0.000009); ASSERT(fabsf(v1[3] - v2[3]) <= 0.000009f);
TEST_SUCCESS TEST_SUCCESS
} }
@@ -579,10 +579,10 @@ test_status_t
test_assert_quat_eq_identity(versor q) { test_assert_quat_eq_identity(versor q) {
versor p = GLM_QUAT_IDENTITY_INIT; versor p = GLM_QUAT_IDENTITY_INIT;
ASSERT(fabsf(q[0] - p[0]) <= 0.000009); /* rounding errors */ ASSERT(fabsf(q[0] - p[0]) <= 0.000009f); /* rounding errors */
ASSERT(fabsf(q[1] - p[1]) <= 0.000009); ASSERT(fabsf(q[1] - p[1]) <= 0.000009f);
ASSERT(fabsf(q[2] - p[2]) <= 0.000009); ASSERT(fabsf(q[2] - p[2]) <= 0.000009f);
ASSERT(fabsf(q[3] - p[3]) <= 0.000009); ASSERT(fabsf(q[3] - p[3]) <= 0.000009f);
TEST_SUCCESS TEST_SUCCESS
} }

36
test/src/test_project.h
View File

@@ -27,13 +27,13 @@ TEST_IMPL(GLM_PREFIX, unprojecti) {
/* unprojected of projected vector must be same as original one */ /* unprojected of projected vector must be same as original one */
/* we used 0.01 because of projection floating point errors */ /* we used 0.01 because of projection floating point errors */
#ifndef CGLM_FAST_MATH #ifndef CGLM_FAST_MATH
ASSERT(fabsf(pos[0] - unprojected[0]) < 0.01) ASSERT(fabsf(pos[0] - unprojected[0]) < 0.01f)
ASSERT(fabsf(pos[1] - unprojected[1]) < 0.01) ASSERT(fabsf(pos[1] - unprojected[1]) < 0.01f)
ASSERT(fabsf(pos[2] - unprojected[2]) < 0.01) ASSERT(fabsf(pos[2] - unprojected[2]) < 0.01f)
#else #else
ASSERT(fabsf(pos[0] - unprojected[0]) < 0.1) ASSERT(fabsf(pos[0] - unprojected[0]) < 0.1f)
ASSERT(fabsf(pos[1] - unprojected[1]) < 0.1) ASSERT(fabsf(pos[1] - unprojected[1]) < 0.1f)
ASSERT(fabsf(pos[2] - unprojected[2]) < 0.1) ASSERT(fabsf(pos[2] - unprojected[2]) < 0.1f)
#endif #endif
TEST_SUCCESS TEST_SUCCESS
@@ -58,13 +58,13 @@ TEST_IMPL(GLM_PREFIX, unproject) {
/* we used 0.01 because of projection floating point errors */ /* we used 0.01 because of projection floating point errors */
#ifndef CGLM_FAST_MATH #ifndef CGLM_FAST_MATH
ASSERT(fabsf(pos[0] - unprojected[0]) < 0.01) ASSERT(fabsf(pos[0] - unprojected[0]) < 0.01f)
ASSERT(fabsf(pos[1] - unprojected[1]) < 0.01) ASSERT(fabsf(pos[1] - unprojected[1]) < 0.01f)
ASSERT(fabsf(pos[2] - unprojected[2]) < 0.01) ASSERT(fabsf(pos[2] - unprojected[2]) < 0.01f)
#else #else
ASSERT(fabsf(pos[0] - unprojected[0]) < 0.1) ASSERT(fabsf(pos[0] - unprojected[0]) < 0.1f)
ASSERT(fabsf(pos[1] - unprojected[1]) < 0.1) ASSERT(fabsf(pos[1] - unprojected[1]) < 0.1f)
ASSERT(fabsf(pos[2] - unprojected[2]) < 0.1) ASSERT(fabsf(pos[2] - unprojected[2]) < 0.1f)
#endif #endif
TEST_SUCCESS TEST_SUCCESS
@@ -89,13 +89,13 @@ TEST_IMPL(GLM_PREFIX, project) {
/* we used 0.01 because of projection floating point errors */ /* we used 0.01 because of projection floating point errors */
#ifndef CGLM_FAST_MATH #ifndef CGLM_FAST_MATH
ASSERT(fabsf(pos[0] - unprojected[0]) < 0.01) ASSERT(fabsf(pos[0] - unprojected[0]) < 0.01f)
ASSERT(fabsf(pos[1] - unprojected[1]) < 0.01) ASSERT(fabsf(pos[1] - unprojected[1]) < 0.01f)
ASSERT(fabsf(pos[2] - unprojected[2]) < 0.01) ASSERT(fabsf(pos[2] - unprojected[2]) < 0.01f)
#else #else
ASSERT(fabsf(pos[0] - unprojected[0]) < 0.1) ASSERT(fabsf(pos[0] - unprojected[0]) < 0.1f)
ASSERT(fabsf(pos[1] - unprojected[1]) < 0.1) ASSERT(fabsf(pos[1] - unprojected[1]) < 0.1f)
ASSERT(fabsf(pos[2] - unprojected[2]) < 0.1) ASSERT(fabsf(pos[2] - unprojected[2]) < 0.1f)
#endif #endif
/* test with no projection */ /* test with no projection */

8
test/src/test_ray.h
View File

@@ -20,7 +20,7 @@ TEST_IMPL(GLM_PREFIX, ray_triangle) {
hit = GLM(ray_triangle)(origin, direction, v0, v1, v2, &d); hit = GLM(ray_triangle)(origin, direction, v0, v1, v2, &d);
ASSERT(hit); ASSERT(hit);
ASSERT(fabsf(d - 5.0f) <= 0.0000009); ASSERT(fabsf(d - 5.0f) <= 0.0000009f);
/* Check whether a simple miss works */ /* Check whether a simple miss works */
hit = GLM(ray_triangle)(origin, opposite, v0, v1, v2, &d); hit = GLM(ray_triangle)(origin, opposite, v0, v1, v2, &d);
@@ -65,9 +65,9 @@ TEST_IMPL(GLM_PREFIX, ray_at) {
glm_vec3_normalize(direction); glm_vec3_normalize(direction);
GLM(ray_at)(origin, direction, distance, result); GLM(ray_at)(origin, direction, distance, result);
ASSERT(fabsf(result[0] - 1.0f) <= 0.0000009); /* Expecting to be 1 unit along the x-axis */ ASSERT(fabsf(result[0] - 1.0f) <= 0.0000009f); /* Expecting to be 1 unit along the x-axis */
ASSERT(fabsf(result[1] - 1.0f) <= 0.0000009); /* Expecting to be 1 unit along the y-axis */ ASSERT(fabsf(result[1] - 1.0f) <= 0.0000009f); /* Expecting to be 1 unit along the y-axis */
ASSERT(fabsf(result[2] - 1.0f) <= 0.0000009); /* Expecting to be 1 unit along the z-axis */ ASSERT(fabsf(result[2] - 1.0f) <= 0.0000009f); /* Expecting to be 1 unit along the z-axis */
TEST_SUCCESS TEST_SUCCESS
} }