merge pull request #504 from fhgffy/fix/glm-spin-translation-502

affine: preserve translation in glm_spin
This commit is contained in:
Recep Aslantas authored and GitHub committed 2026-10-25 00:02:24 +03:00
commit 11d34be968
4 files changed
+73 -1

No files matched your search

+1 -1
View File
@@ -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);
}
+44
View File
@@ -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;
+18
View File
@@ -169,3 +169,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
}
+10
View File
@@ -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)
@@ -1265,6 +1270,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)
@@ -1287,6 +1294,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)
@@ -2441,6 +2450,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)