mirror of
https://github.com/recp/cglm.git
synced 2025-12-30 12:17:50 +00:00
add new matrix mat2x3
Initial function being glm_mat2x3_make Signed-off-by: Vincent Davis Jr <vince@underview.tech>
This commit is contained in:
@@ -174,6 +174,19 @@ test_assert_mat2_eq_zero(mat2 m2) {
|
||||
TEST_SUCCESS
|
||||
}
|
||||
|
||||
test_status_t
|
||||
test_assert_mat2x3_eq_zero(mat2x3 m2x3) {
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
for (j = 0; j < 3; j++) {
|
||||
ASSERT(test_eq(m2x3[i][j], 0.0f))
|
||||
}
|
||||
}
|
||||
|
||||
TEST_SUCCESS
|
||||
}
|
||||
|
||||
test_status_t
|
||||
test_assert_mat3_eq(mat3 m1, mat3 m2) {
|
||||
int i, j;
|
||||
|
||||
@@ -53,6 +53,9 @@ test_assert_mat2_eq_identity(mat2 m2);
|
||||
test_status_t
|
||||
test_assert_mat2_eq_zero(mat2 m2);
|
||||
|
||||
test_status_t
|
||||
test_assert_mat2x3_eq_zero(mat2x3 m2x3);
|
||||
|
||||
test_status_t
|
||||
test_assert_mat3_eq(mat3 m1, mat3 m2);
|
||||
|
||||
|
||||
53
test/src/test_mat2x3.h
Normal file
53
test/src/test_mat2x3.h
Normal file
@@ -0,0 +1,53 @@
|
||||
/*
|
||||
* Copyright (c), Recep Aslantas.
|
||||
*
|
||||
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||
* Full license can be found in the LICENSE file
|
||||
*/
|
||||
|
||||
#include "test_common.h"
|
||||
|
||||
#ifndef CGLM_TEST_MAT2X3_ONCE
|
||||
#define CGLM_TEST_MAT2X3_ONCE
|
||||
|
||||
TEST_IMPL(MACRO_GLM_MAT2X3_ZERO_INIT) {
|
||||
mat2x3 m = GLM_MAT2X3_ZERO_INIT;
|
||||
|
||||
ASSERT(test_eq(m[0][0], 0.0f))
|
||||
ASSERT(test_eq(m[0][1], 0.0f))
|
||||
ASSERT(test_eq(m[0][2], 0.0f))
|
||||
ASSERT(test_eq(m[1][0], 0.0f))
|
||||
ASSERT(test_eq(m[1][1], 0.0f))
|
||||
ASSERT(test_eq(m[1][2], 0.0f))
|
||||
|
||||
TEST_SUCCESS
|
||||
}
|
||||
|
||||
#endif /* CGLM_TEST_MAT2X3_ONCE */
|
||||
|
||||
TEST_IMPL(GLM_PREFIX, mat2x3_make) {
|
||||
float src[18] = {
|
||||
0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f,
|
||||
2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f,
|
||||
5.3f, 4.8f, 96.3f, 13.7f, 4.7f, 5.5f
|
||||
};
|
||||
|
||||
mat2x3 dest[3];
|
||||
|
||||
float *srcp = src;
|
||||
unsigned int i, j, k;
|
||||
|
||||
for (i = 0, j = 0, k = 0; i < sizeof(src) / sizeof(float); i+=6,j++) {
|
||||
GLM(mat2x3_make)(srcp + i, dest[j]);
|
||||
|
||||
ASSERT(test_eq(src[ i ], dest[j][k][0]));
|
||||
ASSERT(test_eq(src[i+1], dest[j][k][1]));
|
||||
ASSERT(test_eq(src[i+2], dest[j][k][2]));
|
||||
|
||||
ASSERT(test_eq(src[i+3], dest[j][k+1][0]));
|
||||
ASSERT(test_eq(src[i+4], dest[j][k+1][1]));
|
||||
ASSERT(test_eq(src[i+5], dest[j][k+1][2]));
|
||||
}
|
||||
|
||||
TEST_SUCCESS
|
||||
}
|
||||
@@ -7,6 +7,14 @@
|
||||
|
||||
#include "test_common.h"
|
||||
|
||||
TEST_IMPL(mat2x3s_zero_init) {
|
||||
mat2x3s mat2x3_zero = GLMS_MAT2X3_ZERO_INIT;
|
||||
mat2x3 mat2x3_zero_a = GLM_MAT2X3_ZERO_INIT;
|
||||
test_assert_mat2x3_eq_zero(mat2x3_zero_a);
|
||||
test_assert_mat2x3_eq_zero(mat2x3_zero.raw);
|
||||
TEST_SUCCESS
|
||||
}
|
||||
|
||||
TEST_IMPL(mat3s_identity_init) {
|
||||
mat3s mat3_identity = GLMS_MAT3_IDENTITY_INIT;
|
||||
mat3 mat3_identity_a = GLM_MAT3_IDENTITY_INIT;
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#include "test_ivec3.h"
|
||||
#include "test_ivec4.h"
|
||||
#include "test_mat2.h"
|
||||
#include "test_mat2x3.h"
|
||||
#include "test_mat3.h"
|
||||
#include "test_mat4.h"
|
||||
#include "test_quat.h"
|
||||
@@ -50,6 +51,7 @@
|
||||
#include "test_ivec3.h"
|
||||
#include "test_ivec4.h"
|
||||
#include "test_mat2.h"
|
||||
#include "test_mat2x3.h"
|
||||
#include "test_mat3.h"
|
||||
#include "test_mat4.h"
|
||||
#include "test_quat.h"
|
||||
|
||||
10
test/tests.h
10
test/tests.h
@@ -228,6 +228,10 @@ TEST_DECLARE(glmc_mat2_swap_row)
|
||||
TEST_DECLARE(glmc_mat2_rmc)
|
||||
TEST_DECLARE(glmc_mat2_make)
|
||||
|
||||
TEST_DECLARE(glm_mat2x3_make)
|
||||
|
||||
TEST_DECLARE(glmc_mat2x3_make)
|
||||
|
||||
/* camera (incl [LR]H cross [NZ]O) */
|
||||
TEST_DECLARE(glm_perspective_lh_zo)
|
||||
TEST_DECLARE(glm_perspective_rh_zo)
|
||||
@@ -1044,7 +1048,7 @@ TEST_LIST {
|
||||
TEST_ENTRY(glmc_mat3_swap_row)
|
||||
TEST_ENTRY(glmc_mat3_rmc)
|
||||
TEST_ENTRY(glmc_mat3_make)
|
||||
|
||||
|
||||
TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY_INIT)
|
||||
TEST_ENTRY(MACRO_GLM_MAT2_ZERO_INIT)
|
||||
TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY)
|
||||
@@ -1083,6 +1087,10 @@ TEST_LIST {
|
||||
TEST_ENTRY(glmc_mat2_rmc)
|
||||
TEST_ENTRY(glmc_mat2_make)
|
||||
|
||||
TEST_ENTRY(glm_mat2x3_make)
|
||||
|
||||
TEST_ENTRY(glmc_mat2x3_make)
|
||||
|
||||
/* camera (incl [LR]H cross [NZ]O) */
|
||||
TEST_ENTRY(glm_perspective_lh_zo)
|
||||
TEST_ENTRY(glm_perspective_rh_zo)
|
||||
|
||||
Reference in New Issue
Block a user