Compare commits

...

37 Commits

Author SHA1 Message Date
Recep Aslantas
cdd4d0e83e Merge pull request #340 from recp/non-square-matrix
add some missing non-square matrix funcs
2023-08-07 17:58:05 +03:00
Recep Aslantas
54dfc4b4f0 Merge branch 'master' into non-square-matrix 2023-08-07 15:37:44 +03:00
Recep Aslantas
f6cb3ba31a Merge pull request #343 from EasyIP2023/non-square-matrix
add docs and tests to non-square-matrix branch
2023-08-07 14:41:08 +03:00
Vincent Davis Jr
da51741c50 test: add missing mat4x3 tests
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:46 -04:00
Vincent Davis Jr
a5d8e61c2b test: add missing mat4x2 tests
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:26 -04:00
Vincent Davis Jr
f0f7b67ef4 test: add missing mat3x4 tests
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:26 -04:00
Vincent Davis Jr
eece0b7bc9 test: add missing mat3x2 tests
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:26 -04:00
Vincent Davis Jr
37d20f7da8 test: add missing mat2x4 tests
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:26 -04:00
Vincent Davis Jr
006e4ffbdf test: add missing mat2x3 tests
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:26 -04:00
Vincent Davis Jr
aa37c1aa74 fix array subscript is outside array bounds
warning: array subscript # is outside array bounds
of ‘float[#]’ [-Warray-bounds]

Commit also fixes variable order when calculating
multiplication between two matrices.

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-06 14:12:24 -04:00
Vincent Davis Jr
0fb9e73ec1 docs: add missing non-square matrix funcs
Functions include:
	* glm_mat#x#_copy
	* glm_mat#x#_zero
	* glm_mat#x#_mul
	* glm_mat#x#_mulv
	* glm_mat#x#_transpose
	* glm_mat#x#_scale

Commit also includes some minor changes to
	* mat2
	* mat3
	* mat4

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-08-05 20:54:24 -04:00
Recep Aslantas
129287b809 Merge pull request #341 from taisei-project/assume-aligned-detection
more robust __builtin_assume_aligned detection
2023-08-01 18:22:24 +03:00
Andrei Alexeyev
2724620d83 more robust __builtin_assume_aligned detection
__builtin_assume_aligned is available since GCC 4.7, but __has_builtin
was added much later. Check for the GCC version if __has_builtin is not
available.

Users can also define CGLM_HAVE_BUILTIN_ASSUME_ALIGNED to either 1 or 0
to explicitly enable/disable the use of __builtin_assume_aligned. Meson
will do it automatically (by performing a configure-time test).
2023-07-31 22:33:51 +02:00
Recep Aslantas
4d5653b1f6 add some missing non-square matrix funcs in struct api 2023-07-22 14:17:26 +03:00
Recep Aslantas
dbb85f24c8 add some missing non-square matrix funcs 2023-07-22 13:37:36 +03:00
Recep Aslantas
6e9e91be05 add _mul for non-square matrices 2023-07-22 12:00:23 +03:00
Recep Aslantas
1e077fd125 add some missing non-square matrix funcs 2023-07-22 01:21:14 +03:00
Recep Aslantas
cb4a1b2677 Merge pull request #338 from EasyIP2023/feature/mat4x3
add new matrix mat4x3
2023-07-18 09:09:00 +03:00
Recep Aslantas
924db3307e Merge pull request #339 from EasyIP2023/bug/fix-mat4x2s
types-struct: fix mat4x2s struct members
2023-07-18 09:07:41 +03:00
Vincent Davis Jr
e9df003e56 types-struct: fix mat4x2s struct members
union mat4x2s { struct {  } } contains
members with incorrect naming.

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-17 23:09:40 -04:00
Vincent Davis Jr
3d292c3a2e add new matrix mat4x3
Initial function being

glm_mat4x3_make

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-17 22:57:52 -04:00
Recep Aslantas
4bb7e778c4 Merge pull request #337 from EasyIP2023/feature/mat4x2
add new matrix mat4x2
2023-07-17 10:41:09 +03:00
Vincent Davis Jr
2df26c0ecf add new matrix mat4x2
Initial function being

glm_mat4x2_make

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-16 20:19:25 -04:00
Recep Aslantas
5193b50133 Merge pull request #334 from EasyIP2023/feature/mat3x4
add new matrix mat3x4
2023-07-16 23:32:05 +03:00
Recep Aslantas
ef8954ccbc Merge branch 'master' into feature/mat3x4 2023-07-16 23:31:33 +03:00
Recep Aslantas
91b40eb7eb Merge pull request #335 from EasyIP2023/fix/comments-docs
docs: fix mat#x# comments and documentation
2023-07-16 23:29:38 +03:00
Vincent Davis Jr
82892085b3 docs: fix mat#x# comments and documentation
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-16 15:46:35 -04:00
Vincent Davis Jr
e09cf11f1c add new matrix mat3x4
Initial function being

glm_mat3x4_make

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-16 15:41:36 -04:00
Recep Aslantas
8966f296ac Merge pull request #333 from EasyIP2023/feature/mat3x2
add new matrix mat3x2
2023-07-16 12:10:45 +03:00
Vincent Davis Jr
4e44e74d48 add new matrix mat3x2
Initial function being

glm_mat3x2_make

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-15 18:48:50 -04:00
Recep Aslantas
f817c4cbb0 Merge pull request #332 from EasyIP2023/fix/mat2x3
add missing mat2x# test and mat2x3 window headers
2023-07-15 23:55:19 +03:00
Vincent Davis Jr
dd6a0b3175 add missing mat2x# test and mat2x3 window headers
Missing tests where
	* MACRO_GLM_MAT2X3_ZERO_INIT
	* MACRO_GLM_MAT2X3_ZERO
	* mat2x3s_zero_init
	* mat2x3s_zero
	* mat2x4s_zero_init
	* mat2x4s_zero

Commit:
	* removes (mat2x3) from
	  ((mat2x3)GLM_MAT2X3_ZERO_INIT) to fix
	  error: array initialized from non-constant array expression
	* removes test_assert_mat2x3_eq_zero
	  from test/src/test_struct.c
	* adds TEST_IMPL(mat2x3s_zero) to
	  test/src/test_struct.c

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-15 16:16:03 -04:00
Recep Aslantas
1401af4c34 Merge pull request #331 from EasyIP2023/feature/mat2x4
add new matrix mat2x4
2023-07-15 22:33:54 +03:00
Vincent Davis Jr
fe7471e8f8 add new matrix mat2x4
Initial function being

glm_mat2x4_make

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-15 14:32:48 -04:00
Recep Aslantas
1ca261b118 Merge pull request #330 from EasyIP2023/feature/mat2x3
add new matrix mat2x3
2023-07-15 11:03:59 +03:00
Vincent Davis Jr
6317ed90e7 add new matrix mat2x3
Initial function being

glm_mat2x3_make

Signed-off-by: Vincent Davis Jr <vince@underview.tech>
2023-07-14 18:57:45 -04:00
Recep Aslantas
3b683cf28c Merge pull request #328 from recp/werror
drop "-Werror" to allow skip warnings on production build
2023-07-13 11:09:16 +03:00
60 changed files with 4809 additions and 33 deletions

View File

@@ -79,8 +79,14 @@ add_library(${PROJECT_NAME}
src/vec4.c src/vec4.c
src/ivec4.c src/ivec4.c
src/mat2.c src/mat2.c
src/mat2x3.c
src/mat2x4.c
src/mat3.c src/mat3.c
src/mat3x2.c
src/mat3x4.c
src/mat4.c src/mat4.c
src/mat4x2.c
src/mat4x3.c
src/plane.c src/plane.c
src/frustum.c src/frustum.c
src/box.c src/box.c

View File

@@ -42,8 +42,14 @@ cglm_HEADERS = include/cglm/version.h \
include/cglm/cam.h \ include/cglm/cam.h \
include/cglm/io.h \ include/cglm/io.h \
include/cglm/mat4.h \ include/cglm/mat4.h \
include/cglm/mat4x2.h \
include/cglm/mat4x3.h \
include/cglm/mat3.h \ include/cglm/mat3.h \
include/cglm/mat3x2.h \
include/cglm/mat3x4.h \
include/cglm/mat2.h \ include/cglm/mat2.h \
include/cglm/mat2x3.h \
include/cglm/mat2x4.h \
include/cglm/affine-pre.h \ include/cglm/affine-pre.h \
include/cglm/affine-post.h \ include/cglm/affine-post.h \
include/cglm/affine.h \ include/cglm/affine.h \
@@ -94,8 +100,14 @@ cglm_clipspace_HEADERS = include/cglm/clipspace/persp.h \
cglm_calldir=$(includedir)/cglm/call cglm_calldir=$(includedir)/cglm/call
cglm_call_HEADERS = include/cglm/call/mat4.h \ cglm_call_HEADERS = include/cglm/call/mat4.h \
include/cglm/call/mat4x2.h \
include/cglm/call/mat4x3.h \
include/cglm/call/mat3.h \ include/cglm/call/mat3.h \
include/cglm/call/mat3x2.h \
include/cglm/call/mat3x4.h \
include/cglm/call/mat2.h \ include/cglm/call/mat2.h \
include/cglm/call/mat2x3.h \
include/cglm/call/mat2x4.h \
include/cglm/call/vec2.h \ include/cglm/call/vec2.h \
include/cglm/call/vec3.h \ include/cglm/call/vec3.h \
include/cglm/call/vec4.h \ include/cglm/call/vec4.h \
@@ -158,8 +170,14 @@ cglm_simd_neon_HEADERS = include/cglm/simd/neon/affine.h \
cglm_structdir=$(includedir)/cglm/struct cglm_structdir=$(includedir)/cglm/struct
cglm_struct_HEADERS = include/cglm/struct/mat4.h \ cglm_struct_HEADERS = include/cglm/struct/mat4.h \
include/cglm/struct/mat4x2.h \
include/cglm/struct/mat4x3.h \
include/cglm/struct/mat3.h \ include/cglm/struct/mat3.h \
include/cglm/struct/mat3x2.h \
include/cglm/struct/mat3x4.h \
include/cglm/struct/mat2.h \ include/cglm/struct/mat2.h \
include/cglm/struct/mat2x3.h \
include/cglm/struct/mat2x4.h \
include/cglm/struct/affine-pre.h \ include/cglm/struct/affine-pre.h \
include/cglm/struct/affine-post.h \ include/cglm/struct/affine-post.h \
include/cglm/struct/affine-mat.h \ include/cglm/struct/affine-mat.h \
@@ -212,8 +230,14 @@ libcglm_la_SOURCES=\
src/vec4.c \ src/vec4.c \
src/ivec4.c \ src/ivec4.c \
src/mat2.c \ src/mat2.c \
src/mat2x3.c \
src/mat2x4.c \
src/mat3.c \ src/mat3.c \
src/mat3x2.c \
src/mat3x4.c \
src/mat4.c \ src/mat4.c \
src/mat4x2.c \
src/mat4x3.c \
src/plane.c \ src/plane.c \
src/frustum.c \ src/frustum.c \
src/box.c \ src/box.c \

View File

@@ -46,8 +46,14 @@ Follow the :doc:`build` documentation for this
quat quat
euler euler
mat2 mat2
mat2x3
mat2x4
mat3 mat3
mat3x2
mat3x4
mat4 mat4
mat4x2
mat4x3
vec2 vec2
vec2-ext vec2-ext
vec3 vec3

View File

@@ -65,11 +65,12 @@ Functions documentation
make given matrix zero make given matrix zero
Parameters: Parameters:
| *[in,out]* **mat** matrix to | *[in,out]* **mat** matrix
.. c:function:: void glm_mat2_mul(mat2 m1, mat2 m2, mat2 dest) .. c:function:: void glm_mat2_mul(mat2 m1, mat2 m2, mat2 dest)
multiply m1 and m2 to dest multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this: m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c .. code-block:: c
@@ -101,7 +102,7 @@ Functions documentation
.. c:function:: void glm_mat2_mulv(mat2 m, vec2 v, vec2 dest) .. c:function:: void glm_mat2_mulv(mat2 m, vec2 v, vec2 dest)
multiply mat4 with vec4 (column vector) and store in dest vector multiply mat2 with vec2 (column vector) and store in dest vector
Parameters: Parameters:
| *[in]* **mat** mat2 (left) | *[in]* **mat** mat2 (left)
@@ -113,8 +114,8 @@ Functions documentation
multiply matrix with scalar multiply matrix with scalar
Parameters: Parameters:
| *[in, out]* **mat** matrix | *[in, out]* **m** matrix
| *[in]* **dest** scalar | *[in]* **s** scalar
.. c:function:: float glm_mat2_det(mat2 mat) .. c:function:: float glm_mat2_det(mat2 mat)
@@ -183,7 +184,7 @@ Functions documentation
Create mat2 matrix from pointer Create mat2 matrix from pointer
| NOTE: **@src** must contain 4 elements. | NOTE: **@src** must contain at least 4 elements.
Parameters: Parameters:
| *[in]* **src** pointer to an array of floats | *[in]* **src** pointer to an array of floats

92
docs/source/mat2x3.rst Normal file
View File

@@ -0,0 +1,92 @@
.. default-domain:: C
mat2x3
======
Header: cglm/mat2x3.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_MAT2X3_ZERO_INIT
#. GLM_MAT2X3_ZERO
Functions:
1. :c:func:`glm_mat2x3_copy`
#. :c:func:`glm_mat2x3_zero`
#. :c:func:`glm_mat2x3_make`
#. :c:func:`glm_mat2x3_mul`
#. :c:func:`glm_mat2x3_mulv`
#. :c:func:`glm_mat2x3_transpose`
#. :c:func:`glm_mat2x3_scale`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
.. c:function:: void glm_mat2x3_copy(mat2x3 mat, mat2x3 dest)
copy mat2x3 to another one (dest).
Parameters:
| *[in]* **mat** source
| *[out]* **dest** destination
.. c:function:: void glm_mat2x3_zero(mat2x3 mat)
make given matrix zero
Parameters:
| *[in,out]* **mat** matrix
.. c:function:: void glm_mat2x3_make(float * __restrict src, mat2x3 dest)
Create mat2x3 matrix from pointer
| NOTE: **@src** must contain at least 6 elements.
Parameters:
| *[in]* **src** pointer to an array of floats
| *[out]* **dest** destination matrix2x3
.. c:function:: void glm_mat2x3_mul(mat2x3 m1, mat3x2 m2, mat2 dest)
multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c
glm_mat2x3_mul(m, m, m);
Parameters:
| *[in]* **m1** left matrix
| *[in]* **m2** right matrix
| *[out]* **dest** destination matrix
.. c:function:: void glm_mat2x3_mulv(mat2x3 m, vec3 v, vec2 dest)
multiply mat2x3 with vec3 (column vector) and store in dest vector
Parameters:
| *[in]* **m** mat2x3 (left)
| *[in]* **v** vec3 (right, column vector)
| *[out]* **dest** destination (result, column vector)
.. c:function:: void glm_mat2x3_transpose(mat2x3 m, mat3x2 dest)
transpose matrix and store in dest
Parameters:
| *[in]* **m** matrix
| *[out]* **dest** destination
.. c:function:: void glm_mat2x3_scale(mat2x3 m, float s)
multiply matrix with scalar
Parameters:
| *[in, out]* **m** matrix
| *[in]* **s** scalar

92
docs/source/mat2x4.rst Normal file
View File

@@ -0,0 +1,92 @@
.. default-domain:: C
mat2x4
======
Header: cglm/mat2x4.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_MAT2X4_ZERO_INIT
#. GLM_MAT2X4_ZERO
Functions:
1. :c:func:`glm_mat2x4_copy`
#. :c:func:`glm_mat2x4_zero`
#. :c:func:`glm_mat2x4_make`
#. :c:func:`glm_mat2x4_mul`
#. :c:func:`glm_mat2x4_mulv`
#. :c:func:`glm_mat2x4_transpose`
#. :c:func:`glm_mat2x4_scale`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
.. c:function:: void glm_mat2x4_copy(mat2x4 mat, mat2x4 dest)
copy mat2x4 to another one (dest).
Parameters:
| *[in]* **mat** source
| *[out]* **dest** destination
.. c:function:: void glm_mat2x4_zero(mat2x4 mat)
make given matrix zero
Parameters:
| *[in,out]* **mat** matrix
.. c:function:: void glm_mat2x4_make(float * __restrict src, mat2x4 dest)
Create mat2x4 matrix from pointer
| NOTE: **@src** must contain at least 8 elements.
Parameters:
| *[in]* **src** pointer to an array of floats
| *[out]* **dest** destination matrix2x4
.. c:function:: void glm_mat2x4_mul(mat2x4 m1, mat4x2 m2, mat2 dest)
multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c
glm_mat2x4_mul(m, m, m);
Parameters:
| *[in]* **m1** left matrix
| *[in]* **m2** right matrix
| *[out]* **dest** destination matrix
.. c:function:: void glm_mat2x4_mulv(mat2x4 m, vec4 v, vec2 dest)
multiply mat2x4 with vec4 (column vector) and store in dest vector
Parameters:
| *[in]* **m** mat2x4 (left)
| *[in]* **v** vec4 (right, column vector)
| *[out]* **dest** destination (result, column vector)
.. c:function:: void glm_mat2x4_transpose(mat2x4 m, mat4x2 dest)
transpose matrix and store in dest
Parameters:
| *[in]* **m** matrix
| *[out]* **dest** destination
.. c:function:: void glm_mat2x4_scale(mat2x4 m, float s)
multiply matrix with scalar
Parameters:
| *[in, out]* **m** matrix
| *[in]* **s** scalar

View File

@@ -72,6 +72,7 @@ Functions documentation
.. c:function:: void glm_mat3_mul(mat3 m1, mat3 m2, mat3 dest) .. c:function:: void glm_mat3_mul(mat3 m1, mat3 m2, mat3 dest)
multiply m1 and m2 to dest multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this: m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c .. code-block:: c
@@ -103,10 +104,10 @@ Functions documentation
.. c:function:: void glm_mat3_mulv(mat3 m, vec3 v, vec3 dest) .. c:function:: void glm_mat3_mulv(mat3 m, vec3 v, vec3 dest)
multiply mat4 with vec4 (column vector) and store in dest vector multiply mat3 with vec3 (column vector) and store in dest vector
Parameters: Parameters:
| *[in]* **mat** mat3 (left) | *[in]* **m** mat3 (left)
| *[in]* **v** vec3 (right, column vector) | *[in]* **v** vec3 (right, column vector)
| *[out]* **dest** destination (result, column vector) | *[out]* **dest** destination (result, column vector)
@@ -123,8 +124,8 @@ Functions documentation
multiply matrix with scalar multiply matrix with scalar
Parameters: Parameters:
| *[in, out]* **mat** matrix | *[in, out]* **m** matrix
| *[in]* **dest** scalar | *[in]* **s** scalar
.. c:function:: float glm_mat3_det(mat3 mat) .. c:function:: float glm_mat3_det(mat3 mat)
@@ -193,7 +194,7 @@ Functions documentation
Create mat3 matrix from pointer Create mat3 matrix from pointer
| NOTE: **@src** must contain 9 elements. | NOTE: **@src** must contain at least 9 elements.
Parameters: Parameters:
| *[in]* **src** pointer to an array of floats | *[in]* **src** pointer to an array of floats

91
docs/source/mat3x2.rst Normal file
View File

@@ -0,0 +1,91 @@
.. default-domain:: C
mat3x2
======
Header: cglm/mat3x2.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_MAT3X2_ZERO_INIT
#. GLM_MAT3X2_ZERO
Functions:
1. :c:func:`glm_mat3x2_copy`
#. :c:func:`glm_mat3x2_zero`
#. :c:func:`glm_mat3x2_make`
#. :c:func:`glm_mat3x2_mul`
#. :c:func:`glm_mat3x2_mulv`
#. :c:func:`glm_mat3x2_transpose`
#. :c:func:`glm_mat3x2_scale`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
.. c:function:: void glm_mat3x2_copy(mat3x2 mat, mat3x2 dest)
copy mat3x2 to another one (dest).
Parameters:
| *[in]* **mat** source
| *[out]* **dest** destination
.. c:function:: void glm_mat3x2_zero(mat3x2 mat)
make given matrix zero
Parameters:
| *[in,out]* **mat** matrix
.. c:function:: void glm_mat3x2_make(float * __restrict src, mat3x2 dest)
Create mat3x2 matrix from pointer
| NOTE: **@src** must contain at least 6 elements.
Parameters:
| *[in]* **src** pointer to an array of floats
| *[out]* **dest** destination matrix3x2
.. c:function:: void glm_mat3x2_mul(mat3x2 m1, mat2x3 m2, mat3 dest)
multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c
glm_mat3x2_mul(m, m, m);
Parameters:
| *[in]* **m1** left matrix
| *[in]* **m2** right matrix
| *[out]* **dest** destination matrix
.. c:function:: void glm_mat3x2_mulv(mat3x2 m, vec2 v, vec3 dest)
multiply mat3x2 with vec2 (column vector) and store in dest vector
Parameters:
| *[in]* **m** mat3x2 (left)
| *[in]* **v** vec3 (right, column vector)
| *[out]* **dest** destination (result, column vector)
.. c:function:: void glm_mat3x2_transpose(mat3x2 m, mat2x3 dest)
transpose matrix and store in dest
Parameters:
| *[in]* **m** matrix
| *[out]* **dest** destination
.. c:function:: void glm_mat3x2_scale(mat3x2 m, float s)
multiply matrix with scalar
Parameters:
| *[in, out]* **m** matrix
| *[in]* **s** scalar

91
docs/source/mat3x4.rst Normal file
View File

@@ -0,0 +1,91 @@
.. default-domain:: C
mat3x4
======
Header: cglm/mat3x4.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_MAT3X4_ZERO_INIT
#. GLM_MAT3X4_ZERO
Functions:
1. :c:func:`glm_mat3x4_copy`
#. :c:func:`glm_mat3x4_zero`
#. :c:func:`glm_mat3x4_make`
#. :c:func:`glm_mat3x4_mul`
#. :c:func:`glm_mat3x4_mulv`
#. :c:func:`glm_mat3x4_transpose`
#. :c:func:`glm_mat3x4_scale`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
.. c:function:: void glm_mat3x4_copy(mat3x4 mat, mat3x4 dest)
copy mat3x4 to another one (dest).
Parameters:
| *[in]* **mat** source
| *[out]* **dest** destination
.. c:function:: void glm_mat3x4_zero(mat3x4 mat)
make given matrix zero
Parameters:
| *[in,out]* **mat** matrix
.. c:function:: void glm_mat3x4_make(float * __restrict src, mat3x4 dest)
Create mat3x4 matrix from pointer
| NOTE: **@src** must contain at least 12 elements.
Parameters:
| *[in]* **src** pointer to an array of floats
| *[out]* **dest** destination matrix3x4
.. c:function:: void glm_mat3x4_mul(mat3x4 m1, mat4x3 m2, mat3 dest)
multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c
glm_mat3x4_mul(m, m, m);
Parameters:
| *[in]* **m1** left matrix
| *[in]* **m2** right matrix
| *[out]* **dest** destination matrix
.. c:function:: void glm_mat3x4_mulv(mat3x4 m, vec4 v, vec3 dest)
multiply mat3x4 with vec4 (column vector) and store in dest vector
Parameters:
| *[in]* **m** mat3x4 (left)
| *[in]* **v** vec4 (right, column vector)
| *[out]* **dest** destination (result, column vector)
.. c:function:: void glm_mat3x4_transpose(mat3x4 m, mat4x3 dest)
transpose matrix and store in dest
Parameters:
| *[in]* **m** matrix
| *[out]* **dest** destination
.. c:function:: void glm_mat3x4_scale(mat3x4 m, float s)
multiply matrix with scalar
Parameters:
| *[in, out]* **m** matrix
| *[in]* **s** scalar

View File

@@ -119,6 +119,7 @@ Functions documentation
.. c:function:: void glm_mat4_mul(mat4 m1, mat4 m2, mat4 dest) .. c:function:: void glm_mat4_mul(mat4 m1, mat4 m2, mat4 dest)
multiply m1 and m2 to dest multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this: m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c .. code-block:: c
@@ -157,7 +158,6 @@ Functions documentation
Parameters: Parameters:
| *[in]* **m** mat4 (left) | *[in]* **m** mat4 (left)
| *[in]* **v** vec4 (right, column vector) | *[in]* **v** vec4 (right, column vector)
| *[in]* **last** 4th item to make it vec4
| *[out]* **dest** vec4 (result, column vector) | *[out]* **dest** vec4 (result, column vector)
.. c:function:: void glm_mat4_mulv3(mat4 m, vec3 v, float last, vec3 dest) .. c:function:: void glm_mat4_mulv3(mat4 m, vec3 v, float last, vec3 dest)
@@ -308,7 +308,7 @@ Functions documentation
Create mat4 matrix from pointer Create mat4 matrix from pointer
| NOTE: **@src** must contain 16 elements. | NOTE: **@src** must contain at least 16 elements.
Parameters: Parameters:
| *[in]* **src** pointer to an array of floats | *[in]* **src** pointer to an array of floats

91
docs/source/mat4x2.rst Normal file
View File

@@ -0,0 +1,91 @@
.. default-domain:: C
mat4x2
======
Header: cglm/mat4x2.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_MAT4X2_ZERO_INIT
#. GLM_MAT4X2_ZERO
Functions:
1. :c:func:`glm_mat4x2_copy`
#. :c:func:`glm_mat4x2_zero`
#. :c:func:`glm_mat4x2_make`
#. :c:func:`glm_mat4x2_mul`
#. :c:func:`glm_mat4x2_mulv`
#. :c:func:`glm_mat4x2_transpose`
#. :c:func:`glm_mat4x2_scale`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
.. c:function:: void glm_mat4x2_copy(mat4x2 mat, mat4x2 dest)
copy mat4x2 to another one (dest).
Parameters:
| *[in]* **mat** source
| *[out]* **dest** destination
.. c:function:: void glm_mat4x2_zero(mat4x2 mat)
make given matrix zero
Parameters:
| *[in,out]* **mat** matrix
.. c:function:: void glm_mat4x2_make(float * __restrict src, mat4x2 dest)
Create mat4x2 matrix from pointer
| NOTE: **@src** must contain at least 8 elements.
Parameters:
| *[in]* **src** pointer to an array of floats
| *[out]* **dest** destination matrix4x2
.. c:function:: void glm_mat4x2_mul(mat4x2 m1, mat2x4 m2, mat4 dest)
multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c
glm_mat4x2_mul(m, m, m);
Parameters:
| *[in]* **m1** left matrix
| *[in]* **m2** right matrix
| *[out]* **dest** destination matrix
.. c:function:: void glm_mat4x2_mulv(mat4x2 m, vec2 v, vec4 dest)
multiply mat4x2 with vec2 (column vector) and store in dest vector
Parameters:
| *[in]* **m** mat4x2 (left)
| *[in]* **v** vec2 (right, column vector)
| *[out]* **dest** destination (result, column vector)
.. c:function:: void glm_mat4x2_transpose(mat4x2 m, mat2x4 dest)
transpose matrix and store in dest
Parameters:
| *[in]* **m** matrix
| *[out]* **dest** destination
.. c:function:: void glm_mat4x2_scale(mat4x2 m, float s)
multiply matrix with scalar
Parameters:
| *[in, out]* **m** matrix
| *[in]* **s** scalar

91
docs/source/mat4x3.rst Normal file
View File

@@ -0,0 +1,91 @@
.. default-domain:: C
mat4x3
======
Header: cglm/mat4x3.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_MAT4X3_ZERO_INIT
#. GLM_MAT4X3_ZERO
Functions:
1. :c:func:`glm_mat4x3_copy`
#. :c:func:`glm_mat4x3_zero`
#. :c:func:`glm_mat4x3_make`
#. :c:func:`glm_mat4x3_mul`
#. :c:func:`glm_mat4x3_mulv`
#. :c:func:`glm_mat4x3_transpose`
#. :c:func:`glm_mat4x3_scale`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
.. c:function:: void glm_mat4x3_copy(mat4x3 mat, mat4x3 dest)
copy mat4x3 to another one (dest).
Parameters:
| *[in]* **mat** source
| *[out]* **dest** destination
.. c:function:: void glm_mat4x3_zero(mat4x3 mat)
make given matrix zero
Parameters:
| *[in,out]* **mat** matrix
.. c:function:: void glm_mat4x3_make(float * __restrict src, mat4x3 dest)
Create mat4x3 matrix from pointer
| NOTE: **@src** must contain at least 12 elements.
Parameters:
| *[in]* **src** pointer to an array of floats
| *[out]* **dest** destination matrix4x3
.. c:function:: void glm_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat4 dest)
multiply m1 and m2 to dest
m1, m2 and dest matrices can be same matrix, it is possible to write this:
.. code-block:: c
glm_mat4x3_mul(m, m, m);
Parameters:
| *[in]* **m1** left matrix
| *[in]* **m2** right matrix
| *[out]* **dest** destination matrix
.. c:function:: void glm_mat4x3_mulv(mat4x3 m, vec3 v, vec4 dest)
multiply mat4x3 with vec3 (column vector) and store in dest vector
Parameters:
| *[in]* **m** mat4x3 (left)
| *[in]* **v** vec3 (right, column vector)
| *[out]* **dest** destination (result, column vector)
.. c:function:: void glm_mat4x3_transpose(mat4x3 m, mat3x4 dest)
transpose matrix and store in dest
Parameters:
| *[in]* **m** matrix
| *[out]* **dest** destination
.. c:function:: void glm_mat4x3_scale(mat4x3 m, float s)
multiply matrix with scalar
Parameters:
| *[in, out]* **m** matrix
| *[in]* **s** scalar

View File

@@ -19,8 +19,14 @@ extern "C" {
#include "call/ivec3.h" #include "call/ivec3.h"
#include "call/ivec4.h" #include "call/ivec4.h"
#include "call/mat2.h" #include "call/mat2.h"
#include "call/mat2x3.h"
#include "call/mat2x4.h"
#include "call/mat3.h" #include "call/mat3.h"
#include "call/mat3x2.h"
#include "call/mat3x4.h"
#include "call/mat4.h" #include "call/mat4.h"
#include "call/mat4x2.h"
#include "call/mat4x3.h"
#include "call/affine.h" #include "call/affine.h"
#include "call/cam.h" #include "call/cam.h"
#include "call/quat.h" #include "call/quat.h"

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#ifndef cglmc_mat2x3_h
#define cglmc_mat2x3_h
#ifdef __cplusplus
extern "C" {
#endif
#include "../cglm.h"
CGLM_EXPORT
void
glmc_mat2x3_copy(mat2x3 mat, mat2x3 dest);
CGLM_EXPORT
void
glmc_mat2x3_zero(mat2x3 mat);
CGLM_EXPORT
void
glmc_mat2x3_make(float * __restrict src, mat2x3 dest);
CGLM_EXPORT
void
glmc_mat2x3_mul(mat2x3 m1, mat3x2 m2, mat2 dest);
CGLM_EXPORT
void
glmc_mat2x3_mulv(mat2x3 m, vec3 v, vec2 dest);
CGLM_EXPORT
void
glmc_mat2x3_transpose(mat2x3 m, mat3x2 dest);
CGLM_EXPORT
void
glmc_mat2x3_scale(mat2x3 m, float s);
#ifdef __cplusplus
}
#endif
#endif /* cglmc_mat2x3_h */

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#ifndef cglmc_mat2x4_h
#define cglmc_mat2x4_h
#ifdef __cplusplus
extern "C" {
#endif
#include "../cglm.h"
CGLM_EXPORT
void
glmc_mat2x4_copy(mat2x4 mat, mat2x4 dest);
CGLM_EXPORT
void
glmc_mat2x4_zero(mat2x4 mat);
CGLM_EXPORT
void
glmc_mat2x4_make(float * __restrict src, mat2x4 dest);
CGLM_EXPORT
void
glmc_mat2x4_mul(mat2x4 m1, mat4x2 m2, mat2 dest);
CGLM_EXPORT
void
glmc_mat2x4_mulv(mat2x4 m, vec4 v, vec2 dest);
CGLM_EXPORT
void
glmc_mat2x4_transpose(mat2x4 m, mat4x2 dest);
CGLM_EXPORT
void
glmc_mat2x4_scale(mat2x4 m, float s);
#ifdef __cplusplus
}
#endif
#endif /* cglmc_mat2x4_h */

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#ifndef cglmc_mat3x2_h
#define cglmc_mat3x2_h
#ifdef __cplusplus
extern "C" {
#endif
#include "../cglm.h"
CGLM_EXPORT
void
glmc_mat3x2_copy(mat3x2 mat, mat3x2 dest);
CGLM_EXPORT
void
glmc_mat3x2_zero(mat3x2 mat);
CGLM_EXPORT
void
glmc_mat3x2_make(float * __restrict src, mat3x2 dest);
CGLM_EXPORT
void
glmc_mat3x2_mul(mat3x2 m1, mat2x3 m2, mat3 dest);
CGLM_EXPORT
void
glmc_mat3x2_mulv(mat3x2 m, vec2 v, vec3 dest);
CGLM_EXPORT
void
glmc_mat3x2_transpose(mat3x2 m, mat2x3 dest);
CGLM_EXPORT
void
glmc_mat3x2_scale(mat3x2 m, float s);
#ifdef __cplusplus
}
#endif
#endif /* cglmc_mat3x2_h */

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#ifndef cglmc_mat3x4_h
#define cglmc_mat3x4_h
#ifdef __cplusplus
extern "C" {
#endif
#include "../cglm.h"
CGLM_EXPORT
void
glmc_mat3x4_copy(mat3x4 mat, mat3x4 dest);
CGLM_EXPORT
void
glmc_mat3x4_zero(mat3x4 mat);
CGLM_EXPORT
void
glmc_mat3x4_make(float * __restrict src, mat3x4 dest);
CGLM_EXPORT
void
glmc_mat3x4_mul(mat3x4 m1, mat4x3 m2, mat3 dest);
CGLM_EXPORT
void
glmc_mat3x4_mulv(mat3x4 m, vec4 v, vec3 dest);
CGLM_EXPORT
void
glmc_mat3x4_transpose(mat3x4 m, mat4x3 dest);
CGLM_EXPORT
void
glmc_mat3x4_scale(mat3x4 m, float s);
#ifdef __cplusplus
}
#endif
#endif /* cglmc_mat3x4_h */

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#ifndef cglmc_mat4x2_h
#define cglmc_mat4x2_h
#ifdef __cplusplus
extern "C" {
#endif
#include "../cglm.h"
CGLM_EXPORT
void
glmc_mat4x2_copy(mat4x2 mat, mat4x2 dest);
CGLM_EXPORT
void
glmc_mat4x2_zero(mat4x2 mat);
CGLM_EXPORT
void
glmc_mat4x2_make(float * __restrict src, mat4x2 dest);
CGLM_EXPORT
void
glmc_mat4x2_mul(mat4x2 m1, mat2x4 m2, mat4 dest);
CGLM_EXPORT
void
glmc_mat4x2_mulv(mat4x2 m, vec2 v, vec4 dest);
CGLM_EXPORT
void
glmc_mat4x2_transpose(mat4x2 m, mat2x4 dest);
CGLM_EXPORT
void
glmc_mat4x2_scale(mat4x2 m, float s);
#ifdef __cplusplus
}
#endif
#endif /* cglmc_mat4x2_h */

View File

@@ -0,0 +1,47 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#ifndef cglmc_mat4x3_h
#define cglmc_mat4x3_h
#ifdef __cplusplus
extern "C" {
#endif
#include "../cglm.h"
CGLM_EXPORT
void
glmc_mat4x3_copy(mat4x3 mat, mat4x3 dest);
CGLM_EXPORT
void
glmc_mat4x3_zero(mat4x3 mat);
CGLM_EXPORT
void
glmc_mat4x3_make(float * __restrict src, mat4x3 dest);
CGLM_EXPORT
void
glmc_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat4 dest);
CGLM_EXPORT
void
glmc_mat4x3_mulv(mat4x3 m, vec3 v, vec4 dest);
CGLM_EXPORT
void
glmc_mat4x3_transpose(mat4x3 m, mat3x4 dest);
CGLM_EXPORT
void
glmc_mat4x3_scale(mat4x3 m, float s);
#ifdef __cplusplus
}
#endif
#endif /* cglmc_mat4x3_h */

View File

@@ -16,8 +16,14 @@
#include "ivec3.h" #include "ivec3.h"
#include "ivec4.h" #include "ivec4.h"
#include "mat4.h" #include "mat4.h"
#include "mat4x2.h"
#include "mat4x3.h"
#include "mat3.h" #include "mat3.h"
#include "mat3x2.h"
#include "mat3x4.h"
#include "mat2.h" #include "mat2.h"
#include "mat2x3.h"
#include "mat2x4.h"
#include "affine.h" #include "affine.h"
#include "cam.h" #include "cam.h"
#include "frustum.h" #include "frustum.h"

156
include/cglm/mat2x3.h Normal file
View File

@@ -0,0 +1,156 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLM_MAT2X3_ZERO_INIT
GLM_MAT2X3_ZERO
Functions:
CGLM_INLINE void glm_mat2x3_copy(mat2x3 mat, mat2x3 dest);
CGLM_INLINE void glm_mat2x3_zero(mat2x3 mat);
CGLM_INLINE void glm_mat2x3_make(float * __restrict src, mat2x3 dest);
CGLM_INLINE void glm_mat2x3_mul(mat2x3 m1, mat3x2 m2, mat2 dest);
CGLM_INLINE void glm_mat2x3_mulv(mat2x3 m, vec3 v, vec2 dest);
CGLM_INLINE void glm_mat2x3_transpose(mat2x3 m, mat3x2 dest);
CGLM_INLINE void glm_mat2x3_scale(mat2x3 m, float s);
*/
#ifndef cglm_mat2x3_h
#define cglm_mat2x3_h
#include "common.h"
#define GLM_MAT2X3_ZERO_INIT {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
/* for C only */
#define GLM_MAT2X3_ZERO GLM_MAT2X3_ZERO_INIT
/*!
* @brief copy all members of [mat] to [dest]
*
* @param[in] mat source
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_mat2x3_copy(mat2x3 mat, mat2x3 dest) {
dest[0][0] = mat[0][0];
dest[0][1] = mat[0][1];
dest[0][2] = mat[0][2];
dest[1][0] = mat[1][0];
dest[1][1] = mat[1][1];
dest[1][2] = mat[1][2];
}
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
void
glm_mat2x3_zero(mat2x3 mat) {
CGLM_ALIGN_MAT mat2x3 t = GLM_MAT2X3_ZERO_INIT;
glm_mat2x3_copy(t, mat);
}
/*!
* @brief Create mat2x3 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @param[out] dest matrix
*/
CGLM_INLINE
void
glm_mat2x3_make(float * __restrict src, mat2x3 dest) {
dest[0][0] = src[0];
dest[0][1] = src[1];
dest[0][2] = src[2];
dest[1][0] = src[3];
dest[1][1] = src[4];
dest[1][2] = src[5];
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat2x3_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
void
glm_mat2x3_mul(mat2x3 m1, mat3x2 m2, mat2 dest) {
float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2],
a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2],
b00 = m2[0][0], b01 = m2[0][1],
b10 = m2[1][0], b11 = m2[1][1],
b20 = m2[2][0], b21 = m2[2][1];
dest[0][0] = a00 * b00 + a01 * b10 + a02 * b20;
dest[0][1] = a00 * b01 + a01 * b11 + a02 * b21;
dest[1][0] = a10 * b00 + a11 * b10 + a12 * b20;
dest[1][1] = a10 * b01 + a11 * b11 + a12 * b21;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
void
glm_mat2x3_mulv(mat2x3 m, vec3 v, vec2 dest) {
float v0 = v[0], v1 = v[1], v2 = v[2];
dest[0] = m[0][0] * v0 + m[0][1] * v1 + m[0][2] * v2;
dest[1] = m[1][0] * v0 + m[1][1] * v1 + m[1][2] * v2;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
void
glm_mat2x3_transpose(mat2x3 m, mat3x2 dest) {
dest[0][0] = m[0][0]; dest[0][1] = m[1][0];
dest[1][0] = m[0][1]; dest[1][1] = m[1][1];
dest[2][0] = m[0][2]; dest[2][1] = m[1][2];
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
void
glm_mat2x3_scale(mat2x3 m, float s) {
m[0][0] *= s; m[0][1] *= s; m[0][2] *= s;
m[1][0] *= s; m[1][1] *= s; m[1][2] *= s;
}
#endif

156
include/cglm/mat2x4.h Normal file
View File

@@ -0,0 +1,156 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLM_MAT2X4_ZERO_INIT
GLM_MAT2X4_ZERO
Functions:
CGLM_INLINE void glm_mat2x4_copy(mat2x4 mat, mat2x4 dest);
CGLM_INLINE void glm_mat2x4_zero(mat2x4 mat);
CGLM_INLINE void glm_mat2x4_make(float * __restrict src, mat2x4 dest);
CGLM_INLINE void glm_mat2x4_mul(mat2x4 m1, mat4x2 m2, mat2 dest);
CGLM_INLINE void glm_mat2x4_mulv(mat2x4 m, vec4 v, vec2 dest);
CGLM_INLINE void glm_mat2x4_transpose(mat2x4 m, mat4x2 dest);
CGLM_INLINE void glm_mat2x4_scale(mat2x4 m, float s);
*/
#ifndef cglm_mat2x4_h
#define cglm_mat2x4_h
#include "common.h"
#include "vec4.h"
#define GLM_MAT2X4_ZERO_INIT {{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}
/* for C only */
#define GLM_MAT2X4_ZERO GLM_MAT2X4_ZERO_INIT
/*!
* @brief copy all members of [mat] to [dest]
*
* @param[in] mat source
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_mat2x4_copy(mat2x4 mat, mat2x4 dest) {
glm_vec4_ucopy(mat[0], dest[0]);
glm_vec4_ucopy(mat[1], dest[1]);
}
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
void
glm_mat2x4_zero(mat2x4 mat) {
CGLM_ALIGN_MAT mat2x4 t = GLM_MAT2X4_ZERO_INIT;
glm_mat2x4_copy(t, mat);
}
/*!
* @brief Create mat2x4 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @param[out] dest matrix
*/
CGLM_INLINE
void
glm_mat2x4_make(float * __restrict src, mat2x4 dest) {
dest[0][0] = src[0];
dest[0][1] = src[1];
dest[0][2] = src[2];
dest[0][3] = src[3];
dest[1][0] = src[4];
dest[1][1] = src[5];
dest[1][2] = src[6];
dest[1][3] = src[7];
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat2x4_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
void
glm_mat2x4_mul(mat2x4 m1, mat4x2 m2, mat2 dest) {
float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3],
a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3],
b00 = m2[0][0], b01 = m2[0][1],
b10 = m2[1][0], b11 = m2[1][1],
b20 = m2[2][0], b21 = m2[2][1],
b30 = m2[3][0], b31 = m2[3][1];
dest[0][0] = a00 * b00 + a01 * b10 + a02 * b20 + a03 * b30;
dest[0][1] = a00 * b01 + a01 * b11 + a02 * b21 + a03 * b31;
dest[1][0] = a10 * b00 + a11 * b10 + a12 * b20 + a13 * b30;
dest[1][1] = a10 * b01 + a11 * b11 + a12 * b21 + a13 * b31;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
void
glm_mat2x4_mulv(mat2x4 m, vec4 v, vec2 dest) {
float v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
dest[0] = m[0][0] * v0 + m[0][1] * v1 + m[0][2] * v2 + m[0][3] * v3;
dest[1] = m[1][0] * v0 + m[1][1] * v1 + m[1][2] * v2 + m[1][3] * v3;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
void
glm_mat2x4_transpose(mat2x4 m, mat4x2 dest) {
dest[0][0] = m[0][0]; dest[0][1] = m[1][0];
dest[1][0] = m[0][1]; dest[1][1] = m[1][1];
dest[2][0] = m[0][2]; dest[2][1] = m[1][2];
dest[3][0] = m[0][3]; dest[3][1] = m[1][3];
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
void
glm_mat2x4_scale(mat2x4 m, float s) {
m[0][0] *= s; m[0][1] *= s; m[0][2] *= s; m[0][3] *= s;
m[1][0] *= s; m[1][1] *= s; m[1][2] *= s; m[1][3] *= s;
}
#endif

164
include/cglm/mat3x2.h Normal file
View File

@@ -0,0 +1,164 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLM_MAT3X2_ZERO_INIT
GLM_MAT3X2_ZERO
Functions:
CGLM_INLINE void glm_mat3x2_copy(mat3x2 mat, mat3x2 dest);
CGLM_INLINE void glm_mat3x2_zero(mat3x2 mat);
CGLM_INLINE void glm_mat3x2_make(float * __restrict src, mat3x2 dest);
CGLM_INLINE void glm_mat3x2_mul(mat3x2 m1, mat2x3 m2, mat3 dest);
CGLM_INLINE void glm_mat3x2_mulv(mat3x2 m, vec2 v, vec3 dest);
CGLM_INLINE void glm_mat3x2_transpose(mat3x2 m, mat2x3 dest);
CGLM_INLINE void glm_mat3x2_scale(mat3x2 m, float s);
*/
#ifndef cglm_mat3x2_h
#define cglm_mat3x2_h
#include "common.h"
#define GLM_MAT3X2_ZERO_INIT {{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}}
/* for C only */
#define GLM_MAT3X2_ZERO GLM_MAT3X2_ZERO_INIT
/*!
* @brief copy all members of [mat] to [dest]
*
* @param[in] mat source
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_mat3x2_copy(mat3x2 mat, mat3x2 dest) {
dest[0][0] = mat[0][0];
dest[0][1] = mat[0][1];
dest[1][0] = mat[1][0];
dest[1][1] = mat[1][1];
dest[2][0] = mat[2][0];
dest[2][1] = mat[2][1];
}
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
void
glm_mat3x2_zero(mat3x2 mat) {
CGLM_ALIGN_MAT mat3x2 t = GLM_MAT3X2_ZERO_INIT;
glm_mat3x2_copy(t, mat);
}
/*!
* @brief Create mat3x2 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @param[out] dest matrix
*/
CGLM_INLINE
void
glm_mat3x2_make(float * __restrict src, mat3x2 dest) {
dest[0][0] = src[0];
dest[0][1] = src[1];
dest[1][0] = src[2];
dest[1][1] = src[3];
dest[2][0] = src[4];
dest[2][1] = src[5];
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat3x2_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
void
glm_mat3x2_mul(mat3x2 m1, mat2x3 m2, mat3 dest) {
float a00 = m1[0][0], a01 = m1[0][1],
a10 = m1[1][0], a11 = m1[1][1],
a20 = m1[2][0], a21 = m1[2][1],
b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2],
b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2];
dest[0][0] = a00 * b00 + a01 * b10;
dest[0][1] = a00 * b01 + a01 * b11;
dest[0][2] = a00 * b02 + a01 * b12;
dest[1][0] = a10 * b00 + a11 * b10;
dest[1][1] = a10 * b01 + a11 * b11;
dest[1][2] = a10 * b02 + a11 * b12;
dest[2][0] = a20 * b00 + a21 * b10;
dest[2][1] = a20 * b01 + a21 * b11;
dest[2][2] = a20 * b02 + a21 * b12;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
void
glm_mat3x2_mulv(mat3x2 m, vec2 v, vec3 dest) {
float v0 = v[0], v1 = v[1];
dest[0] = m[0][0] * v0 + m[0][1] * v1;
dest[1] = m[1][0] * v0 + m[1][1] * v1;
dest[2] = m[2][0] * v0 + m[2][1] * v1;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
void
glm_mat3x2_transpose(mat3x2 m, mat2x3 dest) {
dest[0][0] = m[0][0]; dest[0][1] = m[1][0]; dest[0][2] = m[2][0];
dest[1][0] = m[0][1]; dest[1][1] = m[1][1]; dest[1][2] = m[2][1];
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
void
glm_mat3x2_scale(mat3x2 m, float s) {
m[0][0] *= s; m[0][1] *= s; m[1][0] *= s;
m[1][1] *= s; m[2][0] *= s; m[2][1] *= s;
}
#endif

173
include/cglm/mat3x4.h Normal file
View File

@@ -0,0 +1,173 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLM_MAT3X4_ZERO_INIT
GLM_MAT3X4_ZERO
Functions:
CGLM_INLINE void glm_mat3x4_copy(mat3x4 mat, mat3x4 dest);
CGLM_INLINE void glm_mat3x4_zero(mat3x4 mat);
CGLM_INLINE void glm_mat3x4_make(float * __restrict src, mat3x4 dest);
CGLM_INLINE void glm_mat3x4_mul(mat3x4 m1, mat4x3 m2, mat3 dest);
CGLM_INLINE void glm_mat3x4_mulv(mat3x4 m, vec4 v, vec3 dest);
CGLM_INLINE void glm_mat3x4_transpose(mat3x4 m, mat4x3 dest);
CGLM_INLINE void glm_mat3x4_scale(mat3x4 m, float s);
*/
#ifndef cglm_mat3x4_h
#define cglm_mat3x4_h
#include "common.h"
#define GLM_MAT3X4_ZERO_INIT {{0.0f, 0.0f, 0.0f, 0.0f}, \
{0.0f, 0.0f, 0.0f, 0.0f}, \
{0.0f, 0.0f, 0.0f, 0.0f}}
/* for C only */
#define GLM_MAT3X4_ZERO GLM_MAT3X4_ZERO_INIT
/*!
* @brief copy all members of [mat] to [dest]
*
* @param[in] mat source
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_mat3x4_copy(mat3x4 mat, mat3x4 dest) {
glm_vec4_ucopy(mat[0], dest[0]);
glm_vec4_ucopy(mat[1], dest[1]);
glm_vec4_ucopy(mat[2], dest[2]);
}
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
void
glm_mat3x4_zero(mat3x4 mat) {
CGLM_ALIGN_MAT mat3x4 t = GLM_MAT3X4_ZERO_INIT;
glm_mat3x4_copy(t, mat);
}
/*!
* @brief Create mat3x4 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @param[out] dest matrix
*/
CGLM_INLINE
void
glm_mat3x4_make(float * __restrict src, mat3x4 dest) {
dest[0][0] = src[0];
dest[0][1] = src[1];
dest[0][2] = src[2];
dest[0][3] = src[3];
dest[1][0] = src[4];
dest[1][1] = src[5];
dest[1][2] = src[6];
dest[1][3] = src[7];
dest[2][0] = src[8];
dest[2][1] = src[9];
dest[2][2] = src[10];
dest[2][3] = src[11];
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat3x4_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
void
glm_mat3x4_mul(mat3x4 m1, mat4x3 m2, mat3 dest) {
float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3],
a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3],
a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], a23 = m1[2][3],
b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2],
b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2],
b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2],
b30 = m2[3][0], b31 = m2[3][1], b32 = m2[3][2];
dest[0][0] = a00 * b00 + a01 * b10 + a02 * b20 + a03 * b30;
dest[0][1] = a00 * b01 + a01 * b11 + a02 * b21 + a03 * b31;
dest[0][2] = a00 * b02 + a01 * b12 + a02 * b22 + a03 * b32;
dest[1][0] = a10 * b00 + a11 * b10 + a12 * b20 + a13 * b30;
dest[1][1] = a10 * b01 + a11 * b11 + a12 * b21 + a13 * b31;
dest[1][2] = a10 * b02 + a11 * b12 + a12 * b22 + a13 * b32;
dest[2][0] = a20 * b00 + a21 * b10 + a22 * b20 + a23 * b30;
dest[2][1] = a20 * b01 + a21 * b11 + a22 * b21 + a23 * b31;
dest[2][2] = a20 * b02 + a21 * b12 + a22 * b22 + a23 * b32;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
void
glm_mat3x4_mulv(mat3x4 m, vec4 v, vec3 dest) {
float v0 = v[0], v1 = v[1], v2 = v[2], v3 = v[3];
dest[0] = m[0][0] * v0 + m[0][1] * v1 + m[0][2] * v2 + m[0][3] * v3;
dest[1] = m[1][0] * v0 + m[1][1] * v1 + m[1][2] * v2 + m[1][3] * v3;
dest[2] = m[2][0] * v0 + m[2][1] * v1 + m[2][2] * v2 + m[2][3] * v3;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
void
glm_mat3x4_transpose(mat3x4 m, mat4x3 dest) {
dest[0][0] = m[0][0]; dest[0][1] = m[1][0]; dest[0][2] = m[2][0];
dest[1][0] = m[0][1]; dest[1][1] = m[1][1]; dest[1][2] = m[2][1];
dest[2][0] = m[0][2]; dest[2][1] = m[1][2]; dest[2][2] = m[2][2];
dest[3][0] = m[0][3]; dest[3][1] = m[1][3]; dest[3][2] = m[2][3];
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
void
glm_mat3x4_scale(mat3x4 m, float s) {
m[0][0] *= s; m[1][0] *= s; m[2][0] *= s;
m[0][1] *= s; m[1][1] *= s; m[2][1] *= s;
m[0][2] *= s; m[1][2] *= s; m[2][2] *= s;
m[0][3] *= s; m[1][3] *= s; m[2][3] *= s;
}
#endif

186
include/cglm/mat4x2.h Normal file
View File

@@ -0,0 +1,186 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLM_MAT4X2_ZERO_INIT
GLM_MAT4X2_ZERO
Functions:
CGLM_INLINE void glm_mat4x2_copy(mat4x2 mat, mat4x2 dest);
CGLM_INLINE void glm_mat4x2_zero(mat4x2 mat);
CGLM_INLINE void glm_mat4x2_make(float * __restrict src, mat4x2 dest);
CGLM_INLINE void glm_mat4x2_mul(mat4x2 m1, mat2x4 m2, mat4 dest);
CGLM_INLINE void glm_mat4x2_mulv(mat4x2 m, vec2 v, vec4 dest);
CGLM_INLINE void glm_mat4x2_transpose(mat4x2 m, mat2x4 dest);
CGLM_INLINE void glm_mat4x2_scale(mat4x2 m, float s);
*/
#ifndef cglm_mat4x2_h
#define cglm_mat4x2_h
#include "common.h"
#define GLM_MAT4X2_ZERO_INIT {{0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}, {0.0f, 0.0f}}
/* for C only */
#define GLM_MAT4X2_ZERO GLM_MAT4X2_ZERO_INIT
/*!
* @brief copy all members of [mat] to [dest]
*
* @param[in] mat source
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_mat4x2_copy(mat4x2 mat, mat4x2 dest) {
dest[0][0] = mat[0][0];
dest[0][1] = mat[0][1];
dest[1][0] = mat[1][0];
dest[1][1] = mat[1][1];
dest[2][0] = mat[2][0];
dest[2][1] = mat[2][1];
dest[3][0] = mat[3][0];
dest[3][1] = mat[3][1];
}
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
void
glm_mat4x2_zero(mat4x2 mat) {
CGLM_ALIGN_MAT mat4x2 t = GLM_MAT4X2_ZERO_INIT;
glm_mat4x2_copy(t, mat);
}
/*!
* @brief Create mat4x2 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @param[out] dest matrix
*/
CGLM_INLINE
void
glm_mat4x2_make(float * __restrict src, mat4x2 dest) {
dest[0][0] = src[0];
dest[0][1] = src[1];
dest[1][0] = src[2];
dest[1][1] = src[3];
dest[2][0] = src[4];
dest[2][1] = src[5];
dest[3][0] = src[6];
dest[3][1] = src[7];
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat4x2_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
void
glm_mat4x2_mul(mat4x2 m1, mat2x4 m2, mat4 dest) {
float a00 = m1[0][0], a01 = m1[0][1],
a10 = m1[1][0], a11 = m1[1][1],
a20 = m1[2][0], a21 = m1[2][1],
a30 = m1[3][0], a31 = m1[3][1],
b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], b03 = m2[0][3],
b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], b13 = m2[1][3];
dest[0][0] = a00 * b00 + a01 * b10;
dest[0][1] = a00 * b01 + a01 * b11;
dest[0][2] = a00 * b02 + a01 * b12;
dest[0][3] = a00 * b03 + a01 * b13;
dest[1][0] = a10 * b00 + a11 * b10;
dest[1][1] = a10 * b01 + a11 * b11;
dest[1][2] = a10 * b02 + a11 * b12;
dest[1][3] = a10 * b03 + a11 * b13;
dest[2][0] = a20 * b00 + a21 * b10;
dest[2][1] = a20 * b01 + a21 * b11;
dest[2][2] = a20 * b02 + a21 * b12;
dest[2][3] = a20 * b03 + a21 * b13;
dest[3][0] = a30 * b00 + a31 * b10;
dest[3][1] = a30 * b01 + a31 * b11;
dest[3][2] = a30 * b02 + a31 * b12;
dest[3][3] = a30 * b03 + a31 * b13;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
void
glm_mat4x2_mulv(mat4x2 m, vec2 v, vec4 dest) {
float v0 = v[0], v1 = v[1];
dest[0] = m[0][0] * v0 + m[0][1] * v1;
dest[1] = m[1][0] * v0 + m[1][1] * v1;
dest[2] = m[2][0] * v0 + m[2][1] * v1;
dest[3] = m[3][0] * v0 + m[3][1] * v1;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
void
glm_mat4x2_transpose(mat4x2 m, mat2x4 dest) {
dest[0][0] = m[0][0];
dest[0][1] = m[1][0];
dest[0][2] = m[2][0];
dest[0][3] = m[3][0];
dest[1][0] = m[0][1];
dest[1][1] = m[1][1];
dest[1][2] = m[2][1];
dest[1][3] = m[3][1];
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
void
glm_mat4x2_scale(mat4x2 m, float s) {
m[0][0] *= s; m[0][1] *= s; m[1][0] *= s; m[1][1] *= s;
m[2][0] *= s; m[2][1] *= s; m[3][0] *= s; m[3][1] *= s;
}
#endif

203
include/cglm/mat4x3.h Normal file
View File

@@ -0,0 +1,203 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLM_MAT4X3_ZERO_INIT
GLM_MAT4X3_ZERO
Functions:
CGLM_INLINE void glm_mat4x3_copy(mat4x3 mat, mat4x3 dest);
CGLM_INLINE void glm_mat4x3_zero(mat4x3 mat);
CGLM_INLINE void glm_mat4x3_make(float * __restrict src, mat4x3 dest);
CGLM_INLINE void glm_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat4 dest);
CGLM_INLINE void glm_mat4x3_mulv(mat4x3 m, vec3 v, vec4 dest);
CGLM_INLINE void glm_mat4x3_transpose(mat4x3 m, mat3x4 dest);
CGLM_INLINE void glm_mat4x3_scale(mat4x3 m, float s);
*/
#ifndef cglm_mat4x3_h
#define cglm_mat4x3_h
#include "common.h"
#define GLM_MAT4X3_ZERO_INIT {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, \
{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
/* for C only */
#define GLM_MAT4X3_ZERO GLM_MAT4X3_ZERO_INIT
/*!
* @brief copy all members of [mat] to [dest]
*
* @param[in] mat source
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_mat4x3_copy(mat4x3 mat, mat4x3 dest) {
dest[0][0] = mat[0][0];
dest[0][1] = mat[0][1];
dest[0][2] = mat[0][2];
dest[1][0] = mat[1][0];
dest[1][1] = mat[1][1];
dest[1][2] = mat[1][2];
dest[2][0] = mat[2][0];
dest[2][1] = mat[2][1];
dest[2][2] = mat[2][2];
dest[3][0] = mat[3][0];
dest[3][1] = mat[3][1];
dest[3][2] = mat[3][2];
}
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
void
glm_mat4x3_zero(mat4x3 mat) {
CGLM_ALIGN_MAT mat4x3 t = GLM_MAT4X3_ZERO_INIT;
glm_mat4x3_copy(t, mat);
}
/*!
* @brief Create mat4x3 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @param[out] dest matrix
*/
CGLM_INLINE
void
glm_mat4x3_make(float * __restrict src, mat4x3 dest) {
dest[0][0] = src[0];
dest[0][1] = src[1];
dest[0][2] = src[2];
dest[1][0] = src[3];
dest[1][1] = src[4];
dest[1][2] = src[5];
dest[2][0] = src[6];
dest[2][1] = src[7];
dest[2][2] = src[8];
dest[3][0] = src[9];
dest[3][1] = src[10];
dest[3][2] = src[11];
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat4x3_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
void
glm_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat4 dest) {
float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2],
a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2],
a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2],
a30 = m1[3][0], a31 = m1[3][1], a32 = m1[3][2],
b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], b03 = m2[0][3],
b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], b13 = m2[1][3],
b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], b23 = m2[2][3];
dest[0][0] = a00 * b00 + a01 * b10 + a02 * b20;
dest[0][1] = a00 * b01 + a01 * b11 + a02 * b21;
dest[0][2] = a00 * b02 + a01 * b12 + a02 * b22;
dest[0][3] = a00 * b03 + a01 * b13 + a02 * b23;
dest[1][0] = a10 * b00 + a11 * b10 + a12 * b20;
dest[1][1] = a10 * b01 + a11 * b11 + a12 * b21;
dest[1][2] = a10 * b02 + a11 * b12 + a12 * b22;
dest[1][3] = a10 * b03 + a11 * b13 + a12 * b23;
dest[2][0] = a20 * b00 + a21 * b10 + a22 * b20;
dest[2][1] = a20 * b01 + a21 * b11 + a22 * b21;
dest[2][2] = a20 * b02 + a21 * b12 + a22 * b22;
dest[2][3] = a20 * b03 + a21 * b13 + a22 * b23;
dest[3][0] = a30 * b00 + a31 * b10 + a32 * b20;
dest[3][1] = a30 * b01 + a31 * b11 + a32 * b21;
dest[3][2] = a30 * b02 + a31 * b12 + a32 * b22;
dest[3][3] = a30 * b03 + a31 * b13 + a32 * b23;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
void
glm_mat4x3_mulv(mat4x3 m, vec3 v, vec4 dest) {
float v0 = v[0], v1 = v[1], v2 = v[2];
dest[0] = m[0][0] * v0 + m[0][1] * v1 + m[0][2] * v2;
dest[1] = m[1][0] * v0 + m[1][1] * v1 + m[1][2] * v2;
dest[2] = m[2][0] * v0 + m[2][1] * v1 + m[2][2] * v2;
dest[3] = m[3][0] * v0 + m[3][1] * v1 + m[3][2] * v2;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
void
glm_mat4x3_transpose(mat4x3 m, mat3x4 dest) {
dest[0][0] = m[0][0];
dest[0][1] = m[1][0];
dest[0][2] = m[2][0];
dest[0][3] = m[3][0];
dest[1][0] = m[0][1];
dest[1][1] = m[1][1];
dest[1][2] = m[2][1];
dest[1][3] = m[3][1];
dest[2][0] = m[0][2];
dest[2][1] = m[1][2];
dest[2][2] = m[2][2];
dest[2][3] = m[3][2];
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
void
glm_mat4x3_scale(mat4x3 m, float s) {
m[0][0] *= s; m[0][1] *= s; m[0][2] *= s; m[1][0] *= s;
m[1][1] *= s; m[1][2] *= s; m[2][0] *= s; m[2][1] *= s;
m[2][2] *= s; m[3][0] *= s; m[3][1] *= s; m[3][2] *= s;
}
#endif

View File

@@ -17,8 +17,14 @@ extern "C" {
#include "struct/vec3.h" #include "struct/vec3.h"
#include "struct/vec4.h" #include "struct/vec4.h"
#include "struct/mat2.h" #include "struct/mat2.h"
#include "struct/mat2x3.h"
#include "struct/mat2x4.h"
#include "struct/mat3.h" #include "struct/mat3.h"
#include "struct/mat3x2.h"
#include "struct/mat3x4.h"
#include "struct/mat4.h" #include "struct/mat4.h"
#include "struct/mat4x2.h"
#include "struct/mat4x3.h"
#include "struct/affine.h" #include "struct/affine.h"
#include "struct/frustum.h" #include "struct/frustum.h"
#include "struct/plane.h" #include "struct/plane.h"

View File

@@ -27,7 +27,7 @@
CGLM_INLINE void glms_mat2_swap_col(mat2 mat, int col1, int col2) CGLM_INLINE void glms_mat2_swap_col(mat2 mat, int col1, int col2)
CGLM_INLINE void glms_mat2_swap_row(mat2 mat, int row1, int row2) CGLM_INLINE void glms_mat2_swap_row(mat2 mat, int row1, int row2)
CGLM_INLINE float glms_mat2_rmc(vec2 r, mat2 m, vec2 c) CGLM_INLINE float glms_mat2_rmc(vec2 r, mat2 m, vec2 c)
CGLM_INLINE float glms_mat42_make(float * __restrict src); CGLM_INLINE mat2s glms_mat2_make(float * __restrict src);
*/ */
#ifndef cglms_mat2_h #ifndef cglms_mat2_h
@@ -44,8 +44,8 @@
#define GLMS_MAT2_ZERO_INIT {GLM_MAT2_ZERO_INIT} #define GLMS_MAT2_ZERO_INIT {GLM_MAT2_ZERO_INIT}
/* for C only */ /* for C only */
#define GLMS_MAT2_IDENTITY ((mat3s)GLMS_MAT2_IDENTITY_INIT) #define GLMS_MAT2_IDENTITY ((mat2s)GLMS_MAT2_IDENTITY_INIT)
#define GLMS_MAT2_ZERO ((mat3s)GLMS_MAT2_ZERO_INIT) #define GLMS_MAT2_ZERO ((mat2s)GLMS_MAT2_ZERO_INIT)
/*! /*!
* @brief make given matrix identity. It is identical with below, * @brief make given matrix identity. It is identical with below,

View File

@@ -0,0 +1,129 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLMS_MAT2X3_ZERO_INIT
GLMS_MAT2X3_ZERO
Functions:
CGLM_INLINE mat2x3s glms_mat2x3_zero(void);
CGLM_INLINE mat2x3s glms_mat2x3_make(float * __restrict src);
CGLM_INLINE mat2s glms_mat2x3_mul(mat2x3s m1, mat3x2s m2);
CGLM_INLINE vec2s glms_mat2x3_mulv(mat2x3s m, vec3s v);
CGLM_INLINE mat3x2s glms_mat2x3_transpose(mat2x3s m);
CGLM_INLINE mat2x3s glms_mat2x3_scale(mat2x3s m, float s);
*/
#ifndef cglms_mat2x3_h
#define cglms_mat2x3_h
#include "../common.h"
#include "../types-struct.h"
#include "../mat2x3.h"
/* api definition */
#define glms_mat2x3_(NAME) CGLM_STRUCTAPI(mat2x3, NAME)
#define GLMS_MAT2X3_ZERO_INIT {GLM_MAT2X3_ZERO_INIT}
/* for C only */
#define GLMS_MAT2X3_ZERO ((mat2x3s)GLMS_MAT2X3_ZERO_INIT)
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
mat2x3s
glms_mat2x3_(zero)(void) {
mat2x3s r;
glm_mat2x3_zero(r.raw);
return r;
}
/*!
* @brief Create mat2x3 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @return constructed matrix from raw pointer
*/
CGLM_INLINE
mat2x3s
glms_mat2x3_(make)(float * __restrict src) {
mat2x3s r;
glm_mat2x3_make(src, r.raw);
return r;
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat2x3_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
mat2s
glms_mat2x3_(mul)(mat2x3s m1, mat3x2s m2) {
mat2s r;
glm_mat2x3_mul(m1.raw, m2.raw, r.raw);
return r;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
vec2s
glms_mat2x3_(mulv)(mat2x3s m, vec3s v) {
vec2s r;
glm_mat2x3_mulv(m.raw, v.raw, r.raw);
return r;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
mat3x2s
glms_mat2x3_(transpose)(mat2x3s m) {
mat3x2s r;
glm_mat2x3_transpose(m.raw, r.raw);
return r;
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
mat2x3s
glms_mat2x3_(scale)(mat2x3s m, float s) {
glm_mat2x3_scale(m.raw, s);
return m;
}
#endif /* cglms_mat2x3_h */

View File

@@ -0,0 +1,129 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLMS_MAT2X4_ZERO_INIT
GLMS_MAT2X4_ZERO
Functions:
CGLM_INLINE mat2x4s glms_mat2x4_zero(void);
CGLM_INLINE mat2x4s glms_mat2x4_make(float * __restrict src);
CGLM_INLINE mat2s glms_mat2x4_mul(mat2x4s m1, mat4x2s m2);
CGLM_INLINE vec2s glms_mat2x4_mulv(mat2x4s m, vec4s v);
CGLM_INLINE mat4x2s glms_mat2x4_transpose(mat2x4s m);
CGLM_INLINE mat2x4s glms_mat2x4_scale(mat2x4s m, float s);
*/
#ifndef cglms_mat2x4_h
#define cglms_mat2x4_h
#include "../common.h"
#include "../types-struct.h"
#include "../mat2x4.h"
/* api definition */
#define glms_mat2x4_(NAME) CGLM_STRUCTAPI(mat2x4, NAME)
#define GLMS_MAT2X4_ZERO_INIT {GLM_MAT2X4_ZERO_INIT}
/* for C only */
#define GLMS_MAT2X4_ZERO ((mat2x4s)GLMS_MAT2X4_ZERO_INIT)
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
mat2x4s
glms_mat2x4_(zero)(void) {
mat2x4s r;
glm_mat2x4_zero(r.raw);
return r;
}
/*!
* @brief Create mat2x4 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @return constructed matrix from raw pointer
*/
CGLM_INLINE
mat2x4s
glms_mat2x4_(make)(float * __restrict src) {
mat2x4s r;
glm_mat2x4_make(src, r.raw);
return r;
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat2x4_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
mat2s
glms_mat2x4_(mul)(mat2x4s m1, mat4x2s m2) {
mat2s r;
glm_mat2x4_mul(m1.raw, m2.raw, r.raw);
return r;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
vec2s
glms_mat2x4_(mulv)(mat2x4s m, vec4s v) {
vec2s r;
glm_mat2x4_mulv(m.raw, v.raw, r.raw);
return r;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
mat4x2s
glms_mat2x4_(transpose)(mat2x4s m) {
mat4x2s r;
glm_mat2x4_transpose(m.raw, r.raw);
return r;
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
mat2x4s
glms_mat2x4_(scale)(mat2x4s m, float s) {
glm_mat2x4_scale(m.raw, s);
return m;
}
#endif /* cglms_mat2x4_h */

View File

@@ -28,7 +28,7 @@
CGLM_INLINE mat3s glms_mat3_swap_col(mat3s mat, int col1, int col2); CGLM_INLINE mat3s glms_mat3_swap_col(mat3s mat, int col1, int col2);
CGLM_INLINE mat3s glms_mat3_swap_row(mat3s mat, int row1, int row2); CGLM_INLINE mat3s glms_mat3_swap_row(mat3s mat, int row1, int row2);
CGLM_INLINE float glms_mat3_rmc(vec3s r, mat3s m, vec3s c); CGLM_INLINE float glms_mat3_rmc(vec3s r, mat3s m, vec3s c);
CGLM_INLINE float glms_mat3_make(float * __restrict src); CGLM_INLINE mat3s glms_mat3_make(float * __restrict src);
*/ */
#ifndef cglms_mat3s_h #ifndef cglms_mat3s_h

View File

@@ -0,0 +1,129 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLMS_MAT3X2_ZERO_INIT
GLMS_MAT3X2_ZERO
Functions:
CGLM_INLINE mat3x2s glms_mat3x2_zero(void);
CGLM_INLINE mat3x2s glms_mat3x2_make(float * __restrict src);
CGLM_INLINE mat3s glms_mat3x2_mul(mat3x2s m1, mat2x3s m2);
CGLM_INLINE vec3s glms_mat3x2_mulv(mat3x2s m, vec2s v);
CGLM_INLINE mat2x3s glms_mat3x2_transpose(mat3x2s m);
CGLM_INLINE mat3x2s glms_mat3x2_scale(mat3x2s m, float s);
*/
#ifndef cglms_mat3x2_h
#define cglms_mat3x2_h
#include "../common.h"
#include "../types-struct.h"
#include "../mat3x2.h"
/* api definition */
#define glms_mat3x2_(NAME) CGLM_STRUCTAPI(mat3x2, NAME)
#define GLMS_MAT3X2_ZERO_INIT {GLM_MAT3X2_ZERO_INIT}
/* for C only */
#define GLMS_MAT3X2_ZERO ((mat3x2s)GLMS_MAT3X2_ZERO_INIT)
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
mat3x2s
glms_mat3x2_(zero)(void) {
mat3x2s r;
glm_mat3x2_zero(r.raw);
return r;
}
/*!
* @brief Create mat3x2 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @return constructed matrix from raw pointer
*/
CGLM_INLINE
mat3x2s
glms_mat3x2_(make)(float * __restrict src) {
mat3x2s r;
glm_mat3x2_make(src, r.raw);
return r;
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat3x2_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
mat3s
glms_mat3x2_(mul)(mat3x2s m1, mat2x3s m2) {
mat3s r;
glm_mat3x2_mul(m1.raw, m2.raw, r.raw);
return r;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
vec3s
glms_mat3x2_(mulv)(mat3x2s m, vec2s v) {
vec3s r;
glm_mat3x2_mulv(m.raw, v.raw, r.raw);
return r;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
mat2x3s
glms_mat3x2_(transpose)(mat3x2s m) {
mat2x3s r;
glm_mat3x2_transpose(m.raw, r.raw);
return r;
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
mat3x2s
glms_mat3x2_(scale)(mat3x2s m, float s) {
glm_mat3x2_scale(m.raw, s);
return m;
}
#endif /* cglms_mat3x2_h */

View File

@@ -0,0 +1,129 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLMS_MAT3X4_ZERO_INIT
GLMS_MAT3X4_ZERO
Functions:
CGLM_INLINE mat3x4s glms_mat3x4_zero(void);
CGLM_INLINE mat3x4s glms_mat3x4_make(float * __restrict src);
CGLM_INLINE mat3s glms_mat3x4_mul(mat3x4s m1, mat4x3s m2);
CGLM_INLINE vec3s glms_mat3x4_mulv(mat3x4s m, vec4s v);
CGLM_INLINE mat4x3s glms_mat3x4_transpose(mat3x4s m);
CGLM_INLINE mat3x4s glms_mat3x4_scale(mat3x4s m, float s);
*/
#ifndef cglms_mat3x4_h
#define cglms_mat3x4_h
#include "../common.h"
#include "../types-struct.h"
#include "../mat3x4.h"
/* api definition */
#define glms_mat3x4_(NAME) CGLM_STRUCTAPI(mat3x4, NAME)
#define GLMS_MAT3X4_ZERO_INIT {GLM_MAT3X4_ZERO_INIT}
/* for C only */
#define GLMS_MAT3X4_ZERO ((mat3x4s)GLMS_MAT3X4_ZERO_INIT)
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
mat3x4s
glms_mat3x4_(zero)(void) {
mat3x4s r;
glm_mat3x4_zero(r.raw);
return r;
}
/*!
* @brief Create mat3x4 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @return constructed matrix from raw pointer
*/
CGLM_INLINE
mat3x4s
glms_mat3x4_(make)(float * __restrict src) {
mat3x4s r;
glm_mat3x4_make(src, r.raw);
return r;
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat3x4_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
mat3s
glms_mat3x4_(mul)(mat3x4s m1, mat4x3s m2) {
mat3s r;
glm_mat3x4_mul(m1.raw, m2.raw, r.raw);
return r;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
vec3s
glms_mat3x4_(mulv)(mat3x4s m, vec4s v) {
vec3s r;
glm_mat3x4_mulv(m.raw, v.raw, r.raw);
return r;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
mat4x3s
glms_mat3x4_(transpose)(mat3x4s m) {
mat4x3s r;
glm_mat3x4_transpose(m.raw, r.raw);
return r;
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
mat3x4s
glms_mat3x4_(scale)(mat3x4s m, float s) {
glm_mat3x4_scale(m.raw, s);
return m;
}
#endif /* cglms_mat3x4_h */

View File

@@ -42,7 +42,7 @@
CGLM_INLINE mat4s glms_mat4_swap_col(mat4s mat, int col1, int col2); CGLM_INLINE mat4s glms_mat4_swap_col(mat4s mat, int col1, int col2);
CGLM_INLINE mat4s glms_mat4_swap_row(mat4s mat, int row1, int row2); CGLM_INLINE mat4s glms_mat4_swap_row(mat4s mat, int row1, int row2);
CGLM_INLINE float glms_mat4_rmc(vec4s r, mat4s m, vec4s c); CGLM_INLINE float glms_mat4_rmc(vec4s r, mat4s m, vec4s c);
CGLM_INLINE float glms_mat4_make(float * __restrict src); CGLM_INLINE mat4s glms_mat4_make(float * __restrict src);
*/ */
#ifndef cglms_mat4s_h #ifndef cglms_mat4s_h

View File

@@ -0,0 +1,130 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLMS_MAT4X2_ZERO_INIT
GLMS_MAT4X2_ZERO
Functions:
CGLM_INLINE mat4x2s glms_mat4x2_zero(void);
CGLM_INLINE mat4x2s glms_mat4x2_make(float * __restrict src);
CGLM_INLINE mat4s glms_mat4x2_mul(mat4x2s m1, mat2x4s m2);
CGLM_INLINE vec4s glms_mat4x2_mulv(mat4x2s m, vec2s v);
CGLM_INLINE mat2x4s glms_mat4x2_transpose(mat4x2s m);
CGLM_INLINE mat4x2s glms_mat4x2_scale(mat4x2s m, float s);
*/
#ifndef cglms_mat4x2_h
#define cglms_mat4x2_h
#include "../common.h"
#include "../types-struct.h"
#include "../mat4x2.h"
/* api definition */
#define glms_mat4x2_(NAME) CGLM_STRUCTAPI(mat4x2, NAME)
#define GLMS_MAT4X2_ZERO_INIT {GLM_MAT4X2_ZERO_INIT}
/* for C only */
#define GLMS_MAT4X2_ZERO ((mat4x2s)GLMS_MAT4X2_ZERO_INIT)
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
mat4x2s
glms_mat4x2_(zero)(void) {
mat4x2s r;
glm_mat4x2_zero(r.raw);
return r;
}
/*!
* @brief Create mat4x2 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @return constructed matrix from raw pointer
*/
CGLM_INLINE
mat4x2s
glms_mat4x2_(make)(float * __restrict src) {
mat4x2s r;
glm_mat4x2_make(src, r.raw);
return r;
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat4x2_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
mat4s
glms_mat4x2_(mul)(mat4x2s m1, mat2x4s m2) {
mat4s r;
glm_mat4x2_mul(m1.raw, m2.raw, r.raw);
return r;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
vec4s
glms_mat4x2_(mulv)(mat4x2s m, vec2s v) {
vec4s r;
glm_mat4x2_mulv(m.raw, v.raw, r.raw);
return r;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
mat2x4s
glms_mat4x2_(transpose)(mat4x2s m) {
mat2x4s r;
glm_mat4x2_transpose(m.raw, r.raw);
return r;
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
mat4x2s
glms_mat4x2_(scale)(mat4x2s m, float s) {
glm_mat4x2_scale(m.raw, s);
return m;
}
#endif /* cglms_mat4x2_h */

View File

@@ -0,0 +1,129 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
/*
Macros:
GLMS_MAT4X3_ZERO_INIT
GLMS_MAT4X3_ZERO
Functions:
CGLM_INLINE mat4x3s glms_mat4x3_zero(void);
CGLM_INLINE mat4x3s glms_mat4x3_make(float * __restrict src);
CGLM_INLINE mat4s glms_mat4x3_mul(mat4x3s m1, mat3x4s m2);
CGLM_INLINE vec4s glms_mat4x3_mulv(mat4x3s m, vec3s v);
CGLM_INLINE mat3x4s glms_mat4x3_transpose(mat4x3s m);
CGLM_INLINE mat4x3s glms_mat4x3_scale(mat4x3s m, float s);
*/
#ifndef cglms_mat4x3_h
#define cglms_mat4x3_h
#include "../common.h"
#include "../types-struct.h"
#include "../mat4x3.h"
/* api definition */
#define glms_mat4x3_(NAME) CGLM_STRUCTAPI(mat4x3, NAME)
#define GLMS_MAT4X3_ZERO_INIT {GLM_MAT4X3_ZERO_INIT}
/* for C only */
#define GLMS_MAT4X3_ZERO ((mat4x3s)GLMS_MAT4X3_ZERO_INIT)
/*!
* @brief make given matrix zero.
*
* @param[in, out] mat matrix
*/
CGLM_INLINE
mat4x3s
glms_mat4x3_(zero)(void) {
mat4x3s r;
glm_mat4x3_zero(r.raw);
return r;
}
/*!
* @brief Create mat4x3 matrix from pointer
*
* @param[in] src pointer to an array of floats
* @return constructed matrix from raw pointer
*/
CGLM_INLINE
mat4x3s
glms_mat4x3_(make)(float * __restrict src) {
mat4x3s r;
glm_mat4x3_make(src, r.raw);
return r;
}
/*!
* @brief multiply m1 and m2 to dest
*
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
*
* @code
* glm_mat4x3_mul(m, m, m);
* @endcode
*
* @param[in] m1 left matrix
* @param[in] m2 right matrix
* @param[out] dest destination matrix
*/
CGLM_INLINE
mat4s
glms_mat4x3_(mul)(mat4x3s m1, mat3x4s m2) {
mat4s r;
glm_mat4x3_mul(m1.raw, m2.raw, r.raw);
return r;
}
/*!
* @brief multiply matrix with column vector and store in dest vector
*
* @param[in] m matrix (left)
* @param[in] v vector (right, column vector)
* @param[out] dest result vector
*/
CGLM_INLINE
vec4s
glms_mat4x3_(mulv)(mat4x3s m, vec3s v) {
vec4s r;
glm_mat4x3_mulv(m.raw, v.raw, r.raw);
return r;
}
/*!
* @brief transpose matrix and store in dest
*
* @param[in] m matrix
* @param[out] dest result
*/
CGLM_INLINE
mat3x4s
glms_mat4x3_(transpose)(mat4x3s m) {
mat3x4s r;
glm_mat4x3_transpose(m.raw, r.raw);
return r;
}
/*!
* @brief scale (multiply with scalar) matrix
*
* multiply matrix with scalar
*
* @param[in, out] m matrix
* @param[in] s scalar
*/
CGLM_INLINE
mat4x3s
glms_mat4x3_(scale)(mat4x3s m, float s) {
glm_mat4x3_scale(m.raw, s);
return m;
}
#endif /* cglms_mat4x3_h */

View File

@@ -197,6 +197,28 @@ typedef union mat2s {
#endif #endif
} mat2s; } mat2s;
typedef union mat2x3s {
mat2x3 raw;
vec3s col[2]; /* [col (2), row (3)] */
#if CGLM_USE_ANONYMOUS_STRUCT
struct {
float m00, m01, m02;
float m10, m11, m12;
};
#endif
} mat2x3s;
typedef union mat2x4s {
mat2x4 raw;
vec4s col[2]; /* [col (2), row (4)] */
#if CGLM_USE_ANONYMOUS_STRUCT
struct {
float m00, m01, m02, m03;
float m10, m11, m12, m13;
};
#endif
} mat2x4s;
typedef union mat3s { typedef union mat3s {
mat3 raw; mat3 raw;
vec3s col[3]; vec3s col[3];
@@ -209,6 +231,30 @@ typedef union mat3s {
#endif #endif
} mat3s; } mat3s;
typedef union mat3x2s {
mat3x2 raw;
vec2s col[3]; /* [col (3), row (2)] */
#if CGLM_USE_ANONYMOUS_STRUCT
struct {
float m00, m01;
float m10, m11;
float m20, m21;
};
#endif
} mat3x2s;
typedef union mat3x4s {
mat3x4 raw;
vec4s col[3]; /* [col (3), row (4)] */
#if CGLM_USE_ANONYMOUS_STRUCT
struct {
float m00, m01, m02, m03;
float m10, m11, m12, m13;
float m20, m21, m22, m23;
};
#endif
} mat3x4s;
typedef union CGLM_ALIGN_MAT mat4s { typedef union CGLM_ALIGN_MAT mat4s {
mat4 raw; mat4 raw;
vec4s col[4]; vec4s col[4];
@@ -222,4 +268,30 @@ typedef union CGLM_ALIGN_MAT mat4s {
#endif #endif
} mat4s; } mat4s;
typedef union mat4x2s {
mat4x2 raw;
vec2s col[4]; /* [col (4), row (2)] */
#if CGLM_USE_ANONYMOUS_STRUCT
struct {
float m00, m01;
float m10, m11;
float m20, m21;
float m30, m31;
};
#endif
} mat4x2s;
typedef union mat4x3s {
mat4x3 raw;
vec3s col[4]; /* [col (4), row (3)] */
#if CGLM_USE_ANONYMOUS_STRUCT
struct {
float m00, m01, m02;
float m10, m11, m12;
float m20, m21, m22;
float m30, m31, m32;
};
#endif
} mat4x3s;
#endif /* cglm_types_struct_h */ #endif /* cglm_types_struct_h */

View File

@@ -32,13 +32,27 @@
# define CGLM_ALIGN_MAT CGLM_ALIGN(16) # define CGLM_ALIGN_MAT CGLM_ALIGN(16)
#endif #endif
#if defined(__has_builtin) #ifndef CGLM_HAVE_BUILTIN_ASSUME_ALIGNED
# if __has_builtin(__builtin_assume_aligned)
# define CGLM_ASSUME_ALIGNED(expr, alignment) \ # if defined(__has_builtin)
__builtin_assume_aligned((expr), (alignment)) # if __has_builtin(__builtin_assume_aligned)
# else # define CGLM_HAVE_BUILTIN_ASSUME_ALIGNED 1
# define CGLM_ASSUME_ALIGNED(expr, alignment) (expr) # endif
# elif defined(__GNUC__) && defined(__GNUC_MINOR__)
# if __GNUC__ >= 4 && __GNUC_MINOR__ >= 7
# define CGLM_HAVE_BUILTIN_ASSUME_ALIGNED 1
# endif
# endif # endif
# ifndef CGLM_HAVE_BUILTIN_ASSUME_ALIGNED
# define CGLM_HAVE_BUILTIN_ASSUME_ALIGNED 0
# endif
#endif
#if CGLM_HAVE_BUILTIN_ASSUME_ALIGNED
# define CGLM_ASSUME_ALIGNED(expr, alignment) \
__builtin_assume_aligned((expr), (alignment))
#else #else
# define CGLM_ASSUME_ALIGNED(expr, alignment) (expr) # define CGLM_ASSUME_ALIGNED(expr, alignment) (expr)
#endif #endif
@@ -46,17 +60,23 @@
#define CGLM_CASTPTR_ASSUME_ALIGNED(expr, type) \ #define CGLM_CASTPTR_ASSUME_ALIGNED(expr, type) \
((type*)CGLM_ASSUME_ALIGNED((expr), __alignof__(type))) ((type*)CGLM_ASSUME_ALIGNED((expr), __alignof__(type)))
typedef int ivec2[2]; typedef int ivec2[2];
typedef int ivec3[3]; typedef int ivec3[3];
typedef int ivec4[4]; typedef int ivec4[4];
typedef float vec2[2]; typedef float vec2[2];
typedef float vec3[3]; typedef float vec3[3];
typedef CGLM_ALIGN_IF(16) float vec4[4]; typedef CGLM_ALIGN_IF(16) float vec4[4];
typedef vec4 versor; /* |x, y, z, w| -> w is the last */ typedef vec4 versor; /* |x, y, z, w| -> w is the last */
typedef vec3 mat3[3]; typedef vec3 mat3[3];
typedef vec2 mat3x2[3]; /* [col (3), row (2)] */
typedef vec4 mat3x4[3]; /* [col (3), row (4)] */
typedef CGLM_ALIGN_IF(16) vec2 mat2[2]; typedef CGLM_ALIGN_IF(16) vec2 mat2[2];
typedef vec3 mat2x3[2]; /* [col (2), row (3)] */
typedef vec4 mat2x4[2]; /* [col (2), row (4)] */
typedef CGLM_ALIGN_MAT vec4 mat4[4]; typedef CGLM_ALIGN_MAT vec4 mat4[4];
typedef vec2 mat4x2[4]; /* [col (4), row (2)] */
typedef vec3 mat4x3[4]; /* [col (4), row (3)] */
/* /*
Important: cglm stores quaternion as [x, y, z, w] in memory since v0.4.0 Important: cglm stores quaternion as [x, y, z, w] in memory since v0.4.0

View File

@@ -17,11 +17,19 @@ cglm_args = []
build_args = [] build_args = []
if get_option('default_library') == 'static' if get_option('default_library') == 'static'
cglm_args = '-DCGLM_STATIC' cglm_args += '-DCGLM_STATIC'
endif
if cc.compiles(
'int *test(char *p) { return (int*)__builtin_assume_aligned(p, 4); }',
name : '__builtin_assume_aligned test')
cglm_args += '-DCGLM_HAVE_BUILTIN_ASSUME_ALIGNED=1'
else
cglm_args += '-DCGLM_HAVE_BUILTIN_ASSUME_ALIGNED=0'
endif endif
if host_machine.system() == 'windows' if host_machine.system() == 'windows'
build_args = '-DCGLM_EXPORTS' build_args += '-DCGLM_EXPORTS'
endif endif
cglm_inc = include_directories('include') cglm_inc = include_directories('include')
@@ -39,8 +47,14 @@ cglm_src = files(
'src/vec4.c', 'src/vec4.c',
'src/ivec4.c', 'src/ivec4.c',
'src/mat2.c', 'src/mat2.c',
'src/mat2x3.c',
'src/mat2x4.c',
'src/mat3.c', 'src/mat3.c',
'src/mat3x2.c',
'src/mat3x4.c',
'src/mat4.c', 'src/mat4.c',
'src/mat4x2.c',
'src/mat4x3.c',
'src/plane.c', 'src/plane.c',
'src/frustum.c', 'src/frustum.c',
'src/box.c', 'src/box.c',

51
src/mat2x3.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#include "../include/cglm/cglm.h"
#include "../include/cglm/call.h"
CGLM_EXPORT
void
glmc_mat2x3_copy(mat2x3 mat, mat2x3 dest) {
glm_mat2x3_copy(mat, dest);
}
CGLM_EXPORT
void
glmc_mat2x3_zero(mat2x3 mat) {
glm_mat2x3_zero(mat);
}
CGLM_EXPORT
void
glmc_mat2x3_make(float * __restrict src, mat2x3 dest) {
glm_mat2x3_make(src, dest);
}
CGLM_EXPORT
void
glmc_mat2x3_mul(mat2x3 m1, mat3x2 m2, mat2 dest) {
glm_mat2x3_mul(m1, m2, dest);
}
CGLM_EXPORT
void
glmc_mat2x3_mulv(mat2x3 m, vec3 v, vec2 dest) {
glm_mat2x3_mulv(m, v, dest);
}
CGLM_EXPORT
void
glmc_mat2x3_transpose(mat2x3 m, mat3x2 dest) {
glm_mat2x3_transpose(m, dest);
}
CGLM_EXPORT
void
glmc_mat2x3_scale(mat2x3 m, float s) {
glm_mat2x3_scale(m, s);
}

51
src/mat2x4.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#include "../include/cglm/cglm.h"
#include "../include/cglm/call.h"
CGLM_EXPORT
void
glmc_mat2x4_copy(mat2x4 mat, mat2x4 dest) {
glm_mat2x4_copy(mat, dest);
}
CGLM_EXPORT
void
glmc_mat2x4_zero(mat2x4 mat) {
glm_mat2x4_zero(mat);
}
CGLM_EXPORT
void
glmc_mat2x4_make(float * __restrict src, mat2x4 dest) {
glm_mat2x4_make(src, dest);
}
CGLM_EXPORT
void
glmc_mat2x4_mul(mat2x4 m1, mat4x2 m2, mat2 dest) {
glm_mat2x4_mul(m1, m2, dest);
}
CGLM_EXPORT
void
glmc_mat2x4_mulv(mat2x4 m, vec4 v, vec2 dest) {
glm_mat2x4_mulv(m, v, dest);
}
CGLM_EXPORT
void
glmc_mat2x4_transpose(mat2x4 m, mat4x2 dest) {
glm_mat2x4_transpose(m, dest);
}
CGLM_EXPORT
void
glmc_mat2x4_scale(mat2x4 m, float s) {
glm_mat2x4_scale(m, s);
}

51
src/mat3x2.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#include "../include/cglm/cglm.h"
#include "../include/cglm/call.h"
CGLM_EXPORT
void
glmc_mat3x2_copy(mat3x2 mat, mat3x2 dest) {
glm_mat3x2_copy(mat, dest);
}
CGLM_EXPORT
void
glmc_mat3x2_zero(mat3x2 mat) {
glm_mat3x2_zero(mat);
}
CGLM_EXPORT
void
glmc_mat3x2_make(float * __restrict src, mat3x2 dest) {
glm_mat3x2_make(src, dest);
}
CGLM_EXPORT
void
glmc_mat3x2_mul(mat3x2 m1, mat2x3 m2, mat3 dest) {
glm_mat3x2_mul(m1, m2, dest);
}
CGLM_EXPORT
void
glmc_mat3x2_mulv(mat3x2 m, vec2 v, vec3 dest) {
glm_mat3x2_mulv(m, v, dest);
}
CGLM_EXPORT
void
glmc_mat3x2_transpose(mat3x2 m, mat2x3 dest) {
glm_mat3x2_transpose(m, dest);
}
CGLM_EXPORT
void
glmc_mat3x2_scale(mat3x2 m, float s) {
glm_mat3x2_scale(m, s);
}

51
src/mat3x4.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#include "../include/cglm/cglm.h"
#include "../include/cglm/call.h"
CGLM_EXPORT
void
glmc_mat3x4_copy(mat3x4 mat, mat3x4 dest) {
glm_mat3x4_copy(mat, dest);
}
CGLM_EXPORT
void
glmc_mat3x4_zero(mat3x4 mat) {
glm_mat3x4_zero(mat);
}
CGLM_EXPORT
void
glmc_mat3x4_make(float * __restrict src, mat3x4 dest) {
glm_mat3x4_make(src, dest);
}
CGLM_EXPORT
void
glmc_mat3x4_mul(mat3x4 m1, mat4x3 m2, mat3 dest) {
glm_mat3x4_mul(m1, m2, dest);
}
CGLM_EXPORT
void
glmc_mat3x4_mulv(mat3x4 m, vec4 v, vec3 dest) {
glm_mat3x4_mulv(m, v, dest);
}
CGLM_EXPORT
void
glmc_mat3x4_transpose(mat3x4 m, mat4x3 dest) {
glm_mat3x4_transpose(m, dest);
}
CGLM_EXPORT
void
glmc_mat3x4_scale(mat3x4 m, float s) {
glm_mat3x4_scale(m, s);
}

51
src/mat4x2.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#include "../include/cglm/cglm.h"
#include "../include/cglm/call.h"
CGLM_EXPORT
void
glmc_mat4x2_copy(mat4x2 mat, mat4x2 dest) {
glm_mat4x2_copy(mat, dest);
}
CGLM_EXPORT
void
glmc_mat4x2_zero(mat4x2 mat) {
glm_mat4x2_zero(mat);
}
CGLM_EXPORT
void
glmc_mat4x2_make(float * __restrict src, mat4x2 dest) {
glm_mat4x2_make(src, dest);
}
CGLM_EXPORT
void
glmc_mat4x2_mul(mat4x2 m1, mat2x4 m2, mat4 dest) {
glm_mat4x2_mul(m1, m2, dest);
}
CGLM_EXPORT
void
glmc_mat4x2_mulv(mat4x2 m, vec2 v, vec4 dest) {
glm_mat4x2_mulv(m, v, dest);
}
CGLM_EXPORT
void
glmc_mat4x2_transpose(mat4x2 m, mat2x4 dest) {
glm_mat4x2_transpose(m, dest);
}
CGLM_EXPORT
void
glmc_mat4x2_scale(mat4x2 m, float s) {
glm_mat4x2_scale(m, s);
}

51
src/mat4x3.c Normal file
View File

@@ -0,0 +1,51 @@
/*
* Copyright (c), Recep Aslantas.
*
* MIT License (MIT), http://opensource.org/licenses/MIT
* Full license can be found in the LICENSE file
*/
#include "../include/cglm/cglm.h"
#include "../include/cglm/call.h"
CGLM_EXPORT
void
glmc_mat4x3_copy(mat4x3 mat, mat4x3 dest) {
glm_mat4x3_copy(mat, dest);
}
CGLM_EXPORT
void
glmc_mat4x3_zero(mat4x3 mat) {
glm_mat4x3_zero(mat);
}
CGLM_EXPORT
void
glmc_mat4x3_make(float * __restrict src, mat4x3 dest) {
glm_mat4x3_make(src, dest);
}
CGLM_EXPORT
void
glmc_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat4 dest) {
glm_mat4x3_mul(m1, m2, dest);
}
CGLM_EXPORT
void
glmc_mat4x3_mulv(mat4x3 m, vec3 v, vec4 dest) {
glm_mat4x3_mulv(m, v, dest);
}
CGLM_EXPORT
void
glmc_mat4x3_transpose(mat4x3 m, mat3x4 dest) {
glm_mat4x3_transpose(m, dest);
}
CGLM_EXPORT
void
glmc_mat4x3_scale(mat4x3 m, float s) {
glm_mat4x3_scale(m, s);
}

View File

@@ -22,6 +22,40 @@ test_rand_mat4(mat4 dest) {
/* glm_scale(dest, (vec3){drand48(), drand48(), drand48()}); */ /* glm_scale(dest, (vec3){drand48(), drand48(), drand48()}); */
} }
void
test_rand_mat4x2(mat4x2 dest) {
dest[0][0] = drand48();
dest[0][1] = drand48();
dest[1][0] = drand48();
dest[1][1] = drand48();
dest[2][0] = drand48();
dest[2][1] = drand48();
dest[3][0] = drand48();
dest[3][1] = drand48();
}
void
test_rand_mat4x3(mat4x3 dest) {
dest[0][0] = drand48();
dest[0][1] = drand48();
dest[0][2] = drand48();
dest[1][0] = drand48();
dest[1][1] = drand48();
dest[1][2] = drand48();
dest[2][0] = drand48();
dest[2][1] = drand48();
dest[2][2] = drand48();
dest[3][0] = drand48();
dest[3][1] = drand48();
dest[3][2] = drand48();
}
void void
test_rand_mat3(mat3 dest) { test_rand_mat3(mat3 dest) {
mat4 m4; mat4 m4;
@@ -31,6 +65,34 @@ test_rand_mat3(mat3 dest) {
glm_mat4_pick3(m4, dest); glm_mat4_pick3(m4, dest);
} }
void
test_rand_mat3x2(mat3x2 dest) {
dest[0][0] = drand48();
dest[0][1] = drand48();
dest[1][0] = drand48();
dest[1][1] = drand48();
dest[2][0] = drand48();
dest[2][1] = drand48();
}
void
test_rand_mat3x4(mat3x4 dest) {
dest[0][0] = drand48();
dest[0][1] = drand48();
dest[0][2] = drand48();
dest[0][3] = drand48();
dest[1][0] = drand48();
dest[1][1] = drand48();
dest[1][2] = drand48();
dest[1][3] = drand48();
dest[2][0] = drand48();
dest[2][1] = drand48();
dest[2][2] = drand48();
dest[2][3] = drand48();
}
void void
test_rand_mat2(mat2 dest) { test_rand_mat2(mat2 dest) {
dest[0][0] = drand48(); dest[0][0] = drand48();
@@ -39,6 +101,28 @@ test_rand_mat2(mat2 dest) {
dest[1][1] = drand48(); dest[1][1] = drand48();
} }
void
test_rand_mat2x3(mat2x3 dest) {
dest[0][0] = drand48();
dest[0][1] = drand48();
dest[0][2] = drand48();
dest[1][0] = drand48();
dest[1][1] = drand48();
dest[1][2] = drand48();
}
void
test_rand_mat2x4(mat2x4 dest) {
dest[0][0] = drand48();
dest[0][1] = drand48();
dest[0][2] = drand48();
dest[0][3] = drand48();
dest[1][0] = drand48();
dest[1][1] = drand48();
dest[1][2] = drand48();
dest[1][3] = drand48();
}
void void
test_rand_vec3(vec3 dest) { test_rand_vec3(vec3 dest) {
dest[0] = drand48(); dest[0] = drand48();
@@ -174,6 +258,58 @@ test_assert_mat2_eq_zero(mat2 m2) {
TEST_SUCCESS 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_mat2x3_eq(mat2x3 m1, mat2x3 m2) {
int i, j;
for (i = 0; i < 2; i++) {
for (j = 0; j < 3; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009)
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat2x4_eq_zero(mat2x4 m2x4) {
int i, j;
for (i = 0; i < 2; i++) {
for (j = 0; j < 4; j++) {
ASSERT(test_eq(m2x4[i][j], 0.0f))
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat2x4_eq(mat2x4 m1, mat2x4 m2) {
int i, j;
for (i = 0; i < 2; i++) {
for (j = 0; j < 4; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009)
}
}
TEST_SUCCESS
}
test_status_t test_status_t
test_assert_mat3_eq(mat3 m1, mat3 m2) { test_assert_mat3_eq(mat3 m1, mat3 m2) {
int i, j; int i, j;
@@ -230,6 +366,58 @@ test_assert_mat3_eq_zero(mat3 m3) {
TEST_SUCCESS TEST_SUCCESS
} }
test_status_t
test_assert_mat3x2_eq_zero(mat3x2 m3x2) {
int i, j;
for (i = 0; i < 3; i++) {
for (j = 0; j < 2; j++) {
ASSERT(test_eq(m3x2[i][j], 0.0f))
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat3x2_eq(mat3x2 m1, mat3x2 m2) {
int i, j;
for (i = 0; i < 3; i++) {
for (j = 0; j < 2; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009)
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat3x4_eq_zero(mat3x4 m3x4) {
int i, j;
for (i = 0; i < 3; i++) {
for (j = 0; j < 4; j++) {
ASSERT(test_eq(m3x4[i][j], 0.0f))
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat3x4_eq(mat3x4 m1, mat3x4 m2) {
int i, j;
for (i = 0; i < 3; i++) {
for (j = 0; j < 4; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009)
}
}
TEST_SUCCESS
}
test_status_t test_status_t
test_assert_mat4_eq_identity(mat4 m4) { test_assert_mat4_eq_identity(mat4 m4) {
int i, j; int i, j;
@@ -260,6 +448,58 @@ test_assert_mat4_eq_zero(mat4 m4) {
TEST_SUCCESS TEST_SUCCESS
} }
test_status_t
test_assert_mat4x2_eq_zero(mat4x2 m4x2) {
int i, j;
for (i = 0; i < 4; i++) {
for (j = 0; j < 2; j++) {
ASSERT(test_eq(m4x2[i][j], 0.0f))
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat4x2_eq(mat4x2 m1, mat4x2 m2) {
int i, j;
for (i = 0; i < 4; i++) {
for (j = 0; j < 2; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009)
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat4x3_eq_zero(mat4x3 m4x3) {
int i, j;
for (i = 0; i < 4; i++) {
for (j = 0; j < 3; j++) {
ASSERT(test_eq(m4x3[i][j], 0.0f))
}
}
TEST_SUCCESS
}
test_status_t
test_assert_mat4x3_eq(mat4x3 m1, mat4x3 m2) {
int i, j;
for (i = 0; i < 4; i++) {
for (j = 0; j < 3; j++) {
ASSERT(fabsf(m1[i][j] - m2[i][j]) <= 0.0000009)
}
}
TEST_SUCCESS
}
test_status_t test_status_t
test_assert_eqf(float a, float b) { test_assert_eqf(float a, float b) {
ASSERT(fabsf(a - b) <= 0.000009); /* rounding errors */ ASSERT(fabsf(a - b) <= 0.000009); /* rounding errors */

View File

@@ -17,12 +17,30 @@
void void
test_rand_mat4(mat4 dest); test_rand_mat4(mat4 dest);
void
test_rand_mat4x2(mat4x2 dest);
void
test_rand_mat4x3(mat4x3 dest);
void void
test_rand_mat3(mat3 dest); test_rand_mat3(mat3 dest);
void
test_rand_mat3x2(mat3x2 dest);
void
test_rand_mat3x4(mat3x4 dest);
void void
test_rand_mat2(mat2 dest); test_rand_mat2(mat2 dest);
void
test_rand_mat2x3(mat2x3 dest);
void
test_rand_mat2x4(mat2x4 dest);
test_status_t test_status_t
test_assert_eqf(float a, float b); test_assert_eqf(float a, float b);
@@ -41,6 +59,18 @@ test_assert_mat4_eq_identity(mat4 m4);
test_status_t test_status_t
test_assert_mat4_eq_zero(mat4 m4); test_assert_mat4_eq_zero(mat4 m4);
test_status_t
test_assert_mat4x2_eq_zero(mat4x2 m4x2);
test_status_t
test_assert_mat4x2_eq(mat4x2 m1, mat4x2 m2);
test_status_t
test_assert_mat4x3_eq_zero(mat4x3 m4x3);
test_status_t
test_assert_mat4x3_eq(mat4x3 m1, mat4x3 m2);
test_status_t test_status_t
test_assert_mat2_eqt(mat2 m1, mat2 m2); test_assert_mat2_eqt(mat2 m1, mat2 m2);
@@ -53,6 +83,18 @@ test_assert_mat2_eq_identity(mat2 m2);
test_status_t test_status_t
test_assert_mat2_eq_zero(mat2 m2); test_assert_mat2_eq_zero(mat2 m2);
test_status_t
test_assert_mat2x3_eq_zero(mat2x3 m2x3);
test_status_t
test_assert_mat2x3_eq(mat2x3 m1, mat2x3 m2);
test_status_t
test_assert_mat2x4_eq_zero(mat2x4 m2x4);
test_status_t
test_assert_mat2x4_eq(mat2x4 m1, mat2x4 m2);
test_status_t test_status_t
test_assert_mat3_eq(mat3 m1, mat3 m2); test_assert_mat3_eq(mat3 m1, mat3 m2);
@@ -68,6 +110,18 @@ test_assert_mat3_eq_identity(mat3 m3);
test_status_t test_status_t
test_assert_mat3_eq_zero(mat3 m3); test_assert_mat3_eq_zero(mat3 m3);
test_status_t
test_assert_mat3x2_eq_zero(mat3x2 m3x2);
test_status_t
test_assert_mat3x2_eq(mat3x2 m1, mat3x2 m2);
test_status_t
test_assert_mat3x4_eq_zero(mat3x4 m3x4);
test_status_t
test_assert_mat3x4_eq(mat3x4 m1, mat3x4 m2);
test_status_t test_status_t
test_assert_vec3_eq(vec3 v1, vec3 v2); test_assert_vec3_eq(vec3 v1, vec3 v2);

156
test/src/test_mat2x3.h Normal file
View File

@@ -0,0 +1,156 @@
/*
* 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"
#define A_MATRIX2X3 {{1,2,3},{5,6,7}}
#define A_MATRIX2X3_TRANSPOSE {{1,5}, {2,6}, {3,7}}
#ifndef CGLM_TEST_MAT2X3_ONCE
#define CGLM_TEST_MAT2X3_ONCE
TEST_IMPL(MACRO_GLM_MAT2X3_ZERO_INIT) {
mat2x3 mat2x3_zero = GLM_MAT2X3_ZERO_INIT;
test_assert_mat2x3_eq_zero(mat2x3_zero);
TEST_SUCCESS
}
TEST_IMPL(MACRO_GLM_MAT2X3_ZERO) {
mat2x3 mat2x3_zero = GLM_MAT2X3_ZERO;
test_assert_mat2x3_eq_zero(mat2x3_zero);
TEST_SUCCESS
}
#endif /* CGLM_TEST_MAT2X3_ONCE */
TEST_IMPL(GLM_PREFIX, mat2x3_copy) {
mat2x3 m1 = A_MATRIX2X3;
mat2x3 m2 = GLM_MAT2X3_ZERO_INIT;
GLM(mat2x3_copy)(m1, m2);
test_assert_mat2x3_eq(m1, m2);
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x3_zero) {
mat2x3 m1 = GLM_MAT2X3_ZERO_INIT;
mat2x3 m2 = GLM_MAT2X3_ZERO_INIT;
mat2x3 m3;
GLM(mat2x3_zero)(m3);
ASSERTIFY(test_assert_mat2x3_eq_zero(m1))
ASSERTIFY(test_assert_mat2x3_eq_zero(m2))
ASSERTIFY(test_assert_mat2x3_eq_zero(m3))
TEST_SUCCESS
}
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
}
TEST_IMPL(GLM_PREFIX, mat2x3_mul) {
mat2x3 m1 = GLM_MAT2X3_ZERO_INIT;
mat3x2 m2 = GLM_MAT3X2_ZERO_INIT;
mat2 m3 = GLM_MAT2_ZERO_INIT;
mat2 m4 = GLM_MAT2_ZERO_INIT;
int i, j, k;
/* test random matrices */
/* random matrices */
test_rand_mat2x3(m1);
test_rand_mat3x2(m2);
for (i = 0; i < 2; i++) {
for (j = 0; j < 2; j++) {
for (k = 0; k < 3; k++) {
m4[i][j] += m1[i][k] * m2[k][j];
}
}
}
GLM(mat2x3_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat2_eq(m3, m4))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x3_mulv) {
mat2x3 mat = A_MATRIX2X3;
vec3 v = {11.0f, 21.0f, 31.0f};
int i;
vec2 dest;
float res = 0.0;
GLM(mat2x3_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];
ASSERT(test_eq(dest[i], res))
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x3_transpose) {
mat2x3 m1 = A_MATRIX2X3;
mat3x2 m2;
mat3x2 m3 = A_MATRIX2X3_TRANSPOSE;
GLM(mat2x3_transpose)(m1, m2);
ASSERTIFY(test_assert_mat3x2_eq(m2, m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x3_scale) {
mat2x3 m1 = A_MATRIX2X3;
mat2x3 m2 = A_MATRIX2X3;
int i, j, scale;
scale = rand() % 100;
GLM(mat2x3_scale)(m1, (float) scale);
for (i = 0; i < 2; i++) {
for (j = 0; j < 3; j++) {
ASSERT(test_eq(m1[i][j], m2[i][j] * scale))
}
}
TEST_SUCCESS
}

159
test/src/test_mat2x4.h Normal file
View File

@@ -0,0 +1,159 @@
/*
* 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"
#define A_MATRIX2X4 {{1,2,3,4},{5,6,7,8}}
#define A_MATRIX2X4_TRANSPOSE {{1,5}, {2,6}, {3,7}, {4,8}}
#ifndef CGLM_TEST_MAT2X4_ONCE
#define CGLM_TEST_MAT2X4_ONCE
TEST_IMPL(MACRO_GLM_MAT2X4_ZERO_INIT) {
mat2x4 mat2x4_zero = GLM_MAT2X4_ZERO_INIT;
test_assert_mat2x4_eq_zero(mat2x4_zero);
TEST_SUCCESS
}
TEST_IMPL(MACRO_GLM_MAT2X4_ZERO) {
mat2x4 mat2x4_zero = GLM_MAT2X4_ZERO;
test_assert_mat2x4_eq_zero(mat2x4_zero);
TEST_SUCCESS
}
#endif /* CGLM_TEST_MAT2X4_ONCE */
TEST_IMPL(GLM_PREFIX, mat2x4_copy) {
mat2x4 m1 = A_MATRIX2X4;
mat2x4 m2 = GLM_MAT2X4_ZERO_INIT;
GLM(mat2x4_copy)(m1, m2);
test_assert_mat2x4_eq(m1, m2);
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x4_zero) {
mat2x4 m1 = GLM_MAT2X4_ZERO_INIT;
mat2x4 m2 = GLM_MAT2X4_ZERO_INIT;
mat2x4 m3;
GLM(mat2x4_zero)(m3);
ASSERTIFY(test_assert_mat2x4_eq_zero(m1))
ASSERTIFY(test_assert_mat2x4_eq_zero(m2))
ASSERTIFY(test_assert_mat2x4_eq_zero(m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x4_make) {
float src[24] = {
0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f, 77.3f, 88.4f,
2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f, 90.3f, 34.2f,
5.3f, 4.8f, 96.3f, 13.7f, 4.7f, 5.5f, 22.9f, 5.5f
};
mat2x4 dest[3];
float *srcp = src;
unsigned int i, j, k;
for (i = 0, j = 0, k = 0; i < sizeof(src) / sizeof(float); i+=8,j++) {
GLM(mat2x4_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][3]));
ASSERT(test_eq(src[i+4], dest[j][k+1][0]));
ASSERT(test_eq(src[i+5], dest[j][k+1][1]));
ASSERT(test_eq(src[i+6], dest[j][k+1][2]));
ASSERT(test_eq(src[i+7], dest[j][k+1][3]));
}
TEST_SUCCESS
}
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;
int i, j, 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];
}
}
}
GLM(mat2x4_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat2_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};
int i;
vec2 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];
ASSERT(test_eq(dest[i], res))
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x4_transpose) {
mat2x4 m1 = A_MATRIX2X4;
mat4x2 m2;
mat4x2 m3 = A_MATRIX2X4_TRANSPOSE;
GLM(mat2x4_transpose)(m1, m2);
ASSERTIFY(test_assert_mat4x2_eq(m2, m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat2x4_scale) {
mat2x4 m1 = A_MATRIX2X4;
mat2x4 m2 = A_MATRIX2X4;
int i, j, scale;
scale = rand() % 100;
GLM(mat2x4_scale)(m1, (float) scale);
for (i = 0; i < 2; i++) {
for (j = 0; j < 4; j++) {
ASSERT(test_eq(m1[i][j], m2[i][j] * scale))
}
}
TEST_SUCCESS
}

155
test/src/test_mat3x2.h Normal file
View File

@@ -0,0 +1,155 @@
/*
* 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"
#define A_MATRIX3X2 {{1,2},{5,6},{3,7}}
#define A_MATRIX3X2_TRANSPOSE {{1,5,3}, {2,6,7}}
#ifndef CGLM_TEST_MAT3X2_ONCE
#define CGLM_TEST_MAT3X2_ONCE
TEST_IMPL(MACRO_GLM_MAT3X2_ZERO_INIT) {
mat3x2 mat3x2_zero = GLM_MAT3X2_ZERO_INIT;
test_assert_mat3x2_eq_zero(mat3x2_zero);
TEST_SUCCESS
}
TEST_IMPL(MACRO_GLM_MAT3X2_ZERO) {
mat3x2 mat3x2_zero = GLM_MAT3X2_ZERO;
test_assert_mat3x2_eq_zero(mat3x2_zero);
TEST_SUCCESS
}
#endif /* CGLM_TEST_MAT3X2_ONCE */
TEST_IMPL(GLM_PREFIX, mat3x2_copy) {
mat3x2 m1 = A_MATRIX3X2;
mat3x2 m2 = GLM_MAT3X2_ZERO_INIT;
GLM(mat3x2_copy)(m1, m2);
test_assert_mat3x2_eq(m1, m2);
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x2_zero) {
mat3x2 m1 = GLM_MAT3X2_ZERO_INIT;
mat3x2 m2 = GLM_MAT3X2_ZERO_INIT;
mat3x2 m3;
GLM(mat3x2_zero)(m3);
ASSERTIFY(test_assert_mat3x2_eq_zero(m1))
ASSERTIFY(test_assert_mat3x2_eq_zero(m2))
ASSERTIFY(test_assert_mat3x2_eq_zero(m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x2_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
};
mat3x2 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(mat3x2_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+1][0]));
ASSERT(test_eq(src[i+3], dest[j][k+1][1]));
ASSERT(test_eq(src[i+4], dest[j][k+2][0]));
ASSERT(test_eq(src[i+5], dest[j][k+2][1]));
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x2_mul) {
mat3x2 m1 = GLM_MAT3X2_ZERO_INIT;
mat2x3 m2 = GLM_MAT2X3_ZERO_INIT;
mat3 m3 = GLM_MAT3_ZERO_INIT;
mat3 m4 = GLM_MAT3_ZERO_INIT;
int i, j, k;
test_rand_mat3x2(m1);
test_rand_mat2x3(m2);
for (i = 0; i < 3; i++) {
for (j = 0; j < 3; j++) {
for (k = 0; k < 2; k++) {
m4[i][j] += m1[i][k] * m2[k][j];
}
}
}
GLM(mat3x2_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat3_eq(m3, m4))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x2_mulv) {
mat3x2 mat = A_MATRIX3X2;
vec2 v = {11.0f, 21.0f};
int i;
vec3 dest;
float res = 0.0;
GLM(mat3x2_mulv)(mat, v, dest);
for (i = 0; i < 3; i++) {
res = mat[i][0] * v[0] + mat[i][1] * v[1];
ASSERT(test_eq(dest[i], res))
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x2_transpose) {
mat3x2 m1 = A_MATRIX3X2;
mat2x3 m2;
mat2x3 m3 = A_MATRIX3X2_TRANSPOSE;
GLM(mat3x2_transpose)(m1, m2);
ASSERTIFY(test_assert_mat2x3_eq(m2, m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x2_scale) {
mat3x2 m1 = A_MATRIX3X2;
mat3x2 m2 = A_MATRIX3X2;
int i, j, scale;
scale = rand() % 100;
GLM(mat3x2_scale)(m1, (float) scale);
for (i = 0; i < 3; i++) {
for (j = 0; j < 2; j++) {
ASSERT(test_eq(m1[i][j], m2[i][j] * scale))
}
}
TEST_SUCCESS
}

161
test/src/test_mat3x4.h Normal file
View File

@@ -0,0 +1,161 @@
/*
* 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"
#define A_MATRIX3X4 {{1,2,4,5},{6,7,8,9},{10,11,12,13}}
#define A_MATRIX3X4_TRANSPOSE {{1,6,10}, {2,7,1}, {4,8,12}, {5,9,13}}
#ifndef CGLM_TEST_MAT3X4_ONCE
#define CGLM_TEST_MAT3X4_ONCE
TEST_IMPL(MACRO_GLM_MAT3X4_ZERO_INIT) {
mat3x4 mat3x4_zero = GLM_MAT3X4_ZERO_INIT;
test_assert_mat3x4_eq_zero(mat3x4_zero);
TEST_SUCCESS
}
TEST_IMPL(MACRO_GLM_MAT3X4_ZERO) {
mat3x4 mat3x4_zero = GLM_MAT3X4_ZERO;
test_assert_mat3x4_eq_zero(mat3x4_zero);
TEST_SUCCESS
}
#endif /* CGLM_TEST_MAT3X4_ONCE */
TEST_IMPL(GLM_PREFIX, mat3x4_copy) {
mat3x4 m1 = A_MATRIX3X4;
mat3x4 m2 = GLM_MAT3X4_ZERO_INIT;
GLM(mat3x4_copy)(m1, m2);
test_assert_mat3x4_eq(m1, m2);
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x4_zero) {
mat3x4 m1 = GLM_MAT3X4_ZERO_INIT;
mat3x4 m2 = GLM_MAT3X4_ZERO_INIT;
mat3x4 m3;
GLM(mat3x4_zero)(m3);
ASSERTIFY(test_assert_mat3x4_eq_zero(m1))
ASSERTIFY(test_assert_mat3x4_eq_zero(m2))
ASSERTIFY(test_assert_mat3x4_eq_zero(m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x4_make) {
float src[36] = {
0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f, 2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f,
2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f, 0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f,
5.3f, 4.8f, 96.3f, 13.7f, 4.7f, 5.5f, 2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f
};
mat3x4 dest[3];
float *srcp = src;
unsigned int i, j, k;
for (i = 0, j = 0, k = 0; i < sizeof(src) / sizeof(float); i+=12,j++) {
GLM(mat3x4_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][3]));
ASSERT(test_eq(src[i+4], dest[j][k+1][0]));
ASSERT(test_eq(src[i+5], dest[j][k+1][1]));
ASSERT(test_eq(src[i+6], dest[j][k+1][2]));
ASSERT(test_eq(src[i+7], dest[j][k+1][3]));
ASSERT(test_eq(src[i+8], dest[j][k+2][0]));
ASSERT(test_eq(src[i+9], dest[j][k+2][1]));
ASSERT(test_eq(src[i+10], dest[j][k+2][2]));
ASSERT(test_eq(src[i+11], dest[j][k+2][3]));
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x4_mul) {
mat3x4 m1 = GLM_MAT3X4_ZERO_INIT;
mat4x3 m2 = GLM_MAT4X3_ZERO_INIT;
mat3 m3 = GLM_MAT3_ZERO_INIT;
mat3 m4 = GLM_MAT3_ZERO_INIT;
int i, j, k;
test_rand_mat3x4(m1);
test_rand_mat4x3(m2);
for (i = 0; i < 3; i++) {
for (j = 0; j < 3; j++) {
for (k = 0; k < 4; k++) {
m4[i][j] += m1[i][k] * m2[k][j];
}
}
}
GLM(mat3x4_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat3_eq(m3, m4))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x4_mulv) {
mat3x4 mat = A_MATRIX3X4;
vec4 v = {11.0f, 21.0f, 31.0f, 41.0f};
int i;
vec3 dest;
float res = 0.0;
GLM(mat3x4_mulv)(mat, v, dest);
for (i = 0; i < 3; i++) {
res = mat[i][0] * v[0] + mat[i][1] * v[1] + mat[i][2] * v[2];
ASSERT(test_eq(dest[i], res))
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x4_transpose) {
mat3x4 m1 = A_MATRIX3X4;
mat4x3 m2;
mat4x3 m3 = A_MATRIX3X2_TRANSPOSE;
GLM(mat3x4_transpose)(m1, m2);
ASSERTIFY(test_assert_mat4x3_eq(m2, m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat3x4_scale) {
mat3x4 m1 = A_MATRIX3X4;
mat3x4 m2 = A_MATRIX3X4;
int i, j, scale;
scale = rand() % 100;
GLM(mat3x4_scale)(m1, (float) scale);
for (i = 0; i < 3; i++) {
for (j = 0; j < 4; j++) {
ASSERT(test_eq(m1[i][j], m2[i][j] * scale))
}
}
TEST_SUCCESS
}

158
test/src/test_mat4x2.h Normal file
View File

@@ -0,0 +1,158 @@
/*
* 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"
#define A_MATRIX4X2 {{1,2},{3,4},{5,6},{7,8}}
#define A_MATRIX4X2_TRANSPOSE {{1,3,5,7}, {2,4,6,8}}
#ifndef CGLM_TEST_MAT4X2_ONCE
#define CGLM_TEST_MAT4X2_ONCE
TEST_IMPL(MACRO_GLM_MAT4X2_ZERO_INIT) {
mat4x2 mat4x2_zero = GLM_MAT4X2_ZERO_INIT;
test_assert_mat4x2_eq_zero(mat4x2_zero);
TEST_SUCCESS
}
TEST_IMPL(MACRO_GLM_MAT4X2_ZERO) {
mat4x2 mat4x2_zero = GLM_MAT4X2_ZERO;
test_assert_mat4x2_eq_zero(mat4x2_zero);
TEST_SUCCESS
}
#endif /* CGLM_TEST_MAT4X2_ONCE */
TEST_IMPL(GLM_PREFIX, mat4x2_copy) {
mat4x2 m1 = A_MATRIX4X2;
mat4x2 m2 = GLM_MAT4X2_ZERO_INIT;
GLM(mat4x2_copy)(m1, m2);
test_assert_mat4x2_eq(m1, m2);
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x2_zero) {
mat4x2 m1 = GLM_MAT4X2_ZERO_INIT;
mat4x2 m2 = GLM_MAT4X2_ZERO_INIT;
mat4x2 m3;
GLM(mat4x2_zero)(m3);
ASSERTIFY(test_assert_mat4x2_eq_zero(m1))
ASSERTIFY(test_assert_mat4x2_eq_zero(m2))
ASSERTIFY(test_assert_mat4x2_eq_zero(m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x2_make) {
float src[24] = {
0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f, 2.3f, 4.2f,
2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f, 0.5f, 1.7f,
5.3f, 4.8f, 96.3f, 13.7f, 4.7f, 5.5f, 2.3f, 4.2f
};
mat4x2 dest[3];
float *srcp = src;
unsigned int i, j, k;
for (i = 0, j = 0, k = 0; i < sizeof(src) / sizeof(float); i+=8,j++) {
GLM(mat4x2_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+1][0]));
ASSERT(test_eq(src[i+3], dest[j][k+1][1]));
ASSERT(test_eq(src[i+4], dest[j][k+2][0]));
ASSERT(test_eq(src[i+5], dest[j][k+2][1]));
ASSERT(test_eq(src[i+6], dest[j][k+3][0]));
ASSERT(test_eq(src[i+7], dest[j][k+3][1]));
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x2_mul) {
mat4x2 m1 = GLM_MAT4X2_ZERO_INIT;
mat2x4 m2 = GLM_MAT2X4_ZERO_INIT;
mat4 m3 = GLM_MAT4_ZERO_INIT;
mat4 m4 = GLM_MAT4_ZERO_INIT;
int i, j, k;
test_rand_mat4x2(m1);
test_rand_mat2x4(m2);
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
for (k = 0; k < 2; k++) {
m4[i][j] += m1[i][k] * m2[k][j];
}
}
}
GLM(mat4x2_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat4_eq(m3, m4))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x2_mulv) {
mat4x2 mat = A_MATRIX4X2;
vec2 v = {11.0f, 21.0f};
int i;
vec4 dest;
float res = 0.0;
GLM(mat4x2_mulv)(mat, v, dest);
for (i = 0; i < 4; i++) {
res = mat[i][0] * v[0] + mat[i][1] * v[1];
ASSERT(test_eq(dest[i], res))
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x2_transpose) {
mat4x2 m1 = A_MATRIX4X2;
mat2x4 m2;
mat2x4 m3 = A_MATRIX4X2_TRANSPOSE;
GLM(mat4x2_transpose)(m1, m2);
ASSERTIFY(test_assert_mat2x4_eq(m2, m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x2_scale) {
mat4x2 m1 = A_MATRIX4X2;
mat4x2 m2 = A_MATRIX4X2;
int i, j, scale;
scale = rand() % 100;
GLM(mat4x2_scale)(m1, (float) scale);
for (i = 0; i < 4; i++) {
for (j = 0; j < 2; j++) {
ASSERT(test_eq(m1[i][j], m2[i][j] * scale))
}
}
TEST_SUCCESS
}

162
test/src/test_mat4x3.h Normal file
View File

@@ -0,0 +1,162 @@
/*
* 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"
#define A_MATRIX4X3 {{1,2,3},{4,5,6},{7,8,9},{10,11,12}}
#define A_MATRIX4X3_TRANSPOSE {{1,4,7,10},{2,5,8,11},{3,6,9,12}}
#ifndef CGLM_TEST_MAT4X3_ONCE
#define CGLM_TEST_MAT4X3_ONCE
TEST_IMPL(MACRO_GLM_MAT4X3_ZERO_INIT) {
mat4x3 mat4x3_zero = GLM_MAT4X3_ZERO_INIT;
test_assert_mat4x3_eq_zero(mat4x3_zero);
TEST_SUCCESS
}
TEST_IMPL(MACRO_GLM_MAT4X3_ZERO) {
mat4x3 mat4x3_zero = GLM_MAT4X3_ZERO;
test_assert_mat4x3_eq_zero(mat4x3_zero);
TEST_SUCCESS
}
#endif /* CGLM_TEST_MAT4X3_ONCE */
TEST_IMPL(GLM_PREFIX, mat4x3_copy) {
mat4x3 m1 = A_MATRIX4X3;
mat4x3 m2 = GLM_MAT4X3_ZERO_INIT;
GLM(mat4x3_copy)(m1, m2);
test_assert_mat4x3_eq(m1, m2);
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x3_zero) {
mat4x3 m1 = GLM_MAT4X3_ZERO_INIT;
mat4x3 m2 = GLM_MAT4X3_ZERO_INIT;
mat4x3 m3;
GLM(mat4x3_zero)(m3);
ASSERTIFY(test_assert_mat4x3_eq_zero(m1))
ASSERTIFY(test_assert_mat4x3_eq_zero(m2))
ASSERTIFY(test_assert_mat4x3_eq_zero(m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x3_make) {
float src[36] = {
0.5f, 1.7f, 10.3f, 4.2f, 8.9f, 1.1f, 2.3f, 4.2f, 5.3f, 4.8f, 96.3f, 13.7f,
4.7f, 5.5f, 2.3f, 4.2f, 2.3f, 4.2f, 66.5f, 23.7f, 6.6f, 8.9f, 0.5f, 1.7f,
5.3f, 4.8f, 96.3f, 13.7f, 4.7f, 5.5f, 2.3f, 4.2f, 0.5f, 1.7f, 10.3f, 4.2f
};
mat4x3 dest[3];
float *srcp = src;
unsigned int i, j, k;
for (i = 0, j = 0, k = 0; i < sizeof(src) / sizeof(float); i+=12,j++) {
GLM(mat4x3_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]));
ASSERT(test_eq(src[i+6], dest[j][k+2][0]));
ASSERT(test_eq(src[i+7], dest[j][k+2][1]));
ASSERT(test_eq(src[i+8], dest[j][k+2][2]));
ASSERT(test_eq(src[i+9], dest[j][k+3][0]));
ASSERT(test_eq(src[i+10], dest[j][k+3][1]));
ASSERT(test_eq(src[i+11], dest[j][k+3][2]));
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x3_mul) {
mat4x3 m1 = GLM_MAT4X3_ZERO_INIT;
mat3x4 m2 = GLM_MAT3X4_ZERO_INIT;
mat4 m3 = GLM_MAT4_ZERO_INIT;
mat4 m4 = GLM_MAT4_ZERO_INIT;
int i, j, k;
test_rand_mat4x3(m1);
test_rand_mat3x4(m2);
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
for (k = 0; k < 3; k++) {
m4[i][j] += m1[i][k] * m2[k][j];
}
}
}
GLM(mat4x3_mul)(m1, m2, m3);
ASSERTIFY(test_assert_mat4_eq(m3, m4))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x3_mulv) {
mat4x3 mat = A_MATRIX4X3;
vec3 v = {11.0f, 21.0f, 31.0f};
int i;
vec4 dest;
float res = 0.0;
GLM(mat4x3_mulv)(mat, v, dest);
for (i = 0; i < 4; i++) {
res = mat[i][0] * v[0] + mat[i][1] * v[1] + mat[i][2] * v[2];
ASSERT(test_eq(dest[i], res))
}
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x3_transpose) {
mat4x3 m1 = A_MATRIX4X3;
mat3x4 m2;
mat3x4 m3 = A_MATRIX4X3_TRANSPOSE;
GLM(mat4x3_transpose)(m1, m2);
ASSERTIFY(test_assert_mat3x4_eq(m2, m3))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, mat4x3_scale) {
mat4x3 m1 = A_MATRIX4X3;
mat4x3 m2 = A_MATRIX4X3;
int i, j, scale;
scale = rand() % 100;
GLM(mat4x3_scale)(m1, (float) scale);
for (i = 0; i < 4; i++) {
for (j = 0; j < 3; j++) {
ASSERT(test_eq(m1[i][j], m2[i][j] * scale))
}
}
TEST_SUCCESS
}

View File

@@ -7,6 +7,30 @@
#include "test_common.h" #include "test_common.h"
TEST_IMPL(mat2x3s_zero_init) {
mat2x3s mat2x3_zero = GLMS_MAT2X3_ZERO_INIT;
test_assert_mat2x3_eq_zero(mat2x3_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat2x3s_zero) {
mat2x3s mat2x3_zero = GLMS_MAT2X3_ZERO;
test_assert_mat2x3_eq_zero(mat2x3_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat2x4s_zero_init) {
mat2x4s mat2x4_zero = GLMS_MAT2X4_ZERO_INIT;
test_assert_mat2x4_eq_zero(mat2x4_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat2x4s_zero) {
mat2x4s mat2x4_zero = GLMS_MAT2X4_ZERO;
test_assert_mat2x4_eq_zero(mat2x4_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat3s_identity_init) { TEST_IMPL(mat3s_identity_init) {
mat3s mat3_identity = GLMS_MAT3_IDENTITY_INIT; mat3s mat3_identity = GLMS_MAT3_IDENTITY_INIT;
mat3 mat3_identity_a = GLM_MAT3_IDENTITY_INIT; mat3 mat3_identity_a = GLM_MAT3_IDENTITY_INIT;
@@ -21,6 +45,30 @@ TEST_IMPL(mat3s_zero_init) {
TEST_SUCCESS TEST_SUCCESS
} }
TEST_IMPL(mat3x2s_zero_init) {
mat3x2s mat3x2_zero = GLMS_MAT3X2_ZERO_INIT;
test_assert_mat3x2_eq_zero(mat3x2_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat3x2s_zero) {
mat3x2s mat3x2_zero = GLMS_MAT3X2_ZERO;
test_assert_mat3x2_eq_zero(mat3x2_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat3x4s_zero_init) {
mat3x4s mat3x4_zero = GLMS_MAT3X4_ZERO_INIT;
test_assert_mat3x4_eq_zero(mat3x4_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat3x4s_zero) {
mat3x4s mat3x4_zero = GLMS_MAT3X4_ZERO;
test_assert_mat3x4_eq_zero(mat3x4_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat4s_identity_init) { TEST_IMPL(mat4s_identity_init) {
mat4s mat4_identity = GLMS_MAT4_IDENTITY_INIT; mat4s mat4_identity = GLMS_MAT4_IDENTITY_INIT;
mat4 mat4_identity_a = GLM_MAT4_IDENTITY_INIT; mat4 mat4_identity_a = GLM_MAT4_IDENTITY_INIT;
@@ -35,6 +83,30 @@ TEST_IMPL(mat4s_zero_init) {
TEST_SUCCESS TEST_SUCCESS
} }
TEST_IMPL(mat4x2s_zero_init) {
mat4x2s mat4x2_zero = GLMS_MAT4X2_ZERO_INIT;
test_assert_mat4x2_eq_zero(mat4x2_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat4x2s_zero) {
mat4x2s mat4x2_zero = GLMS_MAT4X2_ZERO;
test_assert_mat4x2_eq_zero(mat4x2_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat4x3s_zero_init) {
mat4x3s mat4x3_zero = GLMS_MAT4X3_ZERO_INIT;
test_assert_mat4x3_eq_zero(mat4x3_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(mat4x3s_zero) {
mat4x3s mat4x3_zero = GLMS_MAT4X3_ZERO;
test_assert_mat4x3_eq_zero(mat4x3_zero.raw);
TEST_SUCCESS
}
TEST_IMPL(quats_zero_init) { TEST_IMPL(quats_zero_init) {
versors quat_zero = GLMS_QUAT_IDENTITY_INIT; versors quat_zero = GLMS_QUAT_IDENTITY_INIT;
versor quat_zero_a = GLM_QUAT_IDENTITY_INIT; versor quat_zero_a = GLM_QUAT_IDENTITY_INIT;

View File

@@ -19,8 +19,14 @@
#include "test_ivec3.h" #include "test_ivec3.h"
#include "test_ivec4.h" #include "test_ivec4.h"
#include "test_mat2.h" #include "test_mat2.h"
#include "test_mat2x3.h"
#include "test_mat2x4.h"
#include "test_mat3.h" #include "test_mat3.h"
#include "test_mat3x2.h"
#include "test_mat3x4.h"
#include "test_mat4.h" #include "test_mat4.h"
#include "test_mat4x2.h"
#include "test_mat4x3.h"
#include "test_quat.h" #include "test_quat.h"
#include "test_project.h" #include "test_project.h"
#include "test_plane.h" #include "test_plane.h"
@@ -50,8 +56,14 @@
#include "test_ivec3.h" #include "test_ivec3.h"
#include "test_ivec4.h" #include "test_ivec4.h"
#include "test_mat2.h" #include "test_mat2.h"
#include "test_mat2x3.h"
#include "test_mat2x4.h"
#include "test_mat3.h" #include "test_mat3.h"
#include "test_mat3x2.h"
#include "test_mat3x4.h"
#include "test_mat4.h" #include "test_mat4.h"
#include "test_mat4x2.h"
#include "test_mat4x3.h"
#include "test_quat.h" #include "test_quat.h"
#include "test_project.h" #include "test_project.h"
#include "test_plane.h" #include "test_plane.h"

View File

@@ -153,6 +153,42 @@ TEST_DECLARE(glmc_mat4_swap_row)
TEST_DECLARE(glmc_mat4_rmc) TEST_DECLARE(glmc_mat4_rmc)
TEST_DECLARE(glmc_mat4_make) TEST_DECLARE(glmc_mat4_make)
TEST_DECLARE(MACRO_GLM_MAT4X2_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT4X2_ZERO)
TEST_DECLARE(glm_mat4x2_copy)
TEST_DECLARE(glm_mat4x2_zero)
TEST_DECLARE(glm_mat4x2_make)
TEST_DECLARE(glm_mat4x2_mul)
TEST_DECLARE(glm_mat4x2_mulv)
TEST_DECLARE(glm_mat4x2_transpose)
TEST_DECLARE(glm_mat4x2_scale)
TEST_DECLARE(glmc_mat4x2_copy)
TEST_DECLARE(glmc_mat4x2_zero)
TEST_DECLARE(glmc_mat4x2_make)
TEST_DECLARE(glmc_mat4x2_mul)
TEST_DECLARE(glmc_mat4x2_mulv)
TEST_DECLARE(glmc_mat4x2_transpose)
TEST_DECLARE(glmc_mat4x2_scale)
TEST_DECLARE(MACRO_GLM_MAT4X3_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT4X3_ZERO)
TEST_DECLARE(glm_mat4x3_copy)
TEST_DECLARE(glm_mat4x3_zero)
TEST_DECLARE(glm_mat4x3_make)
TEST_DECLARE(glm_mat4x3_mul)
TEST_DECLARE(glm_mat4x3_mulv)
TEST_DECLARE(glm_mat4x3_transpose)
TEST_DECLARE(glm_mat4x3_scale)
TEST_DECLARE(glmc_mat4x3_copy)
TEST_DECLARE(glmc_mat4x3_zero)
TEST_DECLARE(glmc_mat4x3_make)
TEST_DECLARE(glmc_mat4x3_mul)
TEST_DECLARE(glmc_mat4x3_mulv)
TEST_DECLARE(glmc_mat4x3_transpose)
TEST_DECLARE(glmc_mat4x3_scale)
/* mat3 */ /* mat3 */
TEST_DECLARE(glm_mat3_copy) TEST_DECLARE(glm_mat3_copy)
TEST_DECLARE(glm_mat3_identity) TEST_DECLARE(glm_mat3_identity)
@@ -190,6 +226,30 @@ TEST_DECLARE(glmc_mat3_swap_row)
TEST_DECLARE(glmc_mat3_rmc) TEST_DECLARE(glmc_mat3_rmc)
TEST_DECLARE(glmc_mat3_make) TEST_DECLARE(glmc_mat3_make)
TEST_DECLARE(MACRO_GLM_MAT3X2_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT3X2_ZERO)
TEST_DECLARE(glm_mat3x2_copy)
TEST_DECLARE(glm_mat3x2_zero)
TEST_DECLARE(glm_mat3x2_make)
TEST_DECLARE(glm_mat3x2_mul)
TEST_DECLARE(glm_mat3x2_mulv)
TEST_DECLARE(glm_mat3x2_transpose)
TEST_DECLARE(glm_mat3x2_scale)
TEST_DECLARE(glmc_mat3x2_copy)
TEST_DECLARE(glmc_mat3x2_zero)
TEST_DECLARE(glmc_mat3x2_make)
TEST_DECLARE(glmc_mat3x2_mul)
TEST_DECLARE(glmc_mat3x2_mulv)
TEST_DECLARE(glmc_mat3x2_transpose)
TEST_DECLARE(glmc_mat3x2_scale)
TEST_DECLARE(MACRO_GLM_MAT3X4_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT3X4_ZERO)
TEST_DECLARE(glm_mat3x4_make)
TEST_DECLARE(glmc_mat3x4_make)
TEST_DECLARE(MACRO_GLM_MAT2_IDENTITY_INIT) TEST_DECLARE(MACRO_GLM_MAT2_IDENTITY_INIT)
TEST_DECLARE(MACRO_GLM_MAT2_ZERO_INIT) TEST_DECLARE(MACRO_GLM_MAT2_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT2_IDENTITY) TEST_DECLARE(MACRO_GLM_MAT2_IDENTITY)
@@ -228,6 +288,42 @@ TEST_DECLARE(glmc_mat2_swap_row)
TEST_DECLARE(glmc_mat2_rmc) TEST_DECLARE(glmc_mat2_rmc)
TEST_DECLARE(glmc_mat2_make) TEST_DECLARE(glmc_mat2_make)
TEST_DECLARE(MACRO_GLM_MAT2X3_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT2X3_ZERO)
TEST_DECLARE(glm_mat2x3_copy)
TEST_DECLARE(glm_mat2x3_zero)
TEST_DECLARE(glm_mat2x3_make)
TEST_DECLARE(glm_mat2x3_mul)
TEST_DECLARE(glm_mat2x3_mulv)
TEST_DECLARE(glm_mat2x3_transpose)
TEST_DECLARE(glm_mat2x3_scale)
TEST_DECLARE(glmc_mat2x3_copy)
TEST_DECLARE(glmc_mat2x3_zero)
TEST_DECLARE(glmc_mat2x3_make)
TEST_DECLARE(glmc_mat2x3_mul)
TEST_DECLARE(glmc_mat2x3_mulv)
TEST_DECLARE(glmc_mat2x3_transpose)
TEST_DECLARE(glmc_mat2x3_scale)
TEST_DECLARE(MACRO_GLM_MAT2X4_ZERO_INIT)
TEST_DECLARE(MACRO_GLM_MAT2X4_ZERO)
TEST_DECLARE(glm_mat2x4_copy)
TEST_DECLARE(glm_mat2x4_zero)
TEST_DECLARE(glm_mat2x4_make)
TEST_DECLARE(glm_mat2x4_mul)
TEST_DECLARE(glm_mat2x4_mulv)
TEST_DECLARE(glm_mat2x4_transpose)
TEST_DECLARE(glm_mat2x4_scale)
TEST_DECLARE(glmc_mat2x4_copy)
TEST_DECLARE(glmc_mat2x4_zero)
TEST_DECLARE(glmc_mat2x4_make)
TEST_DECLARE(glmc_mat2x4_mul)
TEST_DECLARE(glmc_mat2x4_mulv)
TEST_DECLARE(glmc_mat2x4_transpose)
TEST_DECLARE(glmc_mat2x4_scale)
/* camera (incl [LR]H cross [NZ]O) */ /* camera (incl [LR]H cross [NZ]O) */
TEST_DECLARE(glm_perspective_lh_zo) TEST_DECLARE(glm_perspective_lh_zo)
TEST_DECLARE(glm_perspective_rh_zo) TEST_DECLARE(glm_perspective_rh_zo)
@@ -857,10 +953,22 @@ TEST_DECLARE(glmc_ivec4_clamp)
TEST_DECLARE(glmc_ivec4_abs) TEST_DECLARE(glmc_ivec4_abs)
/* structs */ /* structs */
TEST_DECLARE(mat2x3s_zero_init)
TEST_DECLARE(mat2x3s_zero)
TEST_DECLARE(mat2x4s_zero_init)
TEST_DECLARE(mat2x4s_zero)
TEST_DECLARE(mat3s_identity_init) TEST_DECLARE(mat3s_identity_init)
TEST_DECLARE(mat3s_zero_init) TEST_DECLARE(mat3s_zero_init)
TEST_DECLARE(mat3x2s_zero_init)
TEST_DECLARE(mat3x2s_zero)
TEST_DECLARE(mat3x4s_zero_init)
TEST_DECLARE(mat3x4s_zero)
TEST_DECLARE(mat4s_identity_init) TEST_DECLARE(mat4s_identity_init)
TEST_DECLARE(mat4s_zero_init) TEST_DECLARE(mat4s_zero_init)
TEST_DECLARE(mat4x2s_zero_init)
TEST_DECLARE(mat4x2s_zero)
TEST_DECLARE(mat4x3s_zero_init)
TEST_DECLARE(mat4x3s_zero)
TEST_DECLARE(quats_zero_init) TEST_DECLARE(quats_zero_init)
TEST_DECLARE(vec3s_one_init) TEST_DECLARE(vec3s_one_init)
TEST_DECLARE(vec3s_zero_init) TEST_DECLARE(vec3s_zero_init)
@@ -1007,7 +1115,43 @@ TEST_LIST {
TEST_ENTRY(glmc_mat4_swap_row) TEST_ENTRY(glmc_mat4_swap_row)
TEST_ENTRY(glmc_mat4_rmc) TEST_ENTRY(glmc_mat4_rmc)
TEST_ENTRY(glmc_mat4_make) TEST_ENTRY(glmc_mat4_make)
TEST_ENTRY(MACRO_GLM_MAT4X2_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT4X2_ZERO)
TEST_ENTRY(glm_mat4x2_copy)
TEST_ENTRY(glm_mat4x2_zero)
TEST_ENTRY(glm_mat4x2_make)
TEST_ENTRY(glm_mat4x2_mul)
TEST_ENTRY(glm_mat4x2_mulv)
TEST_ENTRY(glm_mat4x2_transpose)
TEST_ENTRY(glm_mat4x2_scale)
TEST_ENTRY(glmc_mat4x2_copy)
TEST_ENTRY(glmc_mat4x2_zero)
TEST_ENTRY(glmc_mat4x2_make)
TEST_ENTRY(glmc_mat4x2_mul)
TEST_ENTRY(glmc_mat4x2_mulv)
TEST_ENTRY(glmc_mat4x2_transpose)
TEST_ENTRY(glmc_mat4x2_scale)
TEST_ENTRY(MACRO_GLM_MAT4X3_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT4X3_ZERO)
TEST_ENTRY(glm_mat4x3_copy)
TEST_ENTRY(glm_mat4x3_zero)
TEST_ENTRY(glm_mat4x3_make)
TEST_ENTRY(glm_mat4x3_mul)
TEST_ENTRY(glm_mat4x3_mulv)
TEST_ENTRY(glm_mat4x3_transpose)
TEST_ENTRY(glm_mat4x3_scale)
TEST_ENTRY(glmc_mat4x3_copy)
TEST_ENTRY(glmc_mat4x3_zero)
TEST_ENTRY(glmc_mat4x3_make)
TEST_ENTRY(glmc_mat4x3_mul)
TEST_ENTRY(glmc_mat4x3_mulv)
TEST_ENTRY(glmc_mat4x3_transpose)
TEST_ENTRY(glmc_mat4x3_scale)
/* mat3 */ /* mat3 */
TEST_ENTRY(glm_mat3_copy) TEST_ENTRY(glm_mat3_copy)
TEST_ENTRY(glm_mat3_identity) TEST_ENTRY(glm_mat3_identity)
@@ -1044,7 +1188,31 @@ TEST_LIST {
TEST_ENTRY(glmc_mat3_swap_row) TEST_ENTRY(glmc_mat3_swap_row)
TEST_ENTRY(glmc_mat3_rmc) TEST_ENTRY(glmc_mat3_rmc)
TEST_ENTRY(glmc_mat3_make) TEST_ENTRY(glmc_mat3_make)
TEST_ENTRY(MACRO_GLM_MAT3X2_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT3X2_ZERO)
TEST_ENTRY(glm_mat3x2_copy)
TEST_ENTRY(glm_mat3x2_zero)
TEST_ENTRY(glm_mat3x2_make)
TEST_ENTRY(glm_mat3x2_mul)
TEST_ENTRY(glm_mat3x2_mulv)
TEST_ENTRY(glm_mat3x2_transpose)
TEST_ENTRY(glm_mat3x2_scale)
TEST_ENTRY(glmc_mat3x2_copy)
TEST_ENTRY(glmc_mat3x2_zero)
TEST_ENTRY(glmc_mat3x2_make)
TEST_ENTRY(glmc_mat3x2_mul)
TEST_ENTRY(glmc_mat3x2_mulv)
TEST_ENTRY(glmc_mat3x2_transpose)
TEST_ENTRY(glmc_mat3x2_scale)
TEST_ENTRY(MACRO_GLM_MAT3X4_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT3X4_ZERO)
TEST_ENTRY(glm_mat3x4_make)
TEST_ENTRY(glmc_mat3x4_make)
TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY_INIT) TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY_INIT)
TEST_ENTRY(MACRO_GLM_MAT2_ZERO_INIT) TEST_ENTRY(MACRO_GLM_MAT2_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY) TEST_ENTRY(MACRO_GLM_MAT2_IDENTITY)
@@ -1083,6 +1251,42 @@ TEST_LIST {
TEST_ENTRY(glmc_mat2_rmc) TEST_ENTRY(glmc_mat2_rmc)
TEST_ENTRY(glmc_mat2_make) TEST_ENTRY(glmc_mat2_make)
TEST_ENTRY(MACRO_GLM_MAT2X3_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT2X3_ZERO)
TEST_ENTRY(glm_mat2x3_copy)
TEST_ENTRY(glm_mat2x3_zero)
TEST_ENTRY(glm_mat2x3_make)
TEST_ENTRY(glm_mat2x3_mul)
TEST_ENTRY(glm_mat2x3_mulv)
TEST_ENTRY(glm_mat2x3_transpose)
TEST_ENTRY(glm_mat2x3_scale)
TEST_ENTRY(glmc_mat2x3_copy)
TEST_ENTRY(glmc_mat2x3_zero)
TEST_ENTRY(glmc_mat2x3_make)
TEST_ENTRY(glmc_mat2x3_mul)
TEST_ENTRY(glmc_mat2x3_mulv)
TEST_ENTRY(glmc_mat2x3_transpose)
TEST_ENTRY(glmc_mat2x3_scale)
TEST_ENTRY(MACRO_GLM_MAT2X4_ZERO_INIT)
TEST_ENTRY(MACRO_GLM_MAT2X4_ZERO)
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(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)
/* camera (incl [LR]H cross [NZ]O) */ /* camera (incl [LR]H cross [NZ]O) */
TEST_ENTRY(glm_perspective_lh_zo) TEST_ENTRY(glm_perspective_lh_zo)
TEST_ENTRY(glm_perspective_rh_zo) TEST_ENTRY(glm_perspective_rh_zo)
@@ -1709,10 +1913,22 @@ TEST_LIST {
TEST_ENTRY(glmc_ivec4_abs) TEST_ENTRY(glmc_ivec4_abs)
/* structs */ /* structs */
TEST_ENTRY(mat2x3s_zero_init)
TEST_ENTRY(mat2x3s_zero)
TEST_ENTRY(mat2x4s_zero_init)
TEST_ENTRY(mat2x4s_zero)
TEST_ENTRY(mat3s_identity_init) TEST_ENTRY(mat3s_identity_init)
TEST_ENTRY(mat3s_zero_init) TEST_ENTRY(mat3s_zero_init)
TEST_ENTRY(mat3x2s_zero_init)
TEST_ENTRY(mat3x2s_zero)
TEST_ENTRY(mat3x4s_zero_init)
TEST_ENTRY(mat3x4s_zero)
TEST_ENTRY(mat4s_identity_init) TEST_ENTRY(mat4s_identity_init)
TEST_ENTRY(mat4s_zero_init) TEST_ENTRY(mat4s_zero_init)
TEST_ENTRY(mat4x2s_zero_init)
TEST_ENTRY(mat4x2s_zero)
TEST_ENTRY(mat4x3s_zero_init)
TEST_ENTRY(mat4x3s_zero)
TEST_ENTRY(quats_zero_init) TEST_ENTRY(quats_zero_init)
TEST_ENTRY(vec3s_one_init) TEST_ENTRY(vec3s_one_init)
TEST_ENTRY(vec3s_zero_init) TEST_ENTRY(vec3s_zero_init)

View File

@@ -66,8 +66,14 @@
<ClInclude Include="..\test\src\test_ivec3.h" /> <ClInclude Include="..\test\src\test_ivec3.h" />
<ClInclude Include="..\test\src\test_ivec4.h" /> <ClInclude Include="..\test\src\test_ivec4.h" />
<ClInclude Include="..\test\src\test_mat2.h" /> <ClInclude Include="..\test\src\test_mat2.h" />
<ClInclude Include="..\test\src\test_mat2x3.h" />
<ClInclude Include="..\test\src\test_mat2x4.h" />
<ClInclude Include="..\test\src\test_mat3.h" /> <ClInclude Include="..\test\src\test_mat3.h" />
<ClInclude Include="..\test\src\test_mat3x2.h" />
<ClInclude Include="..\test\src\test_mat3x4.h" />
<ClInclude Include="..\test\src\test_mat4.h" /> <ClInclude Include="..\test\src\test_mat4.h" />
<ClInclude Include="..\test\src\test_mat4x2.h" />
<ClInclude Include="..\test\src\test_mat4x3.h" />
<ClInclude Include="..\test\src\test_plane.h" /> <ClInclude Include="..\test\src\test_plane.h" />
<ClInclude Include="..\test\src\test_project.h" /> <ClInclude Include="..\test\src\test_project.h" />
<ClInclude Include="..\test\src\test_quat.h" /> <ClInclude Include="..\test\src\test_quat.h" />
@@ -419,4 +425,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

View File

@@ -79,12 +79,30 @@
<ClInclude Include="..\test\src\test_mat2.h"> <ClInclude Include="..\test\src\test_mat2.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\test\src\test_mat2x3.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\test\src\test_mat2x4.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\test\src\test_mat3.h"> <ClInclude Include="..\test\src\test_mat3.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\test\src\test_mat3x2.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\test\src\test_mat3x4.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\test\src\test_mat4.h"> <ClInclude Include="..\test\src\test_mat4.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\test\src\test_mat4x2.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\test\src\test_mat4x3.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\test\src\test_plane.h"> <ClInclude Include="..\test\src\test_plane.h">
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
@@ -107,4 +125,4 @@
<Filter>src</Filter> <Filter>src</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -71,8 +71,14 @@
<ClCompile Include="..\src\ivec3.c" /> <ClCompile Include="..\src\ivec3.c" />
<ClCompile Include="..\src\ivec4.c" /> <ClCompile Include="..\src\ivec4.c" />
<ClCompile Include="..\src\mat2.c" /> <ClCompile Include="..\src\mat2.c" />
<ClCompile Include="..\src\mat2x3.c" />
<ClCompile Include="..\src\mat2x4.c" />
<ClCompile Include="..\src\mat3.c" /> <ClCompile Include="..\src\mat3.c" />
<ClCompile Include="..\src\mat3x2.c" />
<ClCompile Include="..\src\mat3x4.c" />
<ClCompile Include="..\src\mat4.c" /> <ClCompile Include="..\src\mat4.c" />
<ClCompile Include="..\src\mat4x2.c" />
<ClCompile Include="..\src\mat4x3.c" />
<ClCompile Include="..\src\plane.c" /> <ClCompile Include="..\src\plane.c" />
<ClCompile Include="..\src\project.c" /> <ClCompile Include="..\src\project.c" />
<ClCompile Include="..\src\quat.c" /> <ClCompile Include="..\src\quat.c" />
@@ -120,8 +126,14 @@
<ClInclude Include="..\include\cglm\call\ivec3.h" /> <ClInclude Include="..\include\cglm\call\ivec3.h" />
<ClInclude Include="..\include\cglm\call\ivec4.h" /> <ClInclude Include="..\include\cglm\call\ivec4.h" />
<ClInclude Include="..\include\cglm\call\mat2.h" /> <ClInclude Include="..\include\cglm\call\mat2.h" />
<ClInclude Include="..\include\cglm\call\mat2x3.h" />
<ClInclude Include="..\include\cglm\call\mat2x4.h" />
<ClInclude Include="..\include\cglm\call\mat3.h" /> <ClInclude Include="..\include\cglm\call\mat3.h" />
<ClInclude Include="..\include\cglm\call\mat3x2.h" />
<ClInclude Include="..\include\cglm\call\mat3x4.h" />
<ClInclude Include="..\include\cglm\call\mat4.h" /> <ClInclude Include="..\include\cglm\call\mat4.h" />
<ClInclude Include="..\include\cglm\call\mat4x2.h" />
<ClInclude Include="..\include\cglm\call\mat4x3.h" />
<ClInclude Include="..\include\cglm\call\plane.h" /> <ClInclude Include="..\include\cglm\call\plane.h" />
<ClInclude Include="..\include\cglm\call\project.h" /> <ClInclude Include="..\include\cglm\call\project.h" />
<ClInclude Include="..\include\cglm\call\quat.h" /> <ClInclude Include="..\include\cglm\call\quat.h" />
@@ -160,8 +172,14 @@
<ClInclude Include="..\include\cglm\ivec3.h" /> <ClInclude Include="..\include\cglm\ivec3.h" />
<ClInclude Include="..\include\cglm\ivec4.h" /> <ClInclude Include="..\include\cglm\ivec4.h" />
<ClInclude Include="..\include\cglm\mat2.h" /> <ClInclude Include="..\include\cglm\mat2.h" />
<ClInclude Include="..\include\cglm\mat2x3.h" />
<ClInclude Include="..\include\cglm\mat2x4.h" />
<ClInclude Include="..\include\cglm\mat3.h" /> <ClInclude Include="..\include\cglm\mat3.h" />
<ClInclude Include="..\include\cglm\mat3x2.h" />
<ClInclude Include="..\include\cglm\mat3x4.h" />
<ClInclude Include="..\include\cglm\mat4.h" /> <ClInclude Include="..\include\cglm\mat4.h" />
<ClInclude Include="..\include\cglm\mat4x2.h" />
<ClInclude Include="..\include\cglm\mat4x3.h" />
<ClInclude Include="..\include\cglm\plane.h" /> <ClInclude Include="..\include\cglm\plane.h" />
<ClInclude Include="..\include\cglm\project.h" /> <ClInclude Include="..\include\cglm\project.h" />
<ClInclude Include="..\include\cglm\quat.h" /> <ClInclude Include="..\include\cglm\quat.h" />
@@ -209,8 +227,14 @@
<ClInclude Include="..\include\cglm\struct\frustum.h" /> <ClInclude Include="..\include\cglm\struct\frustum.h" />
<ClInclude Include="..\include\cglm\struct\io.h" /> <ClInclude Include="..\include\cglm\struct\io.h" />
<ClInclude Include="..\include\cglm\struct\mat2.h" /> <ClInclude Include="..\include\cglm\struct\mat2.h" />
<ClInclude Include="..\include\cglm\struct\mat2x3.h" />
<ClInclude Include="..\include\cglm\struct\mat2x4.h" />
<ClInclude Include="..\include\cglm\struct\mat3.h" /> <ClInclude Include="..\include\cglm\struct\mat3.h" />
<ClInclude Include="..\include\cglm\struct\mat3x2.h" />
<ClInclude Include="..\include\cglm\struct\mat3x4.h" />
<ClInclude Include="..\include\cglm\struct\mat4.h" /> <ClInclude Include="..\include\cglm\struct\mat4.h" />
<ClInclude Include="..\include\cglm\struct\mat4x2.h" />
<ClInclude Include="..\include\cglm\struct\mat4x3.h" />
<ClInclude Include="..\include\cglm\struct\plane.h" /> <ClInclude Include="..\include\cglm\struct\plane.h" />
<ClInclude Include="..\include\cglm\struct\project.h" /> <ClInclude Include="..\include\cglm\struct\project.h" />
<ClInclude Include="..\include\cglm\struct\quat.h" /> <ClInclude Include="..\include\cglm\struct\quat.h" />

View File

@@ -58,9 +58,21 @@
<ClCompile Include="..\src\mat3.c"> <ClCompile Include="..\src\mat3.c">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\mat3x2.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\mat3x4.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\mat4.c"> <ClCompile Include="..\src\mat4.c">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\mat4x2.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\mat4x3.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\quat.c"> <ClCompile Include="..\src\quat.c">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
@@ -97,6 +109,12 @@
<ClCompile Include="..\src\mat2.c"> <ClCompile Include="..\src\mat2.c">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\mat2x3.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\mat2x4.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\vec2.c"> <ClCompile Include="..\src\vec2.c">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
@@ -177,9 +195,21 @@
<ClInclude Include="..\include\cglm\call\mat3.h"> <ClInclude Include="..\include\cglm\call\mat3.h">
<Filter>include\cglm\call</Filter> <Filter>include\cglm\call</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\call\mat3x2.h">
<Filter>include\cglm\call</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\call\mat3x4.h">
<Filter>include\cglm\call</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\call\mat4.h"> <ClInclude Include="..\include\cglm\call\mat4.h">
<Filter>include\cglm\call</Filter> <Filter>include\cglm\call</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\call\mat4x2.h">
<Filter>include\cglm\call</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\call\mat4x3.h">
<Filter>include\cglm\call</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\call\quat.h"> <ClInclude Include="..\include\cglm\call\quat.h">
<Filter>include\cglm\call</Filter> <Filter>include\cglm\call</Filter>
</ClInclude> </ClInclude>
@@ -243,9 +273,21 @@
<ClInclude Include="..\include\cglm\mat3.h"> <ClInclude Include="..\include\cglm\mat3.h">
<Filter>include\cglm</Filter> <Filter>include\cglm</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\mat3x2.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\mat3x4.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\mat4.h"> <ClInclude Include="..\include\cglm\mat4.h">
<Filter>include\cglm</Filter> <Filter>include\cglm</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\mat4x2.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\mat4x3.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\quat.h"> <ClInclude Include="..\include\cglm\quat.h">
<Filter>include\cglm</Filter> <Filter>include\cglm</Filter>
</ClInclude> </ClInclude>
@@ -360,9 +402,21 @@
<ClInclude Include="..\include\cglm\struct\mat3.h"> <ClInclude Include="..\include\cglm\struct\mat3.h">
<Filter>include\cglm\struct</Filter> <Filter>include\cglm\struct</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\struct\mat3x2.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\mat3x4.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\mat4.h"> <ClInclude Include="..\include\cglm\struct\mat4.h">
<Filter>include\cglm\struct</Filter> <Filter>include\cglm\struct</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\struct\mat4x2.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\mat4x3.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\plane.h"> <ClInclude Include="..\include\cglm\struct\plane.h">
<Filter>include\cglm\struct</Filter> <Filter>include\cglm\struct</Filter>
</ClInclude> </ClInclude>
@@ -396,18 +450,36 @@
<ClInclude Include="..\include\cglm\call\mat2.h"> <ClInclude Include="..\include\cglm\call\mat2.h">
<Filter>include\cglm\call</Filter> <Filter>include\cglm\call</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\call\mat2x3.h">
<Filter>include\cglm\call</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\call\mat2x4.h">
<Filter>include\cglm\call</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\call\vec2.h"> <ClInclude Include="..\include\cglm\call\vec2.h">
<Filter>include\cglm\call</Filter> <Filter>include\cglm\call</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\struct\mat2.h"> <ClInclude Include="..\include\cglm\struct\mat2.h">
<Filter>include\cglm\struct</Filter> <Filter>include\cglm\struct</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\struct\mat2x3.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\mat2x4.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\applesimd.h"> <ClInclude Include="..\include\cglm\applesimd.h">
<Filter>include\cglm</Filter> <Filter>include\cglm</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\mat2.h"> <ClInclude Include="..\include\cglm\mat2.h">
<Filter>include\cglm</Filter> <Filter>include\cglm</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\cglm\mat2x3.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\mat2x4.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\vec2-ext.h"> <ClInclude Include="..\include\cglm\vec2-ext.h">
<Filter>include\cglm</Filter> <Filter>include\cglm</Filter>
</ClInclude> </ClInclude>
@@ -607,4 +679,4 @@
<Filter>include\cglm\struct</Filter> <Filter>include\cglm\struct</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>