From f0f7b67ef4a5bb67d569b493929fa7580e1c1126 Mon Sep 17 00:00:00 2001 From: Vincent Davis Jr Date: Sun, 6 Aug 2023 13:23:31 -0400 Subject: [PATCH] test: add missing mat3x4 tests Signed-off-by: Vincent Davis Jr --- test/src/test_common.c | 63 +++++++++++++++++++++++++ test/src/test_common.h | 12 +++++ test/src/test_mat3x4.h | 102 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+) diff --git a/test/src/test_common.c b/test/src/test_common.c index 63b6fd9..a6c31c6 100644 --- a/test/src/test_common.c +++ b/test/src/test_common.c @@ -37,6 +37,25 @@ test_rand_mat4x2(mat4x2 dest) { dest[3][1] = drand48(); } +void +test_rand_mat4x3(mat4x3 dest) { + dest[0][0] = drand48(); + dest[0][1] = drand48(); + dest[0][2] = drand48(); + + dest[1][0] = drand48(); + dest[1][1] = drand48(); + dest[1][2] = drand48(); + + dest[2][0] = drand48(); + dest[2][1] = drand48(); + dest[2][2] = drand48(); + + dest[3][0] = drand48(); + dest[3][1] = drand48(); + dest[3][2] = drand48(); +} + void test_rand_mat3(mat3 dest) { mat4 m4; @@ -56,6 +75,24 @@ test_rand_mat3x2(mat3x2 dest) { dest[2][1] = drand48(); } +void +test_rand_mat3x4(mat3x4 dest) { + dest[0][0] = drand48(); + dest[0][1] = drand48(); + dest[0][2] = drand48(); + dest[0][3] = drand48(); + + dest[1][0] = drand48(); + dest[1][1] = drand48(); + dest[1][2] = drand48(); + dest[1][3] = drand48(); + + dest[2][0] = drand48(); + dest[2][1] = drand48(); + dest[2][2] = drand48(); + dest[2][3] = drand48(); +} + void test_rand_mat2(mat2 dest) { dest[0][0] = drand48(); @@ -368,6 +405,19 @@ test_assert_mat3x4_eq_zero(mat3x4 m3x4) { TEST_SUCCESS } +test_status_t +test_assert_mat3x4_eq(mat3x4 m1, mat3x4 m2) { + int i, j; + + for (i = 0; i < 3; i++) { + for (j = 0; j < 4; j++) { + ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) + } + } + + TEST_SUCCESS +} + test_status_t test_assert_mat4_eq_identity(mat4 m4) { int i, j; @@ -437,6 +487,19 @@ test_assert_mat4x3_eq_zero(mat4x3 m4x3) { TEST_SUCCESS } +test_status_t +test_assert_mat4x3_eq(mat4x3 m1, mat4x3 m2) { + int i, j; + + for (i = 0; i < 4; i++) { + for (j = 0; j < 3; j++) { + ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009) + } + } + + TEST_SUCCESS +} + test_status_t test_assert_eqf(float a, float b) { ASSERT(fabsf(a - b) <= 0.000009); /* rounding errors */ diff --git a/test/src/test_common.h b/test/src/test_common.h index bd4ecd9..4fff040 100644 --- a/test/src/test_common.h +++ b/test/src/test_common.h @@ -20,12 +20,18 @@ test_rand_mat4(mat4 dest); void test_rand_mat4x2(mat4x2 dest); +void +test_rand_mat4x3(mat4x3 dest); + void test_rand_mat3(mat3 dest); void test_rand_mat3x2(mat3x2 dest); +void +test_rand_mat3x4(mat3x4 dest); + void test_rand_mat2(mat2 dest); @@ -62,6 +68,9 @@ test_assert_mat4x2_eq(mat4x2 m1, mat4x2 m2); test_status_t test_assert_mat4x3_eq_zero(mat4x3 m4x3); +test_status_t +test_assert_mat4x3_eq(mat4x3 m1, mat4x3 m2); + test_status_t test_assert_mat2_eqt(mat2 m1, mat2 m2); @@ -110,6 +119,9 @@ test_assert_mat3x2_eq(mat3x2 m1, mat3x2 m2); test_status_t test_assert_mat3x4_eq_zero(mat3x4 m3x4); +test_status_t +test_assert_mat3x4_eq(mat3x4 m1, mat3x4 m2); + test_status_t test_assert_vec3_eq(vec3 v1, vec3 v2); diff --git a/test/src/test_mat3x4.h b/test/src/test_mat3x4.h index 83dd011..c7d704c 100644 --- a/test/src/test_mat3x4.h +++ b/test/src/test_mat3x4.h @@ -7,6 +7,9 @@ #include "test_common.h" +#define A_MATRIX3X4 {{1,2,4,5},{6,7,8,9},{10,11,12,13}} +#define A_MATRIX3X4_TRANSPOSE {{1,6,10}, {2,7,1}, {4,8,12}, {5,9,13}} + #ifndef CGLM_TEST_MAT3X4_ONCE #define CGLM_TEST_MAT3X4_ONCE @@ -24,6 +27,31 @@ TEST_IMPL(MACRO_GLM_MAT3X4_ZERO) { #endif /* CGLM_TEST_MAT3X4_ONCE */ +TEST_IMPL(GLM_PREFIX, mat3x4_copy) { + mat3x4 m1 = A_MATRIX3X4; + mat3x4 m2 = GLM_MAT3X4_ZERO_INIT; + + GLM(mat3x4_copy)(m1, m2); + + test_assert_mat3x4_eq(m1, m2); + + TEST_SUCCESS +} + +TEST_IMPL(GLM_PREFIX, mat3x4_zero) { + mat3x4 m1 = GLM_MAT3X4_ZERO_INIT; + mat3x4 m2 = GLM_MAT3X4_ZERO_INIT; + mat3x4 m3; + + GLM(mat3x4_zero)(m3); + + ASSERTIFY(test_assert_mat3x4_eq_zero(m1)) + ASSERTIFY(test_assert_mat3x4_eq_zero(m2)) + ASSERTIFY(test_assert_mat3x4_eq_zero(m3)) + + TEST_SUCCESS +} + TEST_IMPL(GLM_PREFIX, mat3x4_make) { float src[36] = { 0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f, 2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f, @@ -57,3 +85,77 @@ TEST_IMPL(GLM_PREFIX, mat3x4_make) { TEST_SUCCESS } + +TEST_IMPL(GLM_PREFIX, mat3x4_mul) { + mat3x4 m1 = GLM_MAT3X4_ZERO_INIT; + mat4x3 m2 = GLM_MAT4X3_ZERO_INIT; + + mat3 m3 = GLM_MAT3_ZERO_INIT; + mat3 m4 = GLM_MAT3_ZERO_INIT; + + int i, j, k; + + test_rand_mat3x4(m1); + test_rand_mat4x3(m2); + + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + for (k = 0; k < 4; k++) { + m4[i][j] += m1[i][k] * m2[k][j]; + } + } + } + + GLM(mat3x4_mul)(m1, m2, m3); + ASSERTIFY(test_assert_mat3_eq(m3, m4)) + + TEST_SUCCESS +} + +TEST_IMPL(GLM_PREFIX, mat3x4_mulv) { + mat3x4 mat = A_MATRIX3X4; + vec4 v = {11.0f, 21.0f, 31.0f, 41.0f}; + + int i; + vec3 dest; + float res = 0.0; + + GLM(mat3x4_mulv)(mat, v, dest); + + for (i = 0; i < 3; i++) { + res = mat[i][0] * v[0] + mat[i][1] * v[1] + mat[i][2] * v[2]; + ASSERT(test_eq(dest[i], res)) + } + + TEST_SUCCESS +} + +TEST_IMPL(GLM_PREFIX, mat3x4_transpose) { + mat3x4 m1 = A_MATRIX3X4; + + mat4x3 m2; + mat4x3 m3 = A_MATRIX3X2_TRANSPOSE; + GLM(mat3x4_transpose)(m1, m2); + + ASSERTIFY(test_assert_mat4x3_eq(m2, m3)) + + TEST_SUCCESS +} + +TEST_IMPL(GLM_PREFIX, mat3x4_scale) { + mat3x4 m1 = A_MATRIX3X4; + mat3x4 m2 = A_MATRIX3X4; + int i, j, scale; + + scale = rand() % 100; + + GLM(mat3x4_scale)(m1, (float) scale); + + for (i = 0; i < 3; i++) { + for (j = 0; j < 4; j++) { + ASSERT(test_eq(m1[i][j], m2[i][j] * scale)) + } + } + + TEST_SUCCESS +}