External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-03 16:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #405 from EasyIP2023/bugfix/mat2x4-mutli

Browse Source 
mat2x4: fix multiplication functions
This commit is contained in:
Recep Aslantas
2024-03-31 13:40:45 +03:00
committed by GitHub
parent c9adbaabd7 54dfbc5a28
commit 25b33fab6b
7 changed files with 123 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/src/test_mat2x4.h
View File

@@ -86,42 +86,42 @@ TEST_IMPL(GLM_PREFIX, mat2x4_mul) {
mat2x4 m1 = GLM_MAT2X4_ZERO_INIT;
mat4x2 m2 = GLM_MAT4X2_ZERO_INIT;
mat2 m3 = GLM_MAT2_ZERO_INIT;
mat2 m4 = GLM_MAT2_ZERO_INIT;
mat4 m3 = GLM_MAT4_ZERO_INIT;
mat4 m4 = GLM_MAT4_ZERO_INIT;
int i, j, k;
int c, r, k;
/* test random matrices */
/* random matrices */
test_rand_mat2x4(m1);
test_rand_mat4x2(m2);
for (i = 0; i < 2; i++) {
for (j = 0; j < 2; j++) {
for (k = 0; k < 4; k++) {
m4[i][j] += m1[i][k] * m2[k][j];
for (r = 0; r < 4; r++) {
for (c = 0; c < 4; c++) {
for (k = 0; k < 2; k++) {
m4[c][r] += m1[k][r] * m2[c][k];
}
}
}
GLM(mat2x4_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat2_eq(m3, m4))
ASSERTIFY(test_assert_mat4_eq(m3, m4))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x4_mulv) {
mat2x4 mat = A_MATRIX2X4;
vec4 v = {11.0f, 21.0f, 31.0f, 41.0f};
vec2 v = {11.0f, 21.0f};
int i;
vec2 dest;
vec4 dest;
float res = 0.0;
GLM(mat2x4_mulv)(mat, v, dest);
for (i = 0; i < 2; i++) {
res = mat[i][0] * v[0] + mat[i][1] * v[1] + mat[i][2] * v[2] + mat[i][3] * v[3];
for (i = 0; i < 4; i++) {
res = mat[0][i] * v[0] + mat[1][i] * v[1];
ASSERT(test_eq(dest[i], res))
}

14
test/tests.h
View File

@@ -1494,13 +1494,13 @@ TEST_LIST {
TEST_ENTRY(glm_mat2x4_transpose)
TEST_ENTRY(glm_mat2x4_scale)
TEST_ENTRY(glm_mat2x4_copy)
TEST_ENTRY(glm_mat2x4_zero)
TEST_ENTRY(glm_mat2x4_make)
TEST_ENTRY(glm_mat2x4_mul)
TEST_ENTRY(glm_mat2x4_mulv)
TEST_ENTRY(glm_mat2x4_transpose)
TEST_ENTRY(glm_mat2x4_scale)
TEST_ENTRY(glmc_mat2x4_copy)
TEST_ENTRY(glmc_mat2x4_zero)
TEST_ENTRY(glmc_mat2x4_make)
TEST_ENTRY(glmc_mat2x4_mul)
TEST_ENTRY(glmc_mat2x4_mulv)
TEST_ENTRY(glmc_mat2x4_transpose)
TEST_ENTRY(glmc_mat2x4_scale)
/* camera (incl [LR]H cross [NZ]O) */
TEST_ENTRY(glm_perspective_lh_zo)