From d7b1e0277872a19fdbf200abba7586cb88a5b1f6 Mon Sep 17 00:00:00 2001 From: fhgffy <102001626+fhgffy@users.noreply.github.com> Date: Sun, 4 Oct 2026 20:31:02 +0800 Subject: [PATCH] affine: preserve translation in glm_spin --- include/cglm/affine-pre.h | 2 +- test/src/test_affine.h | 44 +++++++++++++++++++++++++++++++++++++++ test/src/test_struct.c | 18 ++++++++++++++++ test/tests.h | 10 +++++++++ 4 files changed, 73 insertions(+), 1 deletion(-) diff --git a/include/cglm/affine-pre.h b/include/cglm/affine-pre.h index 2fa77f7..232fa45 100644 --- a/include/cglm/affine-pre.h +++ b/include/cglm/affine-pre.h @@ -297,7 +297,7 @@ CGLM_INLINE void glm_spin(mat4 m, float angle, vec3 axis) { CGLM_ALIGN_MAT mat4 rot; - glm_rotate_atm(rot, m[3], angle, axis); + glm_rotate_make(rot, angle, axis); glm_mat4_mul(m, rot, m); } diff --git a/test/src/test_affine.h b/test/src/test_affine.h index 2199a43..af2f195 100644 --- a/test/src/test_affine.h +++ b/test/src/test_affine.h @@ -492,6 +492,50 @@ TEST_IMPL(GLM_PREFIX, rotate_atm) { TEST_SUCCESS } +TEST_IMPL(GLM_PREFIX, spin) { + mat4 m; + mat4 expected = {{ 0.0f, 1.0f, 0.0f, 0.0f}, + {-1.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 1.0f, 0.0f}, + { 5.0f, 0.0f, 0.0f, 1.0f}}; + + glm_translate_make(m, (vec3){5.0f, 0.0f, 0.0f}); + GLM(spin)(m, GLM_PI_2f, GLM_ZUP); + ASSERTIFY(test_assert_mat4_eq(m, expected)); + + TEST_SUCCESS +} + +TEST_IMPL(GLM_PREFIX, spin_affine) { + mat4 m, original = {{0.0f, 2.0f, 0.0f, 0.0f}, + {-3.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 4.0f, 0.0f}, + {5.0f, -2.0f, 7.0f, 1.0f}}; + mat4 expected = {{-3.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, -2.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 4.0f, 0.0f}, + {5.0f, -2.0f, 7.0f, 1.0f}}; + vec3 axis = {0.0f, 0.0f, 2.0f}; + + glm_mat4_copy(original, m); + GLM(spin)(m, GLM_PI_2f, axis); + ASSERTIFY(test_assert_mat4_eq(m, expected)); + ASSERT(test_eq(axis[2], 2.0f)) + + GLM(spin)(m, -GLM_PI_2f, axis); + ASSERTIFY(test_assert_mat4_eq(m, original)); + + GLM(spin)(m, 0.0f, GLM_XUP); + ASSERTIFY(test_assert_mat4_eq(m, original)); + + glm_vec3_zero(m[3]); + glm_vec3_zero(expected[3]); + GLM(spin)(m, GLM_PI_2f, axis); + ASSERTIFY(test_assert_mat4_eq(m, expected)); + + TEST_SUCCESS +} + TEST_IMPL(GLM_PREFIX, decompose_scalev) { mat4 m1; vec3 s1; diff --git a/test/src/test_struct.c b/test/src/test_struct.c index d040225..98566ac 100644 --- a/test/src/test_struct.c +++ b/test/src/test_struct.c @@ -148,3 +148,21 @@ TEST_IMPL(vec4s_zero_init) { test_assert_vec4_eq(vec4_zero.raw, vec4_zero_a); TEST_SUCCESS } + +TEST_IMPL(mat4s_spin) { + mat4s m, result; + mat4 expected = {{ 0.0f, 1.0f, 0.0f, 0.0f}, + {-1.0f, 0.0f, 0.0f, 0.0f}, + { 0.0f, 0.0f, 1.0f, 0.0f}, + { 5.0f, 0.0f, 0.0f, 1.0f}}; + + glm_translate_make(m.raw, (vec3){5.0f, 0.0f, 0.0f}); + result = glms_spin(m, GLM_PI_2f, (vec3s){{0.0f, 0.0f, 1.0f}}); + ASSERTIFY(test_assert_mat4_eq(result.raw, expected)); + ASSERTIFY(test_assert_mat4_eq(m.raw, (mat4){{1.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 1.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f, 0.0f}, + {5.0f, 0.0f, 0.0f, 1.0f}})); + + TEST_SUCCESS +} diff --git a/test/tests.h b/test/tests.h index ce3215d..90ecded 100644 --- a/test/tests.h +++ b/test/tests.h @@ -43,6 +43,8 @@ TEST_DECLARE(glm_rotate_make) TEST_DECLARE(glm_rotate) TEST_DECLARE(glm_rotate_at) TEST_DECLARE(glm_rotate_atm) +TEST_DECLARE(glm_spin) +TEST_DECLARE(glm_spin_affine) TEST_DECLARE(glm_decompose_scalev) TEST_DECLARE(glm_uniscaled) TEST_DECLARE(glm_decompose_rs) @@ -65,6 +67,8 @@ TEST_DECLARE(glmc_rotate_make) TEST_DECLARE(glmc_rotate) TEST_DECLARE(glmc_rotate_at) TEST_DECLARE(glmc_rotate_atm) +TEST_DECLARE(glmc_spin) +TEST_DECLARE(glmc_spin_affine) TEST_DECLARE(glmc_decompose_scalev) TEST_DECLARE(glmc_uniscaled) TEST_DECLARE(glmc_decompose_rs) @@ -1221,6 +1225,7 @@ TEST_DECLARE(mat3x2s_zero_init) TEST_DECLARE(mat3x2s_zero) TEST_DECLARE(mat3x4s_zero_init) TEST_DECLARE(mat3x4s_zero) +TEST_DECLARE(mat4s_spin) TEST_DECLARE(mat4s_identity_init) TEST_DECLARE(mat4s_zero_init) TEST_DECLARE(mat4x2s_zero_init) @@ -1264,6 +1269,8 @@ TEST_LIST { TEST_ENTRY(glm_rotate) TEST_ENTRY(glm_rotate_at) TEST_ENTRY(glm_rotate_atm) + TEST_ENTRY(glm_spin) + TEST_ENTRY(glm_spin_affine) TEST_ENTRY(glm_decompose_scalev) TEST_ENTRY(glm_uniscaled) TEST_ENTRY(glm_decompose_rs) @@ -1286,6 +1293,8 @@ TEST_LIST { TEST_ENTRY(glmc_rotate) TEST_ENTRY(glmc_rotate_at) TEST_ENTRY(glmc_rotate_atm) + TEST_ENTRY(glmc_spin) + TEST_ENTRY(glmc_spin_affine) TEST_ENTRY(glmc_decompose_scalev) TEST_ENTRY(glmc_uniscaled) TEST_ENTRY(glmc_decompose_rs) @@ -2440,6 +2449,7 @@ TEST_LIST { TEST_ENTRY(mat3x2s_zero) TEST_ENTRY(mat3x4s_zero_init) TEST_ENTRY(mat3x4s_zero) + TEST_ENTRY(mat4s_spin) TEST_ENTRY(mat4s_identity_init) TEST_ENTRY(mat4s_zero_init) TEST_ENTRY(mat4x2s_zero_init)