YourWishes/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-02-17 03:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix cglm_vec3/4_swizzle

Browse Source
This commit is contained in:
Marcin
2025-01-18 19:26:29 +00:00
parent f50736aee7
commit 8493a6c0d3
6 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/cglm/call/vec3.h
View File

@@ -259,6 +259,10 @@ CGLM_EXPORT
void void
glmc_vec3_smoothinterpc(vec3 from, vec3 to, float t, vec3 dest); glmc_vec3_smoothinterpc(vec3 from, vec3 to, float t, vec3 dest);
CGLM_EXPORT
void
glmc_vec3_swizzle(vec3 v, int mask, vec3 dest);
/* ext */ /* ext */
CGLM_EXPORT CGLM_EXPORT

4
include/cglm/call/vec4.h
View File

@@ -236,6 +236,10 @@ CGLM_EXPORT
void void
glmc_vec4_cubic(float s, vec4 dest); glmc_vec4_cubic(float s, vec4 dest);
CGLM_EXPORT
void
glmc_vec4_swizzle(vec4 v, int mask, vec4 dest);
/* ext */ /* ext */
CGLM_EXPORT CGLM_EXPORT

6
src/vec3.c
View File

@@ -338,6 +338,12 @@ glmc_vec3_smoothinterpc(vec3 from, vec3 to, float t, vec3 dest) {
glm_vec3_smoothinterpc(from, to, t, dest); glm_vec3_smoothinterpc(from, to, t, dest);
} }
CGLM_EXPORT
void
glmc_vec3_swizzle(vec3 v, int mask, vec3 dest) {
glm_vec3_swizzle(v, mask, dest);
}
/* ext */ /* ext */
CGLM_EXPORT CGLM_EXPORT

6
src/vec4.c
View File

@@ -302,6 +302,12 @@ glmc_vec4_cubic(float s, vec4 dest) {
glm_vec4_cubic(s, dest); glm_vec4_cubic(s, dest);
} }
CGLM_EXPORT
void
glmc_vec4_swizzle(vec4 v, int mask, vec4 dest) {
glm_vec4_swizzle(v, mask, dest);
}
/* ext */ /* ext */
CGLM_EXPORT CGLM_EXPORT

8
test/src/test_vec3.h
View File

@@ -1574,24 +1574,24 @@ TEST_IMPL(GLM_PREFIX, vec3_swizzle) {
v[1] = 2; v[1] = 2;
v[2] = 3; v[2] = 3;
glm_vec3_swizzle(v, GLM_ZYX, v); GLM(vec3_swizzle)(v, GLM_ZYX, v);
ASSERTIFY(test_assert_vec3_eq(v, (vec3){3, 2, 1})) ASSERTIFY(test_assert_vec3_eq(v, (vec3){3, 2, 1}))
glm_vec3_swizzle(v, GLM_XXX, v); GLM(vec3_swizzle)(v, GLM_XXX, v);
ASSERTIFY(test_assert_vec3_eq(v, (vec3){3, 3, 3})) ASSERTIFY(test_assert_vec3_eq(v, (vec3){3, 3, 3}))
v[0] = 1; v[0] = 1;
v[1] = 2; v[1] = 2;
v[2] = 3; v[2] = 3;
glm_vec3_swizzle(v, GLM_YYY, v); GLM(vec3_swizzle)(v, GLM_YYY, v);
ASSERTIFY(test_assert_vec3_eq(v, (vec3){2, 2, 2})) ASSERTIFY(test_assert_vec3_eq(v, (vec3){2, 2, 2}))
v[0] = 1; v[0] = 1;
v[1] = 2; v[1] = 2;
v[2] = 3; v[2] = 3;
glm_vec3_swizzle(v, GLM_ZZZ, v); GLM(vec3_swizzle)(v, GLM_ZZZ, v);
ASSERTIFY(test_assert_vec3_eq(v, (vec3){3, 3, 3})) ASSERTIFY(test_assert_vec3_eq(v, (vec3){3, 3, 3}))
TEST_SUCCESS TEST_SUCCESS

10
test/src/test_vec4.h
View File

@@ -1221,10 +1221,10 @@ TEST_IMPL(GLM_PREFIX, vec4_swizzle) {
v[2] = 3; v[2] = 3;
v[3] = 4; v[3] = 4;
glm_vec4_swizzle(v, GLM_WZYX, v); GLM(vec4_swizzle)(v, GLM_WZYX, v);
ASSERTIFY(test_assert_vec4_eq(v, (vec4){4, 3, 2, 1})) ASSERTIFY(test_assert_vec4_eq(v, (vec4){4, 3, 2, 1}))
glm_vec4_swizzle(v, GLM_XXXX, v); GLM(vec4_swizzle)(v, GLM_XXXX, v);
ASSERTIFY(test_assert_vec4_eq(v, (vec4){4, 4, 4, 4})) ASSERTIFY(test_assert_vec4_eq(v, (vec4){4, 4, 4, 4}))
v[0] = 1; v[0] = 1;
@@ -1232,7 +1232,7 @@ TEST_IMPL(GLM_PREFIX, vec4_swizzle) {
v[2] = 3; v[2] = 3;
v[3] = 4; v[3] = 4;
glm_vec4_swizzle(v, GLM_YYYY, v); GLM(vec4_swizzle)(v, GLM_YYYY, v);
ASSERTIFY(test_assert_vec4_eq(v, (vec4){2, 2, 2, 2})) ASSERTIFY(test_assert_vec4_eq(v, (vec4){2, 2, 2, 2}))
v[0] = 1; v[0] = 1;
@@ -1240,7 +1240,7 @@ TEST_IMPL(GLM_PREFIX, vec4_swizzle) {
v[2] = 3; v[2] = 3;
v[3] = 4; v[3] = 4;
glm_vec4_swizzle(v, GLM_ZZZZ, v); GLM(vec4_swizzle)(v, GLM_ZZZZ, v);
ASSERTIFY(test_assert_vec4_eq(v, (vec4){3, 3, 3, 3})) ASSERTIFY(test_assert_vec4_eq(v, (vec4){3, 3, 3, 3}))
v[0] = 1; v[0] = 1;
@@ -1248,7 +1248,7 @@ TEST_IMPL(GLM_PREFIX, vec4_swizzle) {
v[2] = 3; v[2] = 3;
v[3] = 4; v[3] = 4;
glm_vec4_swizzle(v, GLM_WWWW, v); GLM(vec4_swizzle)(v, GLM_WWWW, v);
ASSERTIFY(test_assert_vec4_eq(v, (vec4){4, 4, 4, 4})) ASSERTIFY(test_assert_vec4_eq(v, (vec4){4, 4, 4, 4}))
TEST_SUCCESS TEST_SUCCESS