From c1d78d835b2d4e65aa1fa10425669da375800298 Mon Sep 17 00:00:00 2001 From: duarm Date: Wed, 6 Dec 2023 16:33:44 -0300 Subject: [PATCH] changing from mat4 to mat3 --- docs/source/aabb2d.rst | 2 +- include/cglm/aabb2d.h | 6 ++---- include/cglm/call/aabb2d.h | 2 +- include/cglm/struct/aabb2d.h | 2 +- src/aabb2d.c | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/source/aabb2d.rst b/docs/source/aabb2d.rst index 3857781..4bdf278 100644 --- a/docs/source/aabb2d.rst +++ b/docs/source/aabb2d.rst @@ -46,7 +46,7 @@ Functions documentation | *[in]* **aabb** bounding box | *[out]* **dest** destination -.. c:function:: void glm_aabb2d_transform(vec2 aabb[2], mat4 m, vec2 dest[2]) +.. c:function:: void glm_aabb2d_transform(vec2 aabb[2], mat3 m, vec2 dest[2]) | apply transform to Axis-Aligned Bounding Box diff --git a/include/cglm/aabb2d.h b/include/cglm/aabb2d.h index 45584fa..c88d72b 100644 --- a/include/cglm/aabb2d.h +++ b/include/cglm/aabb2d.h @@ -35,8 +35,8 @@ glm_aabb2d_copy(vec2 aabb[2], vec2 dest[2]) { */ CGLM_INLINE void -glm_aabb2d_transform(vec2 aabb[2], mat4 m, vec2 dest[2]) { - vec2 v[2], xa, xb, ya, yb, za, zb; +glm_aabb2d_transform(vec2 aabb[2], mat3 m, vec2 dest[2]) { + vec2 v[2], xa, xb, ya, yb; glm_vec2_scale(m[0], aabb[0][0], xa); glm_vec2_scale(m[0], aabb[1][0], xb); @@ -48,13 +48,11 @@ glm_aabb2d_transform(vec2 aabb[2], mat4 m, vec2 dest[2]) { glm_vec2(m[3], v[0]); glm_vec2_minadd(xa, xb, v[0]); glm_vec2_minadd(ya, yb, v[0]); - glm_vec2_minadd(za, zb, v[0]); /* translation + max(xa, xb) + max(ya, yb) + max(za, zb) */ glm_vec2(m[3], v[1]); glm_vec2_maxadd(xa, xb, v[1]); glm_vec2_maxadd(ya, yb, v[1]); - glm_vec2_maxadd(za, zb, v[1]); glm_vec2_copy(v[0], dest[0]); glm_vec2_copy(v[1], dest[1]); diff --git a/include/cglm/call/aabb2d.h b/include/cglm/call/aabb2d.h index 255227a..7e384fd 100644 --- a/include/cglm/call/aabb2d.h +++ b/include/cglm/call/aabb2d.h @@ -19,7 +19,7 @@ glmc_aabb2d_copy(vec2 aabb[2], vec2 dest[2]); CGLM_EXPORT void -glmc_aabb2d_transform(vec2 aabb[2], mat4 m, vec2 dest[2]); +glmc_aabb2d_transform(vec2 aabb[2], mat3 m, vec2 dest[2]); CGLM_EXPORT void diff --git a/include/cglm/struct/aabb2d.h b/include/cglm/struct/aabb2d.h index 9b458de..b2b4d3c 100644 --- a/include/cglm/struct/aabb2d.h +++ b/include/cglm/struct/aabb2d.h @@ -27,7 +27,7 @@ */ CGLM_INLINE void -glms_aabb2d_(transform)(vec2s aabb[2], mat4s m, vec2s dest[2]) { +glms_aabb2d_(transform)(vec2s aabb[2], mat3s m, vec2s dest[2]) { vec2 rawAabb[2]; vec2 rawDest[2]; diff --git a/src/aabb2d.c b/src/aabb2d.c index ac8473c..8cd3957 100644 --- a/src/aabb2d.c +++ b/src/aabb2d.c @@ -16,7 +16,7 @@ glmc_aabb2d_copy(vec2 aabb[2], vec2 dest[2]) { CGLM_EXPORT void -glmc_aabb2d_transform(vec2 aabb[2], mat4 m, vec2 dest[2]) { +glmc_aabb2d_transform(vec2 aabb[2], mat3 m, vec2 dest[2]) { glm_aabb2d_transform(aabb, m, dest); }