mirror of
https://github.com/recp/cglm.git
synced 2025-12-26 02:25:02 +00:00
mat4: add new function glm_mat4_make
Function takes in a 16 element float array and converts it into a mat4 matrix. Signed-off-by: Vincent Davis Jr <vince@underview.tech>
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
|
||||
#define A_MATRIX {{1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}}
|
||||
#define A_MATRIX3 {{1,2,3},{5,6,7},{9,10,11}}
|
||||
#define MAT4_ARRAY {1, 5, 2, 7, 12, 1, 4, 6, 0, 8, 1, 0, 6, 5, 0, 1}
|
||||
|
||||
TEST_IMPL(GLM_PREFIX, mat4_ucopy) {
|
||||
mat4 m1 = A_MATRIX;
|
||||
@@ -484,5 +485,22 @@ TEST_IMPL(GLM_PREFIX, mat4_rmc) {
|
||||
TEST_SUCCESS
|
||||
}
|
||||
|
||||
TEST_IMPL(GLM_PREFIX, mat4_make) {
|
||||
mat4 dest;
|
||||
unsigned int i, j;
|
||||
float src[16] = MAT4_ARRAY;
|
||||
|
||||
GLM(mat4_make)(src, dest);
|
||||
|
||||
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=4, j++) {
|
||||
ASSERT(test_eq(dest[j][0], src[i]))
|
||||
ASSERT(test_eq(dest[j][1], src[i+1]))
|
||||
ASSERT(test_eq(dest[j][2], src[i+2]))
|
||||
ASSERT(test_eq(dest[j][3], src[i+3]))
|
||||
}
|
||||
|
||||
TEST_SUCCESS
|
||||
}
|
||||
|
||||
#undef A_MATRIX
|
||||
#undef A_MATRIX3
|
||||
|
||||
@@ -124,6 +124,7 @@ TEST_DECLARE(glm_mat4_inv_precise)
|
||||
TEST_DECLARE(glm_mat4_swap_col)
|
||||
TEST_DECLARE(glm_mat4_swap_row)
|
||||
TEST_DECLARE(glm_mat4_rmc)
|
||||
TEST_DECLARE(glm_mat4_make)
|
||||
|
||||
TEST_DECLARE(glmc_mat4_ucopy)
|
||||
TEST_DECLARE(glmc_mat4_copy)
|
||||
@@ -150,6 +151,7 @@ TEST_DECLARE(glmc_mat4_inv_fast)
|
||||
TEST_DECLARE(glmc_mat4_swap_col)
|
||||
TEST_DECLARE(glmc_mat4_swap_row)
|
||||
TEST_DECLARE(glmc_mat4_rmc)
|
||||
TEST_DECLARE(glmc_mat4_make)
|
||||
|
||||
/* mat3 */
|
||||
TEST_DECLARE(glm_mat3_copy)
|
||||
@@ -965,6 +967,7 @@ TEST_LIST {
|
||||
TEST_ENTRY(glm_mat4_swap_col)
|
||||
TEST_ENTRY(glm_mat4_swap_row)
|
||||
TEST_ENTRY(glm_mat4_rmc)
|
||||
TEST_ENTRY(glm_mat4_make)
|
||||
|
||||
TEST_ENTRY(glmc_mat4_ucopy)
|
||||
TEST_ENTRY(glmc_mat4_copy)
|
||||
@@ -991,6 +994,7 @@ TEST_LIST {
|
||||
TEST_ENTRY(glmc_mat4_swap_col)
|
||||
TEST_ENTRY(glmc_mat4_swap_row)
|
||||
TEST_ENTRY(glmc_mat4_rmc)
|
||||
TEST_ENTRY(glmc_mat4_make)
|
||||
|
||||
/* mat3 */
|
||||
TEST_ENTRY(glm_mat3_copy)
|
||||
|
||||
Reference in New Issue
Block a user