mirror of
https://github.com/recp/cglm.git
synced 2026-02-17 03:39:05 +00:00
Compare commits
64 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d6267e623b | ||
|
|
93cdc897a5 | ||
|
|
0962f7d2e7 | ||
|
|
487b18e326 | ||
|
|
8e2074c274 | ||
|
|
0ab1f21816 | ||
|
|
b8d565c6b6 | ||
|
|
c5c997ca13 | ||
|
|
924d92ae3f | ||
|
|
d673f3d765 | ||
|
|
5833d1bf44 | ||
|
|
aeeeac4c5a | ||
|
|
b3de85a14e | ||
|
|
5e798a94e3 | ||
|
|
49dd24eaf2 | ||
|
|
bfe5ea6ab7 | ||
|
|
6d39ef0026 | ||
|
|
87ae96b847 | ||
|
|
9cf4190c9b | ||
|
|
2bbaeb8db9 | ||
|
|
a7cda7f969 | ||
|
|
c4d4c48518 | ||
|
|
702bed8173 | ||
|
|
e9aa249a73 | ||
|
|
adec2ee8e6 | ||
|
|
5cd16194c8 | ||
|
|
02b9dc067a | ||
|
|
a447365bc5 | ||
|
|
6183b213e2 | ||
|
|
768d36f4b6 | ||
|
|
2c39193016 | ||
|
|
16fcaf7fc0 | ||
|
|
530ec2d0f8 | ||
|
|
56d9e41465 | ||
|
|
610788bed1 | ||
|
|
2d6538ecec | ||
|
|
0de379c632 | ||
|
|
31cbd41e3b | ||
|
|
c691bc5bc0 | ||
|
|
7346e91574 | ||
|
|
0566a040c0 | ||
|
|
e6681e78c8 | ||
|
|
e17f115f91 | ||
|
|
2631d3b5ea | ||
|
|
9772948831 | ||
|
|
988dd13d61 | ||
|
|
ed09fb5819 | ||
|
|
c4a348ac71 | ||
|
|
7e9d2aa6a4 | ||
|
|
091102e2c1 | ||
|
|
50b1c189b1 | ||
|
|
44268d24f9 | ||
|
|
65fd77d255 | ||
|
|
5883ed3495 | ||
|
|
e2e923554b | ||
|
|
6b2c91ecf7 | ||
|
|
a4b8778be9 | ||
|
|
5ce7dff812 | ||
|
|
13036036c4 | ||
|
|
c1ff76d3b1 | ||
|
|
17b3911e7c | ||
|
|
7307b1cbbe | ||
|
|
391d8670c2 | ||
|
|
8d441902c0 |
2
.github/workflows/cmake-wasm.yml
vendored
2
.github/workflows/cmake-wasm.yml
vendored
@@ -66,7 +66,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Setup emsdk
|
- name: Setup emsdk
|
||||||
uses: mymindstorm/setup-emsdk@v11
|
uses: mymindstorm/setup-emsdk@v12
|
||||||
|
|
||||||
- name: Verify emsdk
|
- name: Verify emsdk
|
||||||
run: emcc -v
|
run: emcc -v
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
cmake_minimum_required(VERSION 3.8.2)
|
cmake_minimum_required(VERSION 3.8.2)
|
||||||
project(cglm
|
project(cglm
|
||||||
VERSION 0.9.0
|
VERSION 0.9.1
|
||||||
HOMEPAGE_URL https://github.com/recp/cglm
|
HOMEPAGE_URL https://github.com/recp/cglm
|
||||||
DESCRIPTION "OpenGL Mathematics (glm) for C"
|
DESCRIPTION "OpenGL Mathematics (glm) for C"
|
||||||
LANGUAGES C
|
LANGUAGES C
|
||||||
@@ -43,7 +43,7 @@ if(MSVC)
|
|||||||
string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}")
|
string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}")
|
||||||
endforeach(flag_var)
|
endforeach(flag_var)
|
||||||
else()
|
else()
|
||||||
add_compile_options(-Wall -Werror -O3)
|
add_compile_options(-Wall -O3)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
get_directory_property(hasParent PARENT_DIRECTORY)
|
get_directory_property(hasParent PARENT_DIRECTORY)
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ AM_CFLAGS = -Wall \
|
|||||||
-std=gnu11 \
|
-std=gnu11 \
|
||||||
-O3 \
|
-O3 \
|
||||||
-Wstrict-aliasing=2 \
|
-Wstrict-aliasing=2 \
|
||||||
-fstrict-aliasing \
|
-fstrict-aliasing
|
||||||
-Werror=strict-prototypes
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = libcglm.la
|
lib_LTLIBRARIES = libcglm.la
|
||||||
libcglm_la_LDFLAGS = -no-undefined -version-info 0:1:0
|
libcglm_la_LDFLAGS = -no-undefined -version-info 0:1:0
|
||||||
@@ -163,6 +162,7 @@ cglm_struct_HEADERS = include/cglm/struct/mat4.h \
|
|||||||
include/cglm/struct/mat2.h \
|
include/cglm/struct/mat2.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.h \
|
include/cglm/struct/affine.h \
|
||||||
include/cglm/struct/affine2d.h \
|
include/cglm/struct/affine2d.h \
|
||||||
include/cglm/struct/vec2.h \
|
include/cglm/struct/vec2.h \
|
||||||
@@ -243,11 +243,6 @@ test_tests_SOURCES=\
|
|||||||
test/runner.c \
|
test/runner.c \
|
||||||
test/src/test_common.c \
|
test/src/test_common.c \
|
||||||
test/src/tests.c \
|
test/src/tests.c \
|
||||||
test/src/test_cam.c \
|
|
||||||
test/src/test_cam_lh_zo.c \
|
|
||||||
test/src/test_cam_rh_zo.c \
|
|
||||||
test/src/test_cam_lh_no.c \
|
|
||||||
test/src/test_cam_rh_no.c \
|
|
||||||
test/src/test_clamp.c \
|
test/src/test_clamp.c \
|
||||||
test/src/test_euler.c \
|
test/src/test_euler.c \
|
||||||
test/src/test_bezier.c \
|
test/src/test_bezier.c \
|
||||||
|
|||||||
34
README.md
34
README.md
@@ -242,6 +242,38 @@ add_subdirectory(external/cglm/)
|
|||||||
# or you can use find_package to configure cglm
|
# or you can use find_package to configure cglm
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### Use CMake to build for WebAssembly
|
||||||
|
|
||||||
|
Since math functions like `sinf` is used, this can not be targeted at `wasm32-unknown-unknown`, one of [wasi-sdk](https://github.com/WebAssembly/wasi-sdk) or [emscripten](https://github.com/emscripten-core/emsdk) should be used.
|
||||||
|
|
||||||
|
Should note that shared build is not yet supported for WebAssembly.
|
||||||
|
|
||||||
|
For [simd128](https://github.com/WebAssembly/simd) support, add `-msimd128` to `CMAKE_C_FLAGS`, in command line `-DCMAKE_C_FLAGS="-msimd128"`.
|
||||||
|
|
||||||
|
For tests, the cmake option `CGLM_USE_TEST` would still work, you'll need a wasi runtime for running tests, see our [ci config file](.github/workflows/cmake-wasm.yml) for a detailed example.
|
||||||
|
|
||||||
|
##### Use CMake and WASI SDK to build for WebAssembly
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ cmake .. \
|
||||||
|
-DCMAKE_TOOLCHAIN_FILE=/path/to/wasi-sdk-19.0/share/cmake/wasi-sdk.cmake \
|
||||||
|
-DWASI_SDK_PREFIX=/path/to/wasi-sdk-19.0
|
||||||
|
```
|
||||||
|
|
||||||
|
Where `/path/to/wasi-sdk-19.0/` is the path to extracted [wasi sdk](https://github.com/WebAssembly/wasi-sdk).
|
||||||
|
|
||||||
|
In this case it would by default make a static build.
|
||||||
|
|
||||||
|
##### Use CMake and Emscripten SDK to build for WebAssembly
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ emcmake cmake .. \
|
||||||
|
-DCMAKE_EXE_LINKER_FLAGS="-s STANDALONE_WASM" \
|
||||||
|
-DCGLM_STATIC=ON
|
||||||
|
```
|
||||||
|
|
||||||
|
The `emcmake` here is the cmake wrapper for Emscripten from installed [emsdk](https://github.com/emscripten-core/emsdk).
|
||||||
|
|
||||||
### Meson (All platforms)
|
### Meson (All platforms)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -257,7 +289,7 @@ $ sudo ninja install # [Optional]
|
|||||||
c_std=c11
|
c_std=c11
|
||||||
buildtype=release
|
buildtype=release
|
||||||
default_library=shared
|
default_library=shared
|
||||||
enable_tests=false # to run tests: ninja test
|
build_tests=true # to run tests: ninja test
|
||||||
```
|
```
|
||||||
#### Use with your Meson project
|
#### Use with your Meson project
|
||||||
* Example:
|
* Example:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
|
|||||||
|
|
||||||
# Description
|
# Description
|
||||||
s.name = "cglm"
|
s.name = "cglm"
|
||||||
s.version = "0.8.9"
|
s.version = "0.9.0"
|
||||||
s.summary = "📽 Highly Optimized Graphics Math (glm) for C"
|
s.summary = "📽 Highly Optimized Graphics Math (glm) for C"
|
||||||
s.description = <<-DESC
|
s.description = <<-DESC
|
||||||
cglm is math library for graphics programming for C. See the documentation or README for all features.
|
cglm is math library for graphics programming for C. See the documentation or README for all features.
|
||||||
|
|||||||
@@ -7,8 +7,8 @@
|
|||||||
#*****************************************************************************
|
#*****************************************************************************
|
||||||
|
|
||||||
AC_PREREQ([2.69])
|
AC_PREREQ([2.69])
|
||||||
AC_INIT([cglm], [0.9.0], [info@recp.me])
|
AC_INIT([cglm], [0.9.1], [info@recp.me])
|
||||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects serial-tests])
|
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects serial-tests])
|
||||||
|
|
||||||
# Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.
|
# Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.
|
||||||
: ${CFLAGS=""}
|
: ${CFLAGS=""}
|
||||||
|
|||||||
@@ -1,59 +1,28 @@
|
|||||||
API documentation
|
📚 API documentation
|
||||||
================================
|
================================
|
||||||
|
|
||||||
Some functions may exist twice,
|
**cglm** provides a few APIs for similar functions.
|
||||||
once for their namespace and once for global namespace
|
|
||||||
to make easier to write very common functions
|
|
||||||
|
|
||||||
For instance, in general we use :code:`glm_vec3_dot` to get dot product
|
* 📦 **Inline API**: All functions are inline. You can include **cglm/cglm.h** header
|
||||||
of two **vec3**. Now we can also do this with :code:`glm_dot`,
|
to use this API. This is the default API. `glm_` is namespace/prefix for this API.
|
||||||
same for *_cross* and so on...
|
* 📦 **Call API**: All functions are not inline. You need to build *cglm* and link it
|
||||||
|
to your project. You can include **cglm/call.h** header to use this API. `glmc_` is namespace/prefix for this API.
|
||||||
|
|
||||||
The original function stays where it is, the function in global namespace
|
And also there are also sub categories:
|
||||||
of same name is just an alias, so there is no call version of those functions.
|
|
||||||
e.g there is no func like :code:`glmc_dot` because *glm_dot* is just alias for
|
|
||||||
:code:`glm_vec3_dot`
|
|
||||||
|
|
||||||
By including **cglm/cglm.h** header you will include all inline version
|
* 📦 **Array API**: Types are raw arrays and functions takes array as argument. You can include **cglm/cglm.h** header
|
||||||
of functions. Since functions in this header[s] are inline you don't need to
|
to use this API. This is the default API. `glm_` is namespace/prefix for this API.
|
||||||
build or link *cglm* against your project.
|
* 📦 **Struct API**: Types are union/struct and functions takes struct as argument and return structs if needed. You can include **cglm/struct.h** header
|
||||||
|
to use this API. This also includes **cglm/cglm.h** header.`glms_` is namespace/prefix for this API but your can omit or change it, see struct api docs.
|
||||||
|
* 📦 **SIMD API**: SIMD functions and helpers. `glmm_` is namespace/prefix for this API.
|
||||||
|
|
||||||
But by including **cglm/call.h** header you will include all *non-inline*
|
📌 Since struct api and call api are built top of inline array api, follow inline array api docs for individual functions.
|
||||||
version of functions. You need to build *cglm* and link it.
|
|
||||||
Follow the :doc:`build` documentation for this
|
|
||||||
|
|
||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 1
|
:maxdepth: 1
|
||||||
:caption: API categories:
|
:caption: API documentations:
|
||||||
|
|
||||||
affine
|
api_inline_array
|
||||||
affine-mat
|
api_struct
|
||||||
affine2d
|
api_call
|
||||||
cam
|
api_simd
|
||||||
frustum
|
|
||||||
box
|
|
||||||
quat
|
|
||||||
euler
|
|
||||||
mat2
|
|
||||||
mat3
|
|
||||||
mat4
|
|
||||||
vec2
|
|
||||||
vec2-ext
|
|
||||||
vec3
|
|
||||||
vec3-ext
|
|
||||||
vec4
|
|
||||||
vec4-ext
|
|
||||||
ivec2
|
|
||||||
ivec3
|
|
||||||
ivec4
|
|
||||||
color
|
|
||||||
plane
|
|
||||||
project
|
|
||||||
util
|
|
||||||
io
|
|
||||||
call
|
|
||||||
sphere
|
|
||||||
curve
|
|
||||||
bezier
|
|
||||||
version
|
|
||||||
ray
|
|
||||||
|
|||||||
11
docs/source/api_call.rst
Normal file
11
docs/source/api_call.rst
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
Call API
|
||||||
|
================================
|
||||||
|
|
||||||
|
Call API is pre-built API for making calls from library. It is built on top of the array api. **glmc_** is the namespace for the call api.
|
||||||
|
**c** stands for call.
|
||||||
|
|
||||||
|
You need to built cglm to use call api. See build instructions (:doc:`build`) for more details.
|
||||||
|
|
||||||
|
The functions except namespace **glmc_** are same as inline api. See ( :doc:`api_inline_array` ) for more details.
|
||||||
|
|
||||||
|
📌 In the future we can define option to forward inline functions or struct api to call api.
|
||||||
70
docs/source/api_inline_array.rst
Normal file
70
docs/source/api_inline_array.rst
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
Array API - Inline (Default)
|
||||||
|
========================================
|
||||||
|
|
||||||
|
This is the default API of *cglm*. All functions are forced to be inlined
|
||||||
|
and struct api, call api uses this inline api to share implementation.
|
||||||
|
|
||||||
|
📌 Call api is also array api but it is not inlined.
|
||||||
|
In the future there may be option to forward struct api to call api instead of inline api to reduce binary size if needed.
|
||||||
|
|
||||||
|
📌 **USE this API docs for similar functions in struct and call api**
|
||||||
|
|
||||||
|
📌 In struct api you can omit namespace e.g :code:`glms_vec3_dot` can be called as :code:`vec3_dot` in struct api, see :doc:`struct-api` to configure struct api for more details.
|
||||||
|
📌 In struct api functions can return struct/union
|
||||||
|
📌 In struct api you can access items like **.x**, **.y**, **.z**, **.w**, **.r**, **.g**, **.b**, **.a**, **.m00**, **m01**...
|
||||||
|
|
||||||
|
Some functions may exist twice, once for their namespace and once for global namespace
|
||||||
|
to make easier to write very common functions
|
||||||
|
|
||||||
|
For instance, in general we use :code:`glm_vec3_dot` to get dot product
|
||||||
|
of two **vec3**. Now we can also do this with :code:`glm_dot`,
|
||||||
|
same for *_cross* and so on...
|
||||||
|
|
||||||
|
The original function stays where it is, the function in global namespace
|
||||||
|
of same name is just an alias, so there is no call version of those functions.
|
||||||
|
e.g there is no func like :code:`glmc_dot` because *glm_dot* is just alias for
|
||||||
|
:code:`glm_vec3_dot`
|
||||||
|
|
||||||
|
By including **cglm/cglm.h** header you will include all inline version
|
||||||
|
of functions. Since functions in this header[s] are inline you don't need to
|
||||||
|
build or link *cglm* against your project.
|
||||||
|
|
||||||
|
But by including **cglm/call.h** header you will include all *non-inline*
|
||||||
|
version of functions. You need to build *cglm* and link it.
|
||||||
|
Follow the :doc:`build` documentation for this
|
||||||
|
|
||||||
|
.. toctree::
|
||||||
|
:maxdepth: 1
|
||||||
|
:caption: API categories:
|
||||||
|
|
||||||
|
affine
|
||||||
|
affine-mat
|
||||||
|
affine2d
|
||||||
|
cam
|
||||||
|
frustum
|
||||||
|
box
|
||||||
|
quat
|
||||||
|
euler
|
||||||
|
mat2
|
||||||
|
mat3
|
||||||
|
mat4
|
||||||
|
vec2
|
||||||
|
vec2-ext
|
||||||
|
vec3
|
||||||
|
vec3-ext
|
||||||
|
vec4
|
||||||
|
vec4-ext
|
||||||
|
ivec2
|
||||||
|
ivec3
|
||||||
|
ivec4
|
||||||
|
color
|
||||||
|
plane
|
||||||
|
project
|
||||||
|
util
|
||||||
|
io
|
||||||
|
call
|
||||||
|
sphere
|
||||||
|
curve
|
||||||
|
bezier
|
||||||
|
version
|
||||||
|
ray
|
||||||
12
docs/source/api_simd.rst
Normal file
12
docs/source/api_simd.rst
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
SIMD API
|
||||||
|
================================
|
||||||
|
|
||||||
|
SIMD api is special api for SIMD operations. **glmm_** prefix is used for SIMD operations in cglm. It is used in many places in cglm.
|
||||||
|
You can use it for your own SIMD operations too. In the future the api may be extended by time.
|
||||||
|
|
||||||
|
Supported SIMD architectures ( may vary by time )
|
||||||
|
|
||||||
|
* SSE / SSE2
|
||||||
|
* AVX
|
||||||
|
* NEON
|
||||||
|
* WASM 128
|
||||||
98
docs/source/api_struct.rst
Normal file
98
docs/source/api_struct.rst
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
Struct API
|
||||||
|
================================
|
||||||
|
|
||||||
|
Struct API is alternative API to array api to use **cglm** with improved type safety and easy to use.
|
||||||
|
Since struct api is built top of array api, every struct API is not documented here.
|
||||||
|
See array api documentation for more information for individual functions.
|
||||||
|
|
||||||
|
By default struct api adds `s` suffix to every type name e.g. vec3s, mat4s, versors etc.
|
||||||
|
Also struct api `s` suffix to namespace e.g. `glms_vec3_add`, `glms_mat4_mul` etc.
|
||||||
|
|
||||||
|
By starting v0.9.0, struct api namespace is configurable. We can omit **glms_** namespace or
|
||||||
|
even change it with custom name to move existing api integrations to **cglm** more easliy...
|
||||||
|
We can also add **s** to functin names if we want e.g. `glms_vec3_add()` -> `vec3_add()` or `vec3s_add()`.
|
||||||
|
|
||||||
|
By including **cglm/struct.h** header you will include all struct api. It will also include **cglm/cglm.h** too.
|
||||||
|
Since struct apis are inline you don't need to build or link *cglm* against
|
||||||
|
your project unless if you want to use pre-built call-api too.
|
||||||
|
|
||||||
|
Struct API is built top of array api. So you can mix them.
|
||||||
|
Use **.raw** union member to access raw array data to use it with array api.
|
||||||
|
|
||||||
|
Unlike array api ([0], [1], [0][0] ...), it is also possible to use struct api
|
||||||
|
with **.x**, **.y**, **.z**, **.w**, **.r**, **.g**, **.b**, **.a**, **.m00**, **m01**...
|
||||||
|
accessors to access individual elements/properties of vectors and matrices.
|
||||||
|
|
||||||
|
Struct API usage:
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
.. code-block:: c
|
||||||
|
|
||||||
|
#include <cglm/struct.h>
|
||||||
|
|
||||||
|
mat4s m1 = glms_mat4_identity(); /* init... */
|
||||||
|
mat4s m2 = glms_mat4_identity(); /* init... */
|
||||||
|
mat4s m3 = glms_mat4_mul(glms_mat4_mul(m1, m2), glms_mat4_mul(m3, m4));
|
||||||
|
|
||||||
|
vec3s v1 = { 1.0f, 0.0f, 0.0f };
|
||||||
|
vec3s v2 = { 0.0f, 1.0f, 0.0f };
|
||||||
|
vec4s v4 = { 0.0f, 1.0f, 0.0f, 0.0f };
|
||||||
|
vec4 v5a = { 0.0f, 1.0f, 0.0f, 0.0f };
|
||||||
|
|
||||||
|
mat4s m4 = glms_rotate(m3, M_PI_2,
|
||||||
|
glms_vec3_cross(glms_vec3_add(v1, v6)
|
||||||
|
glms_vec3_add(v1, v7)));
|
||||||
|
|
||||||
|
v1.x = 1.0f; v1.y = 0.0f; v1.z = 0.0f;
|
||||||
|
// or
|
||||||
|
v1.raw[0] = 1.0f; v1.raw[1] = 0.0f; v1.raw[2] = 0.0f;
|
||||||
|
|
||||||
|
/* use struct api with array api (mix them). */
|
||||||
|
/* use .raw to access array and use it with array api */
|
||||||
|
|
||||||
|
glm_vec4_add(m4.col[0].raw, v5a, m4.col[0].raw);
|
||||||
|
glm_mat4_mulv(m4.raw, v4.raw, v5a);
|
||||||
|
|
||||||
|
or omit `glms_` namespace completely (see options below):
|
||||||
|
|
||||||
|
.. code-block:: c
|
||||||
|
|
||||||
|
#define CGLM_OMIT_NS_FROM_STRUCT_API
|
||||||
|
|
||||||
|
#include <cglm/struct.h>
|
||||||
|
|
||||||
|
mat4s m1 = mat4_identity(); /* init... */
|
||||||
|
mat4s m2 = mat4_identity(); /* init... */
|
||||||
|
mat4s m3 = mat4_mul(mat4_mul(m1, m2), mat4_mul(m3, m4));
|
||||||
|
|
||||||
|
vec3s v1 = { 1.0f, 0.0f, 0.0f };
|
||||||
|
vec3s v2 = { 0.0f, 1.0f, 0.0f };
|
||||||
|
vec4s v4 = { 0.0f, 1.0f, 0.0f, 0.0f };
|
||||||
|
vec4 v5a = { 0.0f, 1.0f, 0.0f, 0.0f };
|
||||||
|
|
||||||
|
mat4s m4 = glms_rotate(m3, M_PI_2,
|
||||||
|
vec3_cross(vec3_add(v1, v6)
|
||||||
|
vec3_add(v1, v7)));
|
||||||
|
|
||||||
|
v1.x = 1.0f; v1.y = 0.0f; v1.z = 0.0f;
|
||||||
|
// or
|
||||||
|
v1.raw[0] = 1.0f; v1.raw[1] = 0.0f; v1.raw[2] = 0.0f;
|
||||||
|
|
||||||
|
/* use struct api with array api (mix them) */
|
||||||
|
glm_vec4_add(m4.col[0].raw, v5a, m4.col[0].raw);
|
||||||
|
glm_mat4_mulv(m4.raw, v4.raw, v5a);
|
||||||
|
|
||||||
|
Configuring the Struct API:
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
To configure the Struct API namespace, you can define the following macros before including the cglm/struct.h header:
|
||||||
|
|
||||||
|
- **CGLM_OMIT_NS_FROM_STRUCT_API**: omits CGLM_STRUCT_API_NS (`glms_`) namespace completely if there is sub namespace e.g `mat4_`, `vec4_` ... DEFAULT is not defined
|
||||||
|
- **CGLM_STRUCT_API_NS**: define name space for struct api, DEFAULT is **glms**
|
||||||
|
- **CGLM_STRUCT_API_NAME_SUFFIX**: define name suffix, DEFAULT is **empty** e.g defining it as #define CGLM_STRUCT_API_NAME_SUFFIX s will add s suffix to mat4_mul -> mat4s_mul
|
||||||
|
|
||||||
|
|
||||||
|
Detailed documentation for Struct API:
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Since struct api if built top of array api, see array api functions for more information about individual functions.
|
||||||
@@ -62,16 +62,16 @@ author = u'Recep Aslantas'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = u'0.9.0'
|
version = u'0.9.1'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = u'0.9.0'
|
release = u'0.9.1'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
#
|
#
|
||||||
# This is also used if you do content translation via gettext catalogs.
|
# This is also used if you do content translation via gettext catalogs.
|
||||||
# Usually you set "language" from the command line for these cases.
|
# Usually you set "language" from the command line for these cases.
|
||||||
language = None
|
language = 'en'
|
||||||
|
|
||||||
# List of patterns, relative to source directory, that match files and
|
# List of patterns, relative to source directory, that match files and
|
||||||
# directories to ignore when looking for source files.
|
# directories to ignore when looking for source files.
|
||||||
@@ -111,7 +111,7 @@ html_theme_options = {
|
|||||||
# Add any paths that contain custom static files (such as style sheets) here,
|
# Add any paths that contain custom static files (such as style sheets) here,
|
||||||
# relative to this directory. They are copied after the builtin static files,
|
# relative to this directory. They are copied after the builtin static files,
|
||||||
# so a file named "default.css" will overwrite the builtin "default.css".
|
# so a file named "default.css" will overwrite the builtin "default.css".
|
||||||
html_static_path = ['_static']
|
# html_static_path = ['_static']
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTMLHelp output ------------------------------------------
|
# -- Options for HTMLHelp output ------------------------------------------
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
Features
|
Features
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
* **scalar** and **simd** (sse, avx, neon...) optimizations
|
* **scalar** and **simd** (sse, avx, neon, wasm...) optimizations
|
||||||
* option to use different clipspaces e.g. Left Handed, Zero-to-One... (currrently right handed negative-one is default)
|
* option to use different clipspaces e.g. Left Handed, Zero-to-One... (currrently right handed negative-one is default)
|
||||||
* array api and struct api, you can use arrays or structs.
|
* array api and struct api, you can use arrays or structs.
|
||||||
* general purpose matrix operations (mat4, mat3)
|
* general purpose matrix operations (mat4, mat3)
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ considered to be supported as optional.
|
|||||||
opengl
|
opengl
|
||||||
|
|
||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 2
|
:maxdepth: 3
|
||||||
:caption: API:
|
:caption: API:
|
||||||
|
|
||||||
api
|
api
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ Functions:
|
|||||||
#. :c:func:`glm_mat2_swap_col`
|
#. :c:func:`glm_mat2_swap_col`
|
||||||
#. :c:func:`glm_mat2_swap_row`
|
#. :c:func:`glm_mat2_swap_row`
|
||||||
#. :c:func:`glm_mat2_rmc`
|
#. :c:func:`glm_mat2_rmc`
|
||||||
|
#. :c:func:`glm_mat2_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -177,3 +178,13 @@ Functions documentation
|
|||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
scalar value e.g. Matrix1x1
|
scalar value e.g. Matrix1x1
|
||||||
|
|
||||||
|
.. c:function:: void glm_mat2_make(float * __restrict src, mat2 dest)
|
||||||
|
|
||||||
|
Create mat2 matrix from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain 4 elements.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination matrix2x2
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ Functions:
|
|||||||
#. :c:func:`glm_mat3_swap_col`
|
#. :c:func:`glm_mat3_swap_col`
|
||||||
#. :c:func:`glm_mat3_swap_row`
|
#. :c:func:`glm_mat3_swap_row`
|
||||||
#. :c:func:`glm_mat3_rmc`
|
#. :c:func:`glm_mat3_rmc`
|
||||||
|
#. :c:func:`glm_mat3_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -187,3 +188,13 @@ Functions documentation
|
|||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
scalar value e.g. Matrix1x1
|
scalar value e.g. Matrix1x1
|
||||||
|
|
||||||
|
.. c:function:: void glm_mat3_make(float * __restrict src, mat3 dest)
|
||||||
|
|
||||||
|
Create mat3 matrix from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain 9 elements.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination matrix3x3
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ Functions:
|
|||||||
#. :c:func:`glm_mat4_swap_col`
|
#. :c:func:`glm_mat4_swap_col`
|
||||||
#. :c:func:`glm_mat4_swap_row`
|
#. :c:func:`glm_mat4_swap_row`
|
||||||
#. :c:func:`glm_mat4_rmc`
|
#. :c:func:`glm_mat4_rmc`
|
||||||
|
#. :c:func:`glm_mat4_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -302,3 +303,13 @@ Functions documentation
|
|||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
scalar value e.g. Matrix1x1
|
scalar value e.g. Matrix1x1
|
||||||
|
|
||||||
|
.. c:function:: void glm_mat4_make(float * __restrict src, mat4 dest)
|
||||||
|
|
||||||
|
Create mat4 matrix from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain 16 elements.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination matrix4x4
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.. default-domain:: C
|
.. default-domain:: C
|
||||||
|
|
||||||
Options
|
🛠️ Options
|
||||||
===============================================================================
|
===============================================================================
|
||||||
|
|
||||||
A few options are provided via macros.
|
A few options are provided via macros.
|
||||||
@@ -90,6 +90,16 @@ You have to extra options for dot product: **CGLM_SSE4_DOT** and **CGLM_SSE3_DOT
|
|||||||
|
|
||||||
otherwise cglm will use custom cglm's hadd functions which are optimized too.
|
otherwise cglm will use custom cglm's hadd functions which are optimized too.
|
||||||
|
|
||||||
|
Struct API Options
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
To configure the Struct API namespace, you can define the following macros before including the cglm/struct.h header:
|
||||||
|
|
||||||
|
- **CGLM_OMIT_NS_FROM_STRUCT_API**: omits CGLM_STRUCT_API_NS (`glms_`) namespace completely if there is sub namespace e.g `mat4_`, `vec4_` ... DEFAULT is not defined
|
||||||
|
- **CGLM_STRUCT_API_NS**: define name space for struct api, DEFAULT is **glms**
|
||||||
|
- **CGLM_STRUCT_API_NAME_SUFFIX**: define name suffix, DEFAULT is **empty** e.g defining it as #define CGLM_STRUCT_API_NAME_SUFFIX s will add s suffix to mat4_mul -> mat4s_mul
|
||||||
|
|
||||||
|
|
||||||
Print Options
|
Print Options
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ Functions:
|
|||||||
#. :c:func:`glm_quat_rotate`
|
#. :c:func:`glm_quat_rotate`
|
||||||
#. :c:func:`glm_quat_rotate_at`
|
#. :c:func:`glm_quat_rotate_at`
|
||||||
#. :c:func:`glm_quat_rotate_atm`
|
#. :c:func:`glm_quat_rotate_atm`
|
||||||
|
#. :c:func:`glm_quat_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -420,3 +421,13 @@ Functions documentation
|
|||||||
| *[in, out]* **m** existing transform matrix to rotate
|
| *[in, out]* **m** existing transform matrix to rotate
|
||||||
| *[in]* **q** quaternion
|
| *[in]* **q** quaternion
|
||||||
| *[in]* **pivot** pivot
|
| *[in]* **pivot** pivot
|
||||||
|
|
||||||
|
.. c:function:: void glm_quat_make(float * __restrict src, versor dest)
|
||||||
|
|
||||||
|
Create quaternion from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain at least 4 elements. cglm store quaternions as [x, y, z, w].
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination quaternion
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ Functions:
|
|||||||
#. :c:func:`glm_vec2_minv`
|
#. :c:func:`glm_vec2_minv`
|
||||||
#. :c:func:`glm_vec2_clamp`
|
#. :c:func:`glm_vec2_clamp`
|
||||||
#. :c:func:`glm_vec2_lerp`
|
#. :c:func:`glm_vec2_lerp`
|
||||||
|
#. :c:func:`glm_vec2_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -373,3 +374,12 @@ Functions documentation
|
|||||||
| *[in]* **to** to value
|
| *[in]* **to** to value
|
||||||
| *[in]* **t** interpolant (amount) clamped between 0 and 1
|
| *[in]* **t** interpolant (amount) clamped between 0 and 1
|
||||||
| *[out]* **dest** destination
|
| *[out]* **dest** destination
|
||||||
|
|
||||||
|
.. c:function:: void glm_vec2_make(float * __restrict src, vec2 dest)
|
||||||
|
|
||||||
|
Create two dimensional vector from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain at least 2 elements.
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination vector
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ Functions:
|
|||||||
#. :c:func:`glm_vec3_ortho`
|
#. :c:func:`glm_vec3_ortho`
|
||||||
#. :c:func:`glm_vec3_clamp`
|
#. :c:func:`glm_vec3_clamp`
|
||||||
#. :c:func:`glm_vec3_lerp`
|
#. :c:func:`glm_vec3_lerp`
|
||||||
|
#. :c:func:`glm_vec3_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -501,3 +502,13 @@ Functions documentation
|
|||||||
| *[in]* **to** to value
|
| *[in]* **to** to value
|
||||||
| *[in]* **t** interpolant (amount) clamped between 0 and 1
|
| *[in]* **t** interpolant (amount) clamped between 0 and 1
|
||||||
| *[out]* **dest** destination
|
| *[out]* **dest** destination
|
||||||
|
|
||||||
|
.. c:function:: void glm_vec3_make(float * __restrict src, vec3 dest)
|
||||||
|
|
||||||
|
Create three dimensional vector from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain at least 3 elements.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination vector
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ Functions:
|
|||||||
#. :c:func:`glm_vec4_clamp`
|
#. :c:func:`glm_vec4_clamp`
|
||||||
#. :c:func:`glm_vec4_lerp`
|
#. :c:func:`glm_vec4_lerp`
|
||||||
#. :c:func:`glm_vec4_cubic`
|
#. :c:func:`glm_vec4_cubic`
|
||||||
|
#. :c:func:`glm_vec4_make`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -406,3 +407,12 @@ Functions documentation
|
|||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **s** parameter
|
| *[in]* **s** parameter
|
||||||
| *[out]* **dest** destination
|
| *[out]* **dest** destination
|
||||||
|
|
||||||
|
.. c:function:: void glm_vec4_make(float * __restrict src, vec4 dest)
|
||||||
|
|
||||||
|
Create four dimensional vector from pointer
|
||||||
|
|
||||||
|
| NOTE: **@src** must contain at least 4 elements.
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **src** pointer to an array of floats
|
||||||
|
| *[out]* **dest** destination vector
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
/*
|
/*
|
||||||
Functions:
|
Functions:
|
||||||
CGLM_INLINE void glm_mul(mat4 m1, mat4 m2, mat4 dest);
|
CGLM_INLINE void glm_mul(mat4 m1, mat4 m2, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_mul_rot(mat4 m1, mat4 m2, mat4 dest);
|
||||||
CGLM_INLINE void glm_inv_tr(mat4 mat);
|
CGLM_INLINE void glm_inv_tr(mat4 mat);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
#define GLM_HERMITE_MAT ((mat4)GLM_HERMITE_MAT_INIT)
|
#define GLM_HERMITE_MAT ((mat4)GLM_HERMITE_MAT_INIT)
|
||||||
|
|
||||||
#define CGLM_DECASTEL_EPS 1e-9f
|
#define CGLM_DECASTEL_EPS 1e-9f
|
||||||
#define CGLM_DECASTEL_MAX 1000.0f
|
#define CGLM_DECASTEL_MAX 1000
|
||||||
#define CGLM_DECASTEL_SMALL 1e-20f
|
#define CGLM_DECASTEL_SMALL 1e-20f
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -73,6 +73,10 @@ CGLM_EXPORT
|
|||||||
float
|
float
|
||||||
glmc_mat2_rmc(vec2 r, mat2 m, vec2 c);
|
glmc_mat2_rmc(vec2 r, mat2 m, vec2 c);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_mat2_make(float * __restrict src, mat2 dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -80,6 +80,10 @@ CGLM_EXPORT
|
|||||||
float
|
float
|
||||||
glmc_mat3_rmc(vec3 r, mat3 m, vec3 c);
|
glmc_mat3_rmc(vec3 r, mat3 m, vec3 c);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_mat3_make(float * __restrict src, mat3 dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -121,6 +121,10 @@ CGLM_EXPORT
|
|||||||
float
|
float
|
||||||
glmc_mat4_rmc(vec4 r, mat4 m, vec4 c);
|
glmc_mat4_rmc(vec4 r, mat4 m, vec4 c);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_mat4_make(float * __restrict src, mat4 dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -161,6 +161,10 @@ CGLM_EXPORT
|
|||||||
void
|
void
|
||||||
glmc_quat_rotate_atm(mat4 m, versor q, vec3 pivot);
|
glmc_quat_rotate_atm(mat4 m, versor q, vec3 pivot);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_quat_make(float * __restrict src, versor dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -165,6 +165,10 @@ CGLM_EXPORT
|
|||||||
void
|
void
|
||||||
glmc_vec2_complex_conjugate(vec2 a, vec2 dest);
|
glmc_vec2_complex_conjugate(vec2 a, vec2 dest);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_vec2_make(float * __restrict src, vec2 dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -306,6 +306,10 @@ CGLM_EXPORT
|
|||||||
void
|
void
|
||||||
glmc_vec3_sqrt(vec3 v, vec3 dest);
|
glmc_vec3_sqrt(vec3 v, vec3 dest);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_vec3_make(float * __restrict src, vec3 dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -283,6 +283,10 @@ CGLM_EXPORT
|
|||||||
void
|
void
|
||||||
glmc_vec4_sqrt(vec4 v, vec4 dest);
|
glmc_vec4_sqrt(vec4 v, vec4 dest);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_vec4_make(float * __restrict src, vec4 dest);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
CGLM_INLINE void glm_vec3_print(vec3 vec, FILE *ostream);
|
CGLM_INLINE void glm_vec3_print(vec3 vec, FILE *ostream);
|
||||||
CGLM_INLINE void glm_ivec3_print(ivec3 vec, FILE *ostream);
|
CGLM_INLINE void glm_ivec3_print(ivec3 vec, FILE *ostream);
|
||||||
CGLM_INLINE void glm_versor_print(versor vec, FILE *ostream);
|
CGLM_INLINE void glm_versor_print(versor vec, FILE *ostream);
|
||||||
|
CGLM_INLINE void glm_arch_print(FILE *ostream);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -52,12 +53,20 @@
|
|||||||
# define CGLM_PRINT_MAX_TO_SHORT 1e5f
|
# define CGLM_PRINT_MAX_TO_SHORT 1e5f
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CGLM_PRINT_COLOR
|
#ifndef GLM_TESTS_NO_COLORFUL_OUTPUT
|
||||||
|
# ifndef CGLM_PRINT_COLOR
|
||||||
# define CGLM_PRINT_COLOR "\033[36m"
|
# define CGLM_PRINT_COLOR "\033[36m"
|
||||||
#endif
|
# endif
|
||||||
|
# ifndef CGLM_PRINT_COLOR_RESET
|
||||||
#ifndef CGLM_PRINT_COLOR_RESET
|
|
||||||
# define CGLM_PRINT_COLOR_RESET "\033[0m"
|
# define CGLM_PRINT_COLOR_RESET "\033[0m"
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# ifndef CGLM_PRINT_COLOR
|
||||||
|
# define CGLM_PRINT_COLOR
|
||||||
|
# endif
|
||||||
|
# ifndef CGLM_PRINT_COLOR_RESET
|
||||||
|
# define CGLM_PRINT_COLOR_RESET
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -67,26 +76,40 @@
|
|||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_arch_print_name(FILE* __restrict ostream) {
|
glm_arch_print(FILE* __restrict ostream) {
|
||||||
|
fprintf(ostream, CGLM_PRINT_COLOR "arch: "
|
||||||
#if defined(CGLM_SIMD_WASM)
|
#if defined(CGLM_SIMD_WASM)
|
||||||
fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: wasm SIMD128"
|
"wasm SIMD128"
|
||||||
"\n\n" CGLM_PRINT_COLOR_RESET);
|
|
||||||
#elif defined(CGLM_SIMD_x86)
|
#elif defined(CGLM_SIMD_x86)
|
||||||
fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: x86 SSE*"
|
"x86 SSE* "
|
||||||
#ifdef __AVX__
|
# ifdef __AVX__
|
||||||
" AVX"
|
" AVX"
|
||||||
#endif
|
# endif
|
||||||
"\n\n" CGLM_PRINT_COLOR_RESET);
|
|
||||||
#elif defined(CGLM_SIMD_ARM)
|
#elif defined(CGLM_SIMD_ARM)
|
||||||
fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: arm"
|
"arm"
|
||||||
#ifndef __ARM_NEON_FP
|
# ifndef __ARM_NEON_FP
|
||||||
" NEON_FP"
|
" NEON_FP"
|
||||||
#endif
|
# endif
|
||||||
#ifdef CGLM_ARM64
|
# ifdef CGLM_ARM64
|
||||||
" ARM64"
|
" ARM64"
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
"uncommon"
|
||||||
#endif
|
#endif
|
||||||
"\n\n" CGLM_PRINT_COLOR_RESET);
|
CGLM_PRINT_COLOR_RESET);
|
||||||
#endif
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief prints current SIMD path in general
|
||||||
|
*
|
||||||
|
* @param[in] ostream stream to print e.g. stdout, stderr, FILE ...
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_arch_print_name(FILE* __restrict ostream) {
|
||||||
|
fprintf(ostream, CGLM_PRINT_COLOR "\ncglm ");
|
||||||
|
glm_arch_print(ostream);
|
||||||
|
fprintf(ostream, "\n\n" CGLM_PRINT_COLOR_RESET);
|
||||||
}
|
}
|
||||||
|
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
@@ -369,6 +392,8 @@ glm_aabb_print(vec3 bbox[2],
|
|||||||
#define glm_vec2_print(v, s) (void)v; (void)s;
|
#define glm_vec2_print(v, s) (void)v; (void)s;
|
||||||
#define glm_versor_print(v, s) (void)v; (void)s;
|
#define glm_versor_print(v, s) (void)v; (void)s;
|
||||||
#define glm_aabb_print(v, t, s) (void)v; (void)t; (void)s;
|
#define glm_aabb_print(v, t, s) (void)v; (void)t; (void)s;
|
||||||
|
#define glm_arch_print(s) (void)s;
|
||||||
|
#define glm_arch_print_name(s) (void)s;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif /* cglm_io_h */
|
#endif /* cglm_io_h */
|
||||||
|
|||||||
@@ -28,6 +28,7 @@
|
|||||||
CGLM_INLINE void glm_mat2_swap_col(mat2 mat, int col1, int col2)
|
CGLM_INLINE void glm_mat2_swap_col(mat2 mat, int col1, int col2)
|
||||||
CGLM_INLINE void glm_mat2_swap_row(mat2 mat, int row1, int row2)
|
CGLM_INLINE void glm_mat2_swap_row(mat2 mat, int row1, int row2)
|
||||||
CGLM_INLINE float glm_mat2_rmc(vec2 r, mat2 m, vec2 c)
|
CGLM_INLINE float glm_mat2_rmc(vec2 r, mat2 m, vec2 c)
|
||||||
|
CGLM_INLINE void glm_mat2_make(float * restrict src, mat2 dest)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglm_mat2_h
|
#ifndef cglm_mat2_h
|
||||||
@@ -345,4 +346,19 @@ glm_mat2_rmc(vec2 r, mat2 m, vec2 c) {
|
|||||||
return glm_vec2_dot(r, tmp);
|
return glm_vec2_dot(r, tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create mat2 matrix from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_mat2_make(float * __restrict src, mat2 dest) {
|
||||||
|
dest[0][0] = src[0];
|
||||||
|
dest[0][1] = src[1];
|
||||||
|
dest[1][0] = src[2];
|
||||||
|
dest[1][1] = src[3];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_mat2_h */
|
#endif /* cglm_mat2_h */
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
CGLM_INLINE void glm_mat3_swap_col(mat3 mat, int col1, int col2);
|
CGLM_INLINE void glm_mat3_swap_col(mat3 mat, int col1, int col2);
|
||||||
CGLM_INLINE void glm_mat3_swap_row(mat3 mat, int row1, int row2);
|
CGLM_INLINE void glm_mat3_swap_row(mat3 mat, int row1, int row2);
|
||||||
CGLM_INLINE float glm_mat3_rmc(vec3 r, mat3 m, vec3 c);
|
CGLM_INLINE float glm_mat3_rmc(vec3 r, mat3 m, vec3 c);
|
||||||
|
CGLM_INLINE void glm_mat3_make(float * restrict src, mat3 dest);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglm_mat3_h
|
#ifndef cglm_mat3_h
|
||||||
@@ -427,4 +428,26 @@ glm_mat3_rmc(vec3 r, mat3 m, vec3 c) {
|
|||||||
return glm_vec3_dot(r, tmp);
|
return glm_vec3_dot(r, tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create mat3 matrix from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_mat3_make(float * __restrict src, mat3 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];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_mat3_h */
|
#endif /* cglm_mat3_h */
|
||||||
|
|||||||
@@ -43,6 +43,7 @@
|
|||||||
CGLM_INLINE void glm_mat4_swap_col(mat4 mat, int col1, int col2);
|
CGLM_INLINE void glm_mat4_swap_col(mat4 mat, int col1, int col2);
|
||||||
CGLM_INLINE void glm_mat4_swap_row(mat4 mat, int row1, int row2);
|
CGLM_INLINE void glm_mat4_swap_row(mat4 mat, int row1, int row2);
|
||||||
CGLM_INLINE float glm_mat4_rmc(vec4 r, mat4 m, vec4 c);
|
CGLM_INLINE float glm_mat4_rmc(vec4 r, mat4 m, vec4 c);
|
||||||
|
CGLM_INLINE void glm_mat4_make(float * restrict src, mat4 dest);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglm_mat_h
|
#ifndef cglm_mat_h
|
||||||
@@ -781,4 +782,24 @@ glm_mat4_rmc(vec4 r, mat4 m, vec4 c) {
|
|||||||
return glm_vec4_dot(r, tmp);
|
return glm_vec4_dot(r, tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create mat4 matrix from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_mat4_make(float * __restrict src, mat4 dest) {
|
||||||
|
dest[0][0] = src[0]; dest[1][0] = src[4];
|
||||||
|
dest[0][1] = src[1]; dest[1][1] = src[5];
|
||||||
|
dest[0][2] = src[2]; dest[1][2] = src[6];
|
||||||
|
dest[0][3] = src[3]; dest[1][3] = src[7];
|
||||||
|
|
||||||
|
dest[2][0] = src[8]; dest[3][0] = src[12];
|
||||||
|
dest[2][1] = src[9]; dest[3][1] = src[13];
|
||||||
|
dest[2][2] = src[10]; dest[3][2] = src[14];
|
||||||
|
dest[2][3] = src[11]; dest[3][3] = src[15];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_mat_h */
|
#endif /* cglm_mat_h */
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
versor dest);
|
versor dest);
|
||||||
CGLM_INLINE void glm_quat_rotatev(versor q, vec3 v, vec3 dest);
|
CGLM_INLINE void glm_quat_rotatev(versor q, vec3 v, vec3 dest);
|
||||||
CGLM_INLINE void glm_quat_rotate(mat4 m, versor q, mat4 dest);
|
CGLM_INLINE void glm_quat_rotate(mat4 m, versor q, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_quat_make(float * restrict src, versor dest);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglm_quat_h
|
#ifndef cglm_quat_h
|
||||||
@@ -885,4 +886,17 @@ glm_quat_rotate_atm(mat4 m, versor q, vec3 pivot) {
|
|||||||
glm_translate(m, pivotInv);
|
glm_translate(m, pivotInv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create quaternion from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest quaternion
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_quat_make(float * __restrict src, versor dest) {
|
||||||
|
dest[0] = src[0]; dest[1] = src[1];
|
||||||
|
dest[2] = src[2]; dest[3] = src[3];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_quat_h */
|
#endif /* cglm_quat_h */
|
||||||
|
|||||||
@@ -52,6 +52,10 @@ glmm_float32x4_init(float x, float y, float z, float w) {
|
|||||||
# define glmm_float32x4_init(x, y, z, w) { x, y, z, w }
|
# define glmm_float32x4_init(x, y, z, w) { x, y, z, w }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define glmm_float32x4_SIGNMASK_PNPN glmm_float32x4_init( 0.f, -0.f, 0.f, -0.f)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NPNP glmm_float32x4_init(-0.f, 0.f, -0.f, 0.f)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NPPN glmm_float32x4_init(-0.f, 0.f, 0.f, -0.f)
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
float32x4_t
|
float32x4_t
|
||||||
glmm_abs(float32x4_t v) {
|
glmm_abs(float32x4_t v) {
|
||||||
|
|||||||
@@ -99,7 +99,6 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* WebAssembly */
|
/* WebAssembly */
|
||||||
#if defined(__wasm__) && defined(__wasm_simd128__)
|
#if defined(__wasm__) && defined(__wasm_simd128__)
|
||||||
# ifndef CGLM_SIMD_WASM
|
# ifndef CGLM_SIMD_WASM
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ glm_mat4_det_neon(mat4 mat) {
|
|||||||
float32x4_t r0, r1, r2, r3, x0, x1, x2;
|
float32x4_t r0, r1, r2, r3, x0, x1, x2;
|
||||||
float32x2_t ij, op, mn, kl, nn, mm, jj, ii, gh, ef, t12, t34;
|
float32x2_t ij, op, mn, kl, nn, mm, jj, ii, gh, ef, t12, t34;
|
||||||
float32x4x2_t a1;
|
float32x4x2_t a1;
|
||||||
float32x4_t x3 = glmm_float32x4_init(0.f, -0.f, 0.f, -0.f);
|
float32x4_t x3 = glmm_float32x4_SIGNMASK_PNPN;
|
||||||
|
|
||||||
/* 127 <- 0, [square] det(A) = det(At) */
|
/* 127 <- 0, [square] det(A) = det(At) */
|
||||||
r0 = glmm_load(mat[0]); /* d c b a */
|
r0 = glmm_load(mat[0]); /* d c b a */
|
||||||
@@ -181,7 +181,7 @@ glm_mat4_inv_neon(mat4 mat, mat4 dest) {
|
|||||||
x0, x1, x2, x3, x4, x5, x6, x7, x8;
|
x0, x1, x2, x3, x4, x5, x6, x7, x8;
|
||||||
float32x4x2_t a1;
|
float32x4x2_t a1;
|
||||||
float32x2_t lp, ko, hg, jn, im, fe, ae, bf, cg, dh;
|
float32x2_t lp, ko, hg, jn, im, fe, ae, bf, cg, dh;
|
||||||
float32x4_t x9 = glmm_float32x4_init(-0.f, 0.f, -0.f, 0.f);
|
float32x4_t x9 = glmm_float32x4_SIGNMASK_NPNP;
|
||||||
|
|
||||||
x8 = vrev64q_f32(x9);
|
x8 = vrev64q_f32(x9);
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ glm_quat_mul_neon(versor p, versor q, versor dest) {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
glmm_128 xp, xq, xqr, r, x, y, z, s2, s3;
|
glmm_128 xp, xq, xqr, r, x, y, z, s2, s3;
|
||||||
glmm_128 s1 = glmm_float32x4_init(-0.f, 0.f, 0.f, -0.f);
|
glmm_128 s1 = glmm_float32x4_SIGNMASK_NPPN;
|
||||||
|
|
||||||
float32x2_t qh, ql;
|
float32x2_t qh, ql;
|
||||||
|
|
||||||
xp = glmm_load(p); /* 3 2 1 0 */
|
xp = glmm_load(p); /* 3 2 1 0 */
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ glm_inv_tr_sse2(mat4 mat) {
|
|||||||
x2 = glmm_shuff1(r3, 0, 0, 0, 0);
|
x2 = glmm_shuff1(r3, 0, 0, 0, 0);
|
||||||
x3 = glmm_shuff1(r3, 1, 1, 1, 1);
|
x3 = glmm_shuff1(r3, 1, 1, 1, 1);
|
||||||
x4 = glmm_shuff1(r3, 2, 2, 2, 2);
|
x4 = glmm_shuff1(r3, 2, 2, 2, 2);
|
||||||
x5 = _mm_set1_ps(-0.f);
|
x5 = glmm_float32x4_SIGNMASK_NEG;
|
||||||
|
|
||||||
x0 = glmm_fmadd(r0, x2, glmm_fmadd(r1, x3, _mm_mul_ps(r2, x4)));
|
x0 = glmm_fmadd(r0, x2, glmm_fmadd(r1, x3, _mm_mul_ps(r2, x4)));
|
||||||
x0 = _mm_xor_ps(x0, x5);
|
x0 = _mm_xor_ps(x0, x5);
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ glm_mat4_det_sse2(mat4 mat) {
|
|||||||
_mm_shuffle_ps(x0, x1, _MM_SHUFFLE(2, 2, 3, 1)),
|
_mm_shuffle_ps(x0, x1, _MM_SHUFFLE(2, 2, 3, 1)),
|
||||||
x2);
|
x2);
|
||||||
|
|
||||||
x2 = _mm_xor_ps(x2, _mm_set_ps(-0.f, 0.f, -0.f, 0.f));
|
x2 = _mm_xor_ps(x2, glmm_float32x4_SIGNMASK_NPNP);
|
||||||
|
|
||||||
return glmm_hadd(_mm_mul_ps(x2, r0));
|
return glmm_hadd(_mm_mul_ps(x2, r0));
|
||||||
}
|
}
|
||||||
@@ -166,7 +166,8 @@ glm_mat4_inv_fast_sse2(mat4 mat, mat4 dest) {
|
|||||||
t0, t1, t2, t3, t4, t5,
|
t0, t1, t2, t3, t4, t5,
|
||||||
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
||||||
|
|
||||||
x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f);
|
/* x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f); */
|
||||||
|
x8 = glmm_float32x4_SIGNMASK_NPNP;
|
||||||
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
||||||
|
|
||||||
/* 127 <- 0 */
|
/* 127 <- 0 */
|
||||||
@@ -302,7 +303,8 @@ glm_mat4_inv_sse2(mat4 mat, mat4 dest) {
|
|||||||
t0, t1, t2, t3, t4, t5,
|
t0, t1, t2, t3, t4, t5,
|
||||||
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
||||||
|
|
||||||
x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f);
|
/* x8 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f); */
|
||||||
|
x8 = glmm_float32x4_SIGNMASK_NPNP;
|
||||||
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
||||||
|
|
||||||
/* 127 <- 0 */
|
/* 127 <- 0 */
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ glm_quat_mul_sse2(versor p, versor q, versor dest) {
|
|||||||
|
|
||||||
xp = glmm_load(p); /* 3 2 1 0 */
|
xp = glmm_load(p); /* 3 2 1 0 */
|
||||||
xq = glmm_load(q);
|
xq = glmm_load(q);
|
||||||
x1 = _mm_set_ps(-0.f, 0.f, -0.f, 0.f); /* TODO: _mm_set1_ss() + shuff ? */
|
x1 = glmm_float32x4_SIGNMASK_NPNP; /* TODO: _mm_set1_ss() + shuff ? */
|
||||||
r = _mm_mul_ps(glmm_splat_w(xp), xq);
|
r = _mm_mul_ps(glmm_splat_w(xp), xq);
|
||||||
|
|
||||||
x2 = _mm_unpackhi_ps(x1, x1);
|
x2 = _mm_unpackhi_ps(x1, x1);
|
||||||
|
|||||||
@@ -26,6 +26,16 @@
|
|||||||
#define glmm_splat_z(x) glmm_splat(x, 2)
|
#define glmm_splat_z(x) glmm_splat(x, 2)
|
||||||
#define glmm_splat_w(x) glmm_splat(x, 3)
|
#define glmm_splat_w(x) glmm_splat(x, 3)
|
||||||
|
|
||||||
|
#define GLMM_NEGZEROf 0x80000000 /* 0x80000000 ---> -0.0f */
|
||||||
|
|
||||||
|
/* _mm_set_ps(X, Y, Z, W); */
|
||||||
|
#define GLMM__SIGNMASKf(X, Y, Z, W) wasm_i32x4_const(X, Y, Z, W)
|
||||||
|
|
||||||
|
#define glmm_float32x4_SIGNMASK_PNPN GLMM__SIGNMASKf(0, GLMM_NEGZEROf, 0, GLMM_NEGZEROf)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NPNP GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, GLMM_NEGZEROf, 0)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NPPN GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, 0, GLMM_NEGZEROf)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NEG wasm_i32x4_const_splat(GLMM_NEGZEROf)
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
glmm_128
|
glmm_128
|
||||||
glmm_abs(glmm_128 x) {
|
glmm_abs(glmm_128 x) {
|
||||||
|
|||||||
@@ -164,8 +164,8 @@ glm_mat4_det_wasm(mat4 mat) {
|
|||||||
x2 = glmm_fmadd(glmm_shuff1(r1, 2, 3, 3, 3),
|
x2 = glmm_fmadd(glmm_shuff1(r1, 2, 3, 3, 3),
|
||||||
wasm_i32x4_shuffle(x0, x1, 1, 3, 6, 6),
|
wasm_i32x4_shuffle(x0, x1, 1, 3, 6, 6),
|
||||||
x2);
|
x2);
|
||||||
|
/* x2 = wasm_v128_xor(x2, wasm_f32x4_const(0.f, -0.f, 0.f, -0.f)); */
|
||||||
x2 = wasm_v128_xor(x2, wasm_f32x4_const(0.f, -0.f, 0.f, -0.f));
|
x2 = wasm_v128_xor(x2, glmm_float32x4_SIGNMASK_PNPN);
|
||||||
|
|
||||||
return glmm_hadd(wasm_f32x4_mul(x2, r0));
|
return glmm_hadd(wasm_f32x4_mul(x2, r0));
|
||||||
}
|
}
|
||||||
@@ -178,7 +178,8 @@ glm_mat4_inv_fast_wasm(mat4 mat, mat4 dest) {
|
|||||||
t0, t1, t2, t3, t4, t5,
|
t0, t1, t2, t3, t4, t5,
|
||||||
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
||||||
|
|
||||||
x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f);
|
/* x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); */
|
||||||
|
x8 = glmm_float32x4_SIGNMASK_PNPN;
|
||||||
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
||||||
|
|
||||||
/* 127 <- 0 */
|
/* 127 <- 0 */
|
||||||
@@ -318,7 +319,8 @@ glm_mat4_inv_wasm(mat4 mat, mat4 dest) {
|
|||||||
t0, t1, t2, t3, t4, t5,
|
t0, t1, t2, t3, t4, t5,
|
||||||
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
x0, x1, x2, x3, x4, x5, x6, x7, x8, x9;
|
||||||
|
|
||||||
x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f);
|
/* x8 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); */
|
||||||
|
x8 = glmm_float32x4_SIGNMASK_PNPN;
|
||||||
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
x9 = glmm_shuff1(x8, 2, 1, 2, 1);
|
||||||
|
|
||||||
/* 127 <- 0 */
|
/* 127 <- 0 */
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ glm_quat_mul_wasm(versor p, versor q, versor dest) {
|
|||||||
|
|
||||||
xp = glmm_load(p); /* 3 2 1 0 */
|
xp = glmm_load(p); /* 3 2 1 0 */
|
||||||
xq = glmm_load(q);
|
xq = glmm_load(q);
|
||||||
x1 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); /* TODO: _mm_set1_ss() + shuff ? */
|
/* x1 = wasm_f32x4_const(0.f, -0.f, 0.f, -0.f); */
|
||||||
|
x1 = glmm_float32x4_SIGNMASK_PNPN; /* TODO: _mm_set1_ss() + shuff ? */
|
||||||
r = wasm_f32x4_mul(glmm_splat_w(xp), xq);
|
r = wasm_f32x4_mul(glmm_splat_w(xp), xq);
|
||||||
/* x2 = _mm_unpackhi_ps(x1, x1); */
|
/* x2 = _mm_unpackhi_ps(x1, x1); */
|
||||||
x2 = wasm_i32x4_shuffle(x1, x1, 2, 6, 3, 7);
|
x2 = wasm_i32x4_shuffle(x1, x1, 2, 6, 3, 7);
|
||||||
|
|||||||
@@ -54,10 +54,24 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Note that `0x80000000` corresponds to `INT_MIN` for a 32-bit int. */
|
||||||
|
#define GLMM_NEGZEROf ((int)0x80000000) /* 0x80000000 ---> -0.0f */
|
||||||
|
|
||||||
|
#define GLMM__SIGNMASKf(X, Y, Z, W) \
|
||||||
|
_mm_castsi128_ps(_mm_set_epi32(X, Y, Z, W))
|
||||||
|
/* _mm_set_ps(X, Y, Z, W); */
|
||||||
|
|
||||||
|
#define glmm_float32x4_SIGNMASK_PNPN GLMM__SIGNMASKf(0, GLMM_NEGZEROf, 0, GLMM_NEGZEROf)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NPNP GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, GLMM_NEGZEROf, 0)
|
||||||
|
#define glmm_float32x4_SIGNMASK_NPPN GLMM__SIGNMASKf(GLMM_NEGZEROf, 0, 0, GLMM_NEGZEROf)
|
||||||
|
|
||||||
|
#define glmm_float32x4_SIGNMASK_NEG _mm_castsi128_ps(_mm_set1_epi32(GLMM_NEGZEROf)) /* _mm_set1_ps(-0.0f) */
|
||||||
|
#define glmm_float32x8_SIGNMASK_NEG _mm256_castsi256_ps(_mm256_set1_epi32(GLMM_NEGZEROf))
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
__m128
|
__m128
|
||||||
glmm_abs(__m128 x) {
|
glmm_abs(__m128 x) {
|
||||||
return _mm_andnot_ps(_mm_set1_ps(-0.0f), x);
|
return _mm_andnot_ps(glmm_float32x4_SIGNMASK_NEG, x);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
@@ -256,7 +270,8 @@ glmm_fnmsub(__m128 a, __m128 b, __m128 c) {
|
|||||||
#ifdef __FMA__
|
#ifdef __FMA__
|
||||||
return _mm_fnmsub_ps(a, b, c);
|
return _mm_fnmsub_ps(a, b, c);
|
||||||
#else
|
#else
|
||||||
return _mm_xor_ps(_mm_add_ps(_mm_mul_ps(a, b), c), _mm_set1_ps(-0.0f));
|
return _mm_xor_ps(_mm_add_ps(_mm_mul_ps(a, b), c),
|
||||||
|
glmm_float32x4_SIGNMASK_NEG);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -298,7 +313,7 @@ glmm256_fnmsub(__m256 a, __m256 b, __m256 c) {
|
|||||||
return _mm256_fmsub_ps(a, b, c);
|
return _mm256_fmsub_ps(a, b, c);
|
||||||
#else
|
#else
|
||||||
return _mm256_xor_ps(_mm256_sub_ps(_mm256_mul_ps(a, b), c),
|
return _mm256_xor_ps(_mm256_sub_ps(_mm256_mul_ps(a, b), c),
|
||||||
_mm256_set1_ps(-0.0f));
|
glmm_float32x8_SIGNMASK_NEG);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
90
include/cglm/struct/affine-mat.h
Normal file
90
include/cglm/struct/affine-mat.h
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Functions:
|
||||||
|
CGLM_INLINE mat4s glms_mul(mat4 m1, mat4 m2);
|
||||||
|
CGLM_INLINE mat4s glms_mul_rot(mat4 m1, mat4 m2);
|
||||||
|
CGLM_INLINE mat4s glms_inv_tr();
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cglms_affine_mat_h
|
||||||
|
#define cglms_affine_mat_h
|
||||||
|
|
||||||
|
#include "../common.h"
|
||||||
|
#include "../types-struct.h"
|
||||||
|
#include "../affine-mat.h"
|
||||||
|
#include "vec3.h"
|
||||||
|
#include "vec4.h"
|
||||||
|
#include "mat4.h"
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief this is similar to glms_mat4_mul but specialized to affine transform
|
||||||
|
*
|
||||||
|
* Matrix format should be:
|
||||||
|
* R R R X
|
||||||
|
* R R R Y
|
||||||
|
* R R R Z
|
||||||
|
* 0 0 0 W
|
||||||
|
*
|
||||||
|
* this reduces some multiplications. It should be faster than mat4_mul.
|
||||||
|
* if you are not sure about matrix format then DON'T use this! use mat4_mul
|
||||||
|
*
|
||||||
|
* @param[in] m1 affine matrix 1
|
||||||
|
* @param[in] m2 affine matrix 2
|
||||||
|
* @returns destination matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat4s
|
||||||
|
glms_mul(mat4s m1, mat4s m2){
|
||||||
|
mat4s r;
|
||||||
|
glm_mul(m1.raw, m2.raw, r.raw);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief this is similar to glm_mat4_mul but specialized to affine transform
|
||||||
|
*
|
||||||
|
* Right Matrix format should be:
|
||||||
|
* R R R 0
|
||||||
|
* R R R 0
|
||||||
|
* R R R 0
|
||||||
|
* 0 0 0 1
|
||||||
|
*
|
||||||
|
* this reduces some multiplications. It should be faster than mat4_mul.
|
||||||
|
* if you are not sure about matrix format then DON'T use this! use mat4_mul
|
||||||
|
*
|
||||||
|
* @param[in] m1 affine matrix 1
|
||||||
|
* @param[in] m2 affine matrix 2
|
||||||
|
* @returns destination matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat4s
|
||||||
|
glms_mul_rot(mat4s m1, mat4s m2){
|
||||||
|
mat4s r;
|
||||||
|
glm_mul_rot(m1.raw, m2.raw, r.raw);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief inverse orthonormal rotation + translation matrix (ridig-body)
|
||||||
|
*
|
||||||
|
* @code
|
||||||
|
* X = | R T | X' = | R' -R'T |
|
||||||
|
* | 0 1 | | 0 1 |
|
||||||
|
* @endcode
|
||||||
|
*
|
||||||
|
* @param[in] m matrix
|
||||||
|
* @returns destination matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat4s
|
||||||
|
glms_inv_tr(mat4s m){
|
||||||
|
glm_inv_tr(m.raw);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
#endif /* cglms_affine_mat_h */
|
||||||
@@ -39,6 +39,7 @@
|
|||||||
#include "vec3.h"
|
#include "vec3.h"
|
||||||
#include "vec4.h"
|
#include "vec4.h"
|
||||||
#include "mat4.h"
|
#include "mat4.h"
|
||||||
|
#include "affine-mat.h"
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief creates NEW translate transform matrix by v vector
|
* @brief creates NEW translate transform matrix by v vector
|
||||||
|
|||||||
@@ -31,9 +31,9 @@ glms_aabb_(transform)(vec3s box[2], mat4s m, vec3s dest[2]) {
|
|||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
vec3 rawDest[2];
|
vec3 rawDest[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_aabb_transform(rawBox, m.raw, rawDest);
|
glm_aabb_transform(rawBox, m.raw, rawDest);
|
||||||
glms_vec3_pack(dest, rawDest, 2);
|
glms_vec3_(pack)(dest, rawDest, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -53,10 +53,10 @@ glms_aabb_(merge)(vec3s box1[2], vec3s box2[2], vec3s dest[2]) {
|
|||||||
vec3 rawBox2[2];
|
vec3 rawBox2[2];
|
||||||
vec3 rawDest[2];
|
vec3 rawDest[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox1, box1, 2);
|
glms_vec3_(unpack)(rawBox1, box1, 2);
|
||||||
glms_vec3_unpack(rawBox2, box2, 2);
|
glms_vec3_(unpack)(rawBox2, box2, 2);
|
||||||
glm_aabb_merge(rawBox1, rawBox2, rawDest);
|
glm_aabb_merge(rawBox1, rawBox2, rawDest);
|
||||||
glms_vec3_pack(dest, rawDest, 2);
|
glms_vec3_(pack)(dest, rawDest, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -77,10 +77,10 @@ glms_aabb_(crop)(vec3s box[2], vec3s cropBox[2], vec3s dest[2]) {
|
|||||||
vec3 rawCropBox[2];
|
vec3 rawCropBox[2];
|
||||||
vec3 rawDest[2];
|
vec3 rawDest[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glms_vec3_unpack(rawCropBox, cropBox, 2);
|
glms_vec3_(unpack)(rawCropBox, cropBox, 2);
|
||||||
glm_aabb_crop(rawBox, rawCropBox, rawDest);
|
glm_aabb_crop(rawBox, rawCropBox, rawDest);
|
||||||
glms_vec3_pack(dest, rawDest, 2);
|
glms_vec3_(pack)(dest, rawDest, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -101,8 +101,8 @@ glms_aabb_(crop_until)(vec3s box[2],
|
|||||||
vec3s cropBox[2],
|
vec3s cropBox[2],
|
||||||
vec3s clampBox[2],
|
vec3s clampBox[2],
|
||||||
vec3s dest[2]) {
|
vec3s dest[2]) {
|
||||||
glms_aabb_crop(box, cropBox, dest);
|
glms_aabb_(crop)(box, cropBox, dest);
|
||||||
glms_aabb_merge(clampBox, dest, dest);
|
glms_aabb_(merge)(clampBox, dest, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -125,8 +125,8 @@ glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
|
|||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
vec4 rawPlanes[6];
|
vec4 rawPlanes[6];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glms_vec4_unpack(rawPlanes, planes, 6);
|
glms_vec4_(unpack)(rawPlanes, planes, 6);
|
||||||
return glm_aabb_frustum(rawBox, rawPlanes);
|
return glm_aabb_frustum(rawBox, rawPlanes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,8 +138,8 @@ glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glms_aabb_(invalidate)(vec3s box[2]) {
|
glms_aabb_(invalidate)(vec3s box[2]) {
|
||||||
box[0] = glms_vec3_broadcast(FLT_MAX);
|
box[0] = glms_vec3_(broadcast)(FLT_MAX);
|
||||||
box[1] = glms_vec3_broadcast(-FLT_MAX);
|
box[1] = glms_vec3_(broadcast)(-FLT_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -151,7 +151,7 @@ CGLM_INLINE
|
|||||||
bool
|
bool
|
||||||
glms_aabb_(isvalid)(vec3s box[2]) {
|
glms_aabb_(isvalid)(vec3s box[2]) {
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
return glm_aabb_isvalid(rawBox);
|
return glm_aabb_isvalid(rawBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ glms_aabb_(size)(vec3s box[2]) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
float
|
float
|
||||||
glms_aabb_(radius)(vec3s box[2]) {
|
glms_aabb_(radius)(vec3s box[2]) {
|
||||||
return glms_aabb_size(box) * 0.5f;
|
return glms_aabb_(size)(box) * 0.5f;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -186,7 +186,7 @@ glms_aabb_(radius)(vec3s box[2]) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
vec3s
|
vec3s
|
||||||
glms_aabb_(center)(vec3s box[2]) {
|
glms_aabb_(center)(vec3s box[2]) {
|
||||||
return glms_vec3_center(box[0], box[1]);
|
return glms_vec3_(center)(box[0], box[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -201,8 +201,8 @@ glms_aabb_(aabb)(vec3s box[2], vec3s other[2]) {
|
|||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
vec3 rawOther[2];
|
vec3 rawOther[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glms_vec3_unpack(rawOther, other, 2);
|
glms_vec3_(unpack)(rawOther, other, 2);
|
||||||
return glm_aabb_aabb(rawBox, rawOther);
|
return glm_aabb_aabb(rawBox, rawOther);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ bool
|
|||||||
glms_aabb_(sphere)(vec3s box[2], vec4s s) {
|
glms_aabb_(sphere)(vec3s box[2], vec4s s) {
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
return glm_aabb_sphere(rawBox, s.raw);
|
return glm_aabb_sphere(rawBox, s.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -235,7 +235,7 @@ bool
|
|||||||
glms_aabb_(point)(vec3s box[2], vec3s point) {
|
glms_aabb_(point)(vec3s box[2], vec3s point) {
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
return glm_aabb_point(rawBox, point.raw);
|
return glm_aabb_point(rawBox, point.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -251,8 +251,8 @@ glms_aabb_(contains)(vec3s box[2], vec3s other[2]) {
|
|||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
vec3 rawOther[2];
|
vec3 rawOther[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glms_vec3_unpack(rawOther, other, 2);
|
glms_vec3_(unpack)(rawOther, other, 2);
|
||||||
return glm_aabb_contains(rawBox, rawOther);
|
return glm_aabb_contains(rawBox, rawOther);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ glms_ortho_aabb_lh_no(vec3s box[2]) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_lh_no(rawBox, dest.raw);
|
glm_ortho_aabb_lh_no(rawBox, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_lh_no(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_p_lh_no(rawBox, padding, dest.raw);
|
glm_ortho_aabb_p_lh_no(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_lh_no(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_pz_lh_no(rawBox, padding, dest.raw);
|
glm_ortho_aabb_pz_lh_no(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ glms_ortho_aabb_lh_zo(vec3s box[2]) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_lh_zo(rawBox, dest.raw);
|
glm_ortho_aabb_lh_zo(rawBox, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_lh_zo(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_p_lh_zo(rawBox, padding, dest.raw);
|
glm_ortho_aabb_p_lh_zo(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_lh_zo(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_pz_lh_zo(rawBox, padding, dest.raw);
|
glm_ortho_aabb_pz_lh_zo(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ glms_ortho_aabb_rh_no(vec3s box[2]) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_rh_no(rawBox, dest.raw);
|
glm_ortho_aabb_rh_no(rawBox, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_rh_no(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_p_rh_no(rawBox, padding, dest.raw);
|
glm_ortho_aabb_p_rh_no(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_rh_no(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_pz_rh_no(rawBox, padding, dest.raw);
|
glm_ortho_aabb_pz_rh_no(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ glms_ortho_aabb_rh_zo(vec3s box[2]) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_rh_zo(rawBox, dest.raw);
|
glm_ortho_aabb_rh_zo(rawBox, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -87,7 +87,7 @@ glms_ortho_aabb_p_rh_zo(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_p_rh_zo(rawBox, padding, dest.raw);
|
glm_ortho_aabb_p_rh_zo(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
@@ -110,7 +110,7 @@ glms_ortho_aabb_pz_rh_zo(vec3s box[2], float padding) {
|
|||||||
mat4s dest;
|
mat4s dest;
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBox, box, 2);
|
glms_vec3_(unpack)(rawBox, box, 2);
|
||||||
glm_ortho_aabb_pz_rh_zo(rawBox, padding, dest.raw);
|
glm_ortho_aabb_pz_rh_zo(rawBox, padding, dest.raw);
|
||||||
|
|
||||||
return dest;
|
return dest;
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ void
|
|||||||
glms_frustum_planes(mat4s m, vec4s dest[6]) {
|
glms_frustum_planes(mat4s m, vec4s dest[6]) {
|
||||||
vec4 rawDest[6];
|
vec4 rawDest[6];
|
||||||
glm_frustum_planes(m.raw, rawDest);
|
glm_frustum_planes(m.raw, rawDest);
|
||||||
glms_vec4_pack(dest, rawDest, 6);
|
glms_vec4_(pack)(dest, rawDest, 6);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -88,7 +88,7 @@ void
|
|||||||
glms_frustum_corners(mat4s invMat, vec4s dest[8]) {
|
glms_frustum_corners(mat4s invMat, vec4s dest[8]) {
|
||||||
vec4 rawDest[8];
|
vec4 rawDest[8];
|
||||||
glm_frustum_corners(invMat.raw, rawDest);
|
glm_frustum_corners(invMat.raw, rawDest);
|
||||||
glms_vec4_pack(dest, rawDest, 8);
|
glms_vec4_(pack)(dest, rawDest, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -103,7 +103,7 @@ glms_frustum_center(vec4s corners[8]) {
|
|||||||
vec4 rawCorners[8];
|
vec4 rawCorners[8];
|
||||||
vec4s r;
|
vec4s r;
|
||||||
|
|
||||||
glms_vec4_unpack(rawCorners, corners, 8);
|
glms_vec4_(unpack)(rawCorners, corners, 8);
|
||||||
glm_frustum_center(rawCorners, r.raw);
|
glm_frustum_center(rawCorners, r.raw);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
@@ -121,9 +121,9 @@ glms_frustum_box(vec4s corners[8], mat4s m, vec3s box[2]) {
|
|||||||
vec4 rawCorners[8];
|
vec4 rawCorners[8];
|
||||||
vec3 rawBox[2];
|
vec3 rawBox[2];
|
||||||
|
|
||||||
glms_vec4_unpack(rawCorners, corners, 8);
|
glms_vec4_(unpack)(rawCorners, corners, 8);
|
||||||
glm_frustum_box(rawCorners, m.raw, rawBox);
|
glm_frustum_box(rawCorners, m.raw, rawBox);
|
||||||
glms_vec3_pack(box, rawBox, 2);
|
glms_vec3_(pack)(box, rawBox, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -147,9 +147,9 @@ glms_frustum_corners_at(vec4s corners[8],
|
|||||||
vec4 rawCorners[8];
|
vec4 rawCorners[8];
|
||||||
vec4 rawPlaneCorners[4];
|
vec4 rawPlaneCorners[4];
|
||||||
|
|
||||||
glms_vec4_unpack(rawCorners, corners, 8);
|
glms_vec4_(unpack)(rawCorners, corners, 8);
|
||||||
glm_frustum_corners_at(rawCorners, splitDist, farDist, rawPlaneCorners);
|
glm_frustum_corners_at(rawCorners, splitDist, farDist, rawPlaneCorners);
|
||||||
glms_vec4_pack(planeCorners, rawPlaneCorners, 8);
|
glms_vec4_(pack)(planeCorners, rawPlaneCorners, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* cglms_frustums_h */
|
#endif /* cglms_frustums_h */
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ glms_aabb_print(vec3s bbox[2],
|
|||||||
FILE * __restrict ostream) {
|
FILE * __restrict ostream) {
|
||||||
vec3 rawBbox[2];
|
vec3 rawBbox[2];
|
||||||
|
|
||||||
glms_vec3_unpack(rawBbox, bbox, 2);
|
glms_vec3_(unpack)(rawBbox, bbox, 2);
|
||||||
glm_aabb_print(rawBbox, tag, ostream);
|
glm_aabb_print(rawBbox, tag, ostream);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +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);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglms_mat2_h
|
#ifndef cglms_mat2_h
|
||||||
@@ -258,4 +259,18 @@ glms_mat2_(rmc)(vec2s r, mat2s m, vec2s c) {
|
|||||||
return glm_mat2_rmc(r.raw, m.raw, c.raw);
|
return glm_mat2_rmc(r.raw, m.raw, c.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create mat2 matrix from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @return constructed matrix from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat2s
|
||||||
|
glms_mat2_(make)(float * __restrict src) {
|
||||||
|
mat2s r;
|
||||||
|
glm_mat2_make(src, r.raw);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_mat2_h */
|
#endif /* cglms_mat2_h */
|
||||||
|
|||||||
@@ -28,6 +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);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglms_mat3s_h
|
#ifndef cglms_mat3s_h
|
||||||
@@ -285,4 +286,18 @@ glms_mat3_(rmc)(vec3s r, mat3s m, vec3s c) {
|
|||||||
return glm_mat3_rmc(r.raw, m.raw, c.raw);
|
return glm_mat3_rmc(r.raw, m.raw, c.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create mat3 matrix from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @return constructed matrix from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_mat3_(make)(float * __restrict src) {
|
||||||
|
mat3s r;
|
||||||
|
glm_mat3_make(src, r.raw);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_mat3s_h */
|
#endif /* cglms_mat3s_h */
|
||||||
|
|||||||
@@ -42,6 +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);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglms_mat4s_h
|
#ifndef cglms_mat4s_h
|
||||||
@@ -240,7 +241,7 @@ glms_mat4_(mulN)(mat4s * __restrict matrices[], uint32_t len) {
|
|||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
r = glms_mat4_mul(r, *matrices[i]);
|
r = glms_mat4_(mul)(r, *matrices[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
@@ -459,4 +460,18 @@ glms_mat4_(rmc)(vec4s r, mat4s m, vec4s c) {
|
|||||||
return glm_mat4_rmc(r.raw, m.raw, c.raw);
|
return glm_mat4_rmc(r.raw, m.raw, c.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create mat4 matrix from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @return constructed matrix from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat4s
|
||||||
|
glms_mat4_(make)(float * __restrict src) {
|
||||||
|
mat4s r;
|
||||||
|
glm_mat4_make(src, r.raw);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_mat4s_h */
|
#endif /* cglms_mat4s_h */
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
CGLM_INLINE mat4s glms_quat_rotate(mat4s m, versors q)
|
CGLM_INLINE mat4s glms_quat_rotate(mat4s m, versors q)
|
||||||
CGLM_INLINE mat4s glms_quat_rotate_at(mat4s m, versors q, vec3s pivot)
|
CGLM_INLINE mat4s glms_quat_rotate_at(mat4s m, versors q, vec3s pivot)
|
||||||
CGLM_INLINE mat4s glms_quat_rotate_atm(versors q, vec3s pivot)
|
CGLM_INLINE mat4s glms_quat_rotate_atm(versors q, vec3s pivot)
|
||||||
|
CGLM_INLINE versors glms_quat_make(float * restrict src)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglms_quat_h
|
#ifndef cglms_quat_h
|
||||||
@@ -565,4 +566,18 @@ glms_quat_(rotate_atm)(versors q, vec3s pivot) {
|
|||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create CGLM quaternion from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @returns constructed quaternion from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
versors
|
||||||
|
glms_quat_(make)(float * __restrict src) {
|
||||||
|
versors dest;
|
||||||
|
glm_quat_make(src, dest.raw);
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_quat_h */
|
#endif /* cglms_quat_h */
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ glms_vec2_(eq_eps)(vec2s v, float val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief check if vectors members are equal (without epsilon)
|
* @brief check if vector members are equal (without epsilon)
|
||||||
*
|
*
|
||||||
* @param[in] v vector
|
* @param[in] v vector
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -46,6 +46,7 @@
|
|||||||
CGLM_INLINE vec2s glms_vec2_minv(vec2s a, vec2s b)
|
CGLM_INLINE vec2s glms_vec2_minv(vec2s a, vec2s b)
|
||||||
CGLM_INLINE vec2s glms_vec2_clamp(vec2s v, float minVal, float maxVal)
|
CGLM_INLINE vec2s glms_vec2_clamp(vec2s v, float minVal, float maxVal)
|
||||||
CGLM_INLINE vec2s glms_vec2_lerp(vec2s from, vec2s to, float t)
|
CGLM_INLINE vec2s glms_vec2_lerp(vec2s from, vec2s to, float t)
|
||||||
|
CGLM_INLINE vec2s glms_vec2_make(float * restrict src)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglms_vec2s_h
|
#ifndef cglms_vec2s_h
|
||||||
@@ -258,11 +259,11 @@ glms_vec2_(subs)(vec2s a, float s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief multiply two vector (component-wise multiplication)
|
* @brief multiply two vectors (component-wise multiplication)
|
||||||
*
|
*
|
||||||
* @param a vector1
|
* @param a vector1
|
||||||
* @param b vector2
|
* @param b vector2
|
||||||
* @returns v3 = (a[0] * b[0], a[1] * b[1], a[2] * b[2])
|
* @returns result = (a[0] * b[0], a[1] * b[1])
|
||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
vec2s
|
vec2s
|
||||||
@@ -307,7 +308,7 @@ glms_vec2_(scale_as)(vec2s v, float s) {
|
|||||||
*
|
*
|
||||||
* @param[in] a vector 1
|
* @param[in] a vector 1
|
||||||
* @param[in] b vector 2
|
* @param[in] b vector 2
|
||||||
* @returns result = (a[0]/b[0], a[1]/b[1], a[2]/b[2])
|
* @returns result = (a[0]/b[0], a[1]/b[1])
|
||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
vec2s
|
vec2s
|
||||||
@@ -322,7 +323,7 @@ glms_vec2_(div)(vec2s a, vec2s b) {
|
|||||||
*
|
*
|
||||||
* @param[in] a vector
|
* @param[in] a vector
|
||||||
* @param[in] s scalar
|
* @param[in] s scalar
|
||||||
* @returns result = (a[0]/s, a[1]/s, a[2]/s)
|
* @returns result = (a[0]/s, a[1]/s)
|
||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
vec2s
|
vec2s
|
||||||
@@ -397,7 +398,7 @@ glms_vec2_(muladds)(vec2s a, float s, vec2s dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add max of two vector to result/dest
|
* @brief add max of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -413,7 +414,7 @@ glms_vec2_(maxadd)(vec2s a, vec2s b, vec2s dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add min of two vector to result/dest
|
* @brief add min of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -558,4 +559,18 @@ glms_vec2_(lerp)(vec2s from, vec2s to, float t) {
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create two dimensional vector from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @returns constructed 2D vector from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
vec2s
|
||||||
|
glms_vec2_(make)(float * __restrict src) {
|
||||||
|
vec2s dest;
|
||||||
|
glm_vec2_make(src, dest.raw);
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_vec2s_h */
|
#endif /* cglms_vec2s_h */
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ glms_vec3_(eq_eps)(vec3s v, float val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief check if vectors members are equal (without epsilon)
|
* @brief check if vector members are equal (without epsilon)
|
||||||
*
|
*
|
||||||
* @param[in] v vector
|
* @param[in] v vector
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -70,6 +70,7 @@
|
|||||||
CGLM_INLINE vec3s glms_vec3_smoothinterp(vec3s from, vec3s to, float t);
|
CGLM_INLINE vec3s glms_vec3_smoothinterp(vec3s from, vec3s to, float t);
|
||||||
CGLM_INLINE vec3s glms_vec3_smoothinterpc(vec3s from, vec3s to, float t);
|
CGLM_INLINE vec3s glms_vec3_smoothinterpc(vec3s from, vec3s to, float t);
|
||||||
CGLM_INLINE vec3s glms_vec3_swizzle(vec3s v, int mask);
|
CGLM_INLINE vec3s glms_vec3_swizzle(vec3s v, int mask);
|
||||||
|
CGLM_INLINE vec3s glms_vec3_make(float * restrict src);
|
||||||
|
|
||||||
Convenient:
|
Convenient:
|
||||||
CGLM_INLINE vec3s glms_cross(vec3s a, vec3s b);
|
CGLM_INLINE vec3s glms_cross(vec3s a, vec3s b);
|
||||||
@@ -314,7 +315,7 @@ glms_vec3_(subs)(vec3s a, float s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief multiply two vector (component-wise multiplication)
|
* @brief multiply two vectors (component-wise multiplication)
|
||||||
*
|
*
|
||||||
* @param a vector1
|
* @param a vector1
|
||||||
* @param b vector2
|
* @param b vector2
|
||||||
@@ -453,7 +454,7 @@ glms_vec3_(muladds)(vec3s a, float s, vec3s dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add max of two vector to result/dest
|
* @brief add max of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -469,7 +470,7 @@ glms_vec3_(maxadd)(vec3s a, vec3s b, vec3s dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add min of two vector to result/dest
|
* @brief add min of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -967,4 +968,18 @@ glms_vec3_(swizzle)(vec3s v, int mask) {
|
|||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create three dimensional vector from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @returns constructed 3D vector from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
vec3s
|
||||||
|
glms_vec3_(make)(float * __restrict src) {
|
||||||
|
vec3s dest;
|
||||||
|
glm_vec3_make(src, dest.raw);
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_vec3s_h */
|
#endif /* cglms_vec3s_h */
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ glms_vec4_(eq_eps)(vec4s v, float val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief check if vectors members are equal (without epsilon)
|
* @brief check if vector members are equal (without epsilon)
|
||||||
*
|
*
|
||||||
* @param v vector
|
* @param v vector
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -61,6 +61,7 @@
|
|||||||
CGLM_INLINE vec4s glms_vec4_smoothinterpc(vec4s from, vec4s to, float t);
|
CGLM_INLINE vec4s glms_vec4_smoothinterpc(vec4s from, vec4s to, float t);
|
||||||
CGLM_INLINE vec4s glms_vec4_cubic(float s);
|
CGLM_INLINE vec4s glms_vec4_cubic(float s);
|
||||||
CGLM_INLINE vec4s glms_vec4_swizzle(vec4s v, int mask);
|
CGLM_INLINE vec4s glms_vec4_swizzle(vec4s v, int mask);
|
||||||
|
CGLM_INLINE vec4s glms_vec4_make(float * restrict src);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglms_vec4s_h
|
#ifndef cglms_vec4s_h
|
||||||
@@ -343,7 +344,7 @@ glms_vec4_(subs)(vec4s v, float s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief multiply two vector (component-wise multiplication)
|
* @brief multiply two vectors (component-wise multiplication)
|
||||||
*
|
*
|
||||||
* @param a vector1
|
* @param a vector1
|
||||||
* @param b vector2
|
* @param b vector2
|
||||||
@@ -482,7 +483,7 @@ glms_vec4_(muladds)(vec4s a, float s, vec4s dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add max of two vector to result/dest
|
* @brief add max of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -498,7 +499,7 @@ glms_vec4_(maxadd)(vec4s a, vec4s b, vec4s dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add min of two vector to result/dest
|
* @brief add min of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -811,4 +812,18 @@ glms_vec4_(swizzle)(vec4s v, int mask) {
|
|||||||
return dest;
|
return dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create four dimensional vector from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @returns constructed 4D vector from raw pointer
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
vec4s
|
||||||
|
glms_vec4_(make)(float * __restrict src) {
|
||||||
|
vec4s dest;
|
||||||
|
glm_vec4_make(src, dest.raw);
|
||||||
|
return dest;
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglms_vec4s_h */
|
#endif /* cglms_vec4s_h */
|
||||||
|
|||||||
@@ -25,10 +25,17 @@
|
|||||||
* only #define governing the use of anonymous structs, so for backward
|
* only #define governing the use of anonymous structs, so for backward
|
||||||
* compatibility, we still honor that choice and disable them. */
|
* compatibility, we still honor that choice and disable them. */
|
||||||
# define CGLM_USE_ANONYMOUS_STRUCT 0
|
# define CGLM_USE_ANONYMOUS_STRUCT 0
|
||||||
# elif __STDC_VERSION__ >= 20112L || defined(_MSVC_VER)
|
# elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \
|
||||||
|
(defined(__cplusplus) && __cplusplus >= 201103L)
|
||||||
/* We're compiling for C11 or this is the MSVC compiler. In either
|
/* We're compiling for C11 or this is the MSVC compiler. In either
|
||||||
* case, anonymous structs are available, so use them. */
|
* case, anonymous structs are available, so use them. */
|
||||||
# define CGLM_USE_ANONYMOUS_STRUCT 1
|
# define CGLM_USE_ANONYMOUS_STRUCT 1
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
|
||||||
|
/* GCC 4.6 and onwards support anonymous structs as an extension */
|
||||||
|
# define CGLM_USE_ANONYMOUS_STRUCT 1
|
||||||
|
# elif defined(__clang__) && __clang_major__ >= 3
|
||||||
|
/* Clang 3.0 and onwards support anonymous structs as an extension */
|
||||||
|
# define CGLM_USE_ANONYMOUS_STRUCT 1
|
||||||
# elif defined(_MSC_VER) && (_MSC_VER >= 1900) /* Visual Studio 2015 */
|
# elif defined(_MSC_VER) && (_MSC_VER >= 1900) /* Visual Studio 2015 */
|
||||||
/* We can support anonymous structs
|
/* We can support anonymous structs
|
||||||
* since Visual Studio 2015 or 2017 (1910) maybe? */
|
* since Visual Studio 2015 or 2017 (1910) maybe? */
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ glm_vec2_eq_eps(vec2 v, float val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief check if vectors members are equal (without epsilon)
|
* @brief check if vector members are equal (without epsilon)
|
||||||
*
|
*
|
||||||
* @param[in] v vector
|
* @param[in] v vector
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
CGLM_INLINE void glm_vec2_minv(vec2 v1, vec2 v2, vec2 dest)
|
CGLM_INLINE void glm_vec2_minv(vec2 v1, vec2 v2, vec2 dest)
|
||||||
CGLM_INLINE void glm_vec2_clamp(vec2 v, float minVal, float maxVal)
|
CGLM_INLINE void glm_vec2_clamp(vec2 v, float minVal, float maxVal)
|
||||||
CGLM_INLINE void glm_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest)
|
CGLM_INLINE void glm_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest)
|
||||||
|
CGLM_INLINE void glm_vec2_make(float * restrict src, vec2 dest)
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -229,7 +230,7 @@ glm_vec2_subs(vec2 v, float s, vec2 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief multiply two vector (component-wise multiplication)
|
* @brief multiply two vectors (component-wise multiplication)
|
||||||
*
|
*
|
||||||
* @param a v1
|
* @param a v1
|
||||||
* @param b v2
|
* @param b v2
|
||||||
@@ -370,7 +371,7 @@ glm_vec2_muladds(vec2 a, float s, vec2 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add max of two vector to result/dest
|
* @brief add max of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -386,7 +387,7 @@ glm_vec2_maxadd(vec2 a, vec2 b, vec2 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add min of two vector to result/dest
|
* @brief add min of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -582,4 +583,16 @@ glm_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest) {
|
|||||||
glm_vec2_add(from, v, dest);
|
glm_vec2_add(from, v, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create two dimensional vector from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest destination vector
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_vec2_make(float * __restrict src, vec2 dest) {
|
||||||
|
dest[0] = src[0]; dest[1] = src[1];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_vec2_h */
|
#endif /* cglm_vec2_h */
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ glm_vec3_eq_eps(vec3 v, float val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief check if vectors members are equal (without epsilon)
|
* @brief check if vector members are equal (without epsilon)
|
||||||
*
|
*
|
||||||
* @param[in] v vector
|
* @param[in] v vector
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -73,6 +73,7 @@
|
|||||||
CGLM_INLINE void glm_vec3_smoothinterp(vec3 from, vec3 to, float t, vec3 dest);
|
CGLM_INLINE void glm_vec3_smoothinterp(vec3 from, vec3 to, float t, vec3 dest);
|
||||||
CGLM_INLINE void glm_vec3_smoothinterpc(vec3 from, vec3 to, float t, vec3 dest);
|
CGLM_INLINE void glm_vec3_smoothinterpc(vec3 from, vec3 to, float t, vec3 dest);
|
||||||
CGLM_INLINE void glm_vec3_swizzle(vec3 v, int mask, vec3 dest);
|
CGLM_INLINE void glm_vec3_swizzle(vec3 v, int mask, vec3 dest);
|
||||||
|
CGLM_INLINE void glm_vec3_make(float * restrict src, vec3 dest);
|
||||||
|
|
||||||
Convenient:
|
Convenient:
|
||||||
CGLM_INLINE void glm_cross(vec3 a, vec3 b, vec3 d);
|
CGLM_INLINE void glm_cross(vec3 a, vec3 b, vec3 d);
|
||||||
@@ -320,7 +321,7 @@ glm_vec3_subs(vec3 v, float s, vec3 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief multiply two vector (component-wise multiplication)
|
* @brief multiply two vectors (component-wise multiplication)
|
||||||
*
|
*
|
||||||
* @param a vector1
|
* @param a vector1
|
||||||
* @param b vector2
|
* @param b vector2
|
||||||
@@ -469,7 +470,7 @@ glm_vec3_muladds(vec3 a, float s, vec3 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add max of two vector to result/dest
|
* @brief add max of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -486,7 +487,7 @@ glm_vec3_maxadd(vec3 a, vec3 b, vec3 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add min of two vector to result/dest
|
* @brief add min of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -1079,4 +1080,18 @@ glm_normalize_to(vec3 v, vec3 dest) {
|
|||||||
glm_vec3_normalize_to(v, dest);
|
glm_vec3_normalize_to(v, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create three dimensional vector from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest destination vector
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_vec3_make(float * __restrict src, vec3 dest) {
|
||||||
|
dest[0] = src[0];
|
||||||
|
dest[1] = src[1];
|
||||||
|
dest[2] = src[2];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_vec3_h */
|
#endif /* cglm_vec3_h */
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ glm_vec4_eq_eps(vec4 v, float val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief check if vectors members are equal (without epsilon)
|
* @brief check if vector members are equal (without epsilon)
|
||||||
*
|
*
|
||||||
* @param v vector
|
* @param v vector
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
CGLM_INLINE void glm_vec4_smoothinterp(vec4 from, vec4 to, float t, vec4 dest);
|
CGLM_INLINE void glm_vec4_smoothinterp(vec4 from, vec4 to, float t, vec4 dest);
|
||||||
CGLM_INLINE void glm_vec4_smoothinterpc(vec4 from, vec4 to, float t, vec4 dest);
|
CGLM_INLINE void glm_vec4_smoothinterpc(vec4 from, vec4 to, float t, vec4 dest);
|
||||||
CGLM_INLINE void glm_vec4_swizzle(vec4 v, int mask, vec4 dest);
|
CGLM_INLINE void glm_vec4_swizzle(vec4 v, int mask, vec4 dest);
|
||||||
|
CGLM_INLINE void glm_vec4_make(float * restrict src, vec4 dest);
|
||||||
|
|
||||||
DEPRECATED:
|
DEPRECATED:
|
||||||
glm_vec4_dup
|
glm_vec4_dup
|
||||||
@@ -418,7 +419,7 @@ glm_vec4_subs(vec4 v, float s, vec4 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief multiply two vector (component-wise multiplication)
|
* @brief multiply two vectors (component-wise multiplication)
|
||||||
*
|
*
|
||||||
* @param a vector1
|
* @param a vector1
|
||||||
* @param b vector2
|
* @param b vector2
|
||||||
@@ -634,7 +635,7 @@ glm_vec4_muladds(vec4 a, float s, vec4 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add max of two vector to result/dest
|
* @brief add max of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -666,7 +667,7 @@ glm_vec4_maxadd(vec4 a, vec4 b, vec4 dest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief add min of two vector to result/dest
|
* @brief add min of two vectors to result/dest
|
||||||
*
|
*
|
||||||
* it applies += operator so dest must be initialized
|
* it applies += operator so dest must be initialized
|
||||||
*
|
*
|
||||||
@@ -709,7 +710,7 @@ glm_vec4_negate_to(vec4 v, vec4 dest) {
|
|||||||
#if defined(__wasm__) && defined(__wasm_simd128__)
|
#if defined(__wasm__) && defined(__wasm_simd128__)
|
||||||
glmm_store(dest, wasm_f32x4_neg(glmm_load(v)));
|
glmm_store(dest, wasm_f32x4_neg(glmm_load(v)));
|
||||||
#elif defined( __SSE__ ) || defined( __SSE2__ )
|
#elif defined( __SSE__ ) || defined( __SSE2__ )
|
||||||
glmm_store(dest, _mm_xor_ps(glmm_load(v), _mm_set1_ps(-0.0f)));
|
glmm_store(dest, _mm_xor_ps(glmm_load(v), glmm_float32x4_SIGNMASK_NEG));
|
||||||
#elif defined(CGLM_NEON_FP)
|
#elif defined(CGLM_NEON_FP)
|
||||||
vst1q_f32(dest, vnegq_f32(vld1q_f32(v)));
|
vst1q_f32(dest, vnegq_f32(vld1q_f32(v)));
|
||||||
#else
|
#else
|
||||||
@@ -1133,4 +1134,17 @@ glm_vec4_swizzle(vec4 v, int mask, vec4 dest) {
|
|||||||
glm_vec4_copy(t, dest);
|
glm_vec4_copy(t, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Create four dimensional vector from pointer
|
||||||
|
*
|
||||||
|
* @param[in] src pointer to an array of floats
|
||||||
|
* @param[out] dest destination vector
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_vec4_make(float * __restrict src, vec4 dest) {
|
||||||
|
dest[0] = src[0]; dest[1] = src[1];
|
||||||
|
dest[2] = src[2]; dest[3] = src[3];
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* cglm_vec4_h */
|
#endif /* cglm_vec4_h */
|
||||||
|
|||||||
@@ -10,6 +10,6 @@
|
|||||||
|
|
||||||
#define CGLM_VERSION_MAJOR 0
|
#define CGLM_VERSION_MAJOR 0
|
||||||
#define CGLM_VERSION_MINOR 9
|
#define CGLM_VERSION_MINOR 9
|
||||||
#define CGLM_VERSION_PATCH 0
|
#define CGLM_VERSION_PATCH 1
|
||||||
|
|
||||||
#endif /* cglm_version_h */
|
#endif /* cglm_version_h */
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
project('cglm', 'c',
|
project('cglm', 'c',
|
||||||
version : '0.9.0',
|
version : '0.9.1',
|
||||||
license : 'mit',
|
license : 'mit',
|
||||||
default_options : [
|
default_options : [
|
||||||
'c_std=c11',
|
'c_std=c11',
|
||||||
'werror=true',
|
|
||||||
'warning_level=2',
|
'warning_level=2',
|
||||||
'buildtype=release'
|
'buildtype=release'
|
||||||
]
|
]
|
||||||
@@ -108,11 +107,6 @@ if get_option('build_tests') == true
|
|||||||
test_src = files(
|
test_src = files(
|
||||||
'test/runner.c',
|
'test/runner.c',
|
||||||
'test/src/test_bezier.c',
|
'test/src/test_bezier.c',
|
||||||
'test/src/test_cam.c',
|
|
||||||
'test/src/test_cam_lh_no.c',
|
|
||||||
'test/src/test_cam_lh_zo.c',
|
|
||||||
'test/src/test_cam_rh_no.c',
|
|
||||||
'test/src/test_cam_rh_zo.c',
|
|
||||||
'test/src/test_clamp.c',
|
'test/src/test_clamp.c',
|
||||||
'test/src/test_common.c',
|
'test/src/test_common.c',
|
||||||
'test/src/test_euler.c',
|
'test/src/test_euler.c',
|
||||||
|
|||||||
@@ -97,3 +97,9 @@ float
|
|||||||
glmc_mat2_rmc(vec2 r, mat2 m, vec2 c) {
|
glmc_mat2_rmc(vec2 r, mat2 m, vec2 c) {
|
||||||
return glm_mat2_rmc(r, m, c);
|
return glm_mat2_rmc(r, m, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_mat2_make(float * __restrict src, mat2 dest) {
|
||||||
|
glm_mat2_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -103,3 +103,9 @@ float
|
|||||||
glmc_mat3_rmc(vec3 r, mat3 m, vec3 c) {
|
glmc_mat3_rmc(vec3 r, mat3 m, vec3 c) {
|
||||||
return glm_mat3_rmc(r, m, c);
|
return glm_mat3_rmc(r, m, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_mat3_make(float * __restrict src, mat3 dest) {
|
||||||
|
glm_mat3_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -163,3 +163,9 @@ float
|
|||||||
glmc_mat4_rmc(vec4 r, mat4 m, vec4 c) {
|
glmc_mat4_rmc(vec4 r, mat4 m, vec4 c) {
|
||||||
return glm_mat4_rmc(r, m, c);
|
return glm_mat4_rmc(r, m, c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_mat4_make(float * __restrict src, mat4 dest) {
|
||||||
|
glm_mat4_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -229,3 +229,9 @@ void
|
|||||||
glmc_quat_rotate_atm(mat4 m, versor q, vec3 pivot) {
|
glmc_quat_rotate_atm(mat4 m, versor q, vec3 pivot) {
|
||||||
glm_quat_rotate_atm(m, q, pivot);
|
glm_quat_rotate_atm(m, q, pivot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_quat_make(float * __restrict src, versor dest) {
|
||||||
|
glm_quat_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -235,3 +235,9 @@ void
|
|||||||
glmc_vec2_complex_conjugate(vec2 a, vec2 dest) {
|
glmc_vec2_complex_conjugate(vec2 a, vec2 dest) {
|
||||||
glm_vec2_complex_conjugate(a, dest);
|
glm_vec2_complex_conjugate(a, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_vec2_make(float * __restrict src, vec2 dest) {
|
||||||
|
glm_vec2_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -417,3 +417,9 @@ void
|
|||||||
glmc_vec3_sqrt(vec3 v, vec3 dest) {
|
glmc_vec3_sqrt(vec3 v, vec3 dest) {
|
||||||
glm_vec3_sqrt(v, dest);
|
glm_vec3_sqrt(v, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_vec3_make(float * __restrict src, vec3 dest) {
|
||||||
|
glm_vec3_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -381,3 +381,9 @@ void
|
|||||||
glmc_vec4_sqrt(vec4 v, vec4 dest) {
|
glmc_vec4_sqrt(vec4 v, vec4 dest) {
|
||||||
glm_vec4_sqrt(v, dest);
|
glm_vec4_sqrt(v, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_vec4_make(float * __restrict src, vec4 dest) {
|
||||||
|
glm_vec4_make(src, dest);
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,11 +5,6 @@ set(TESTFILES
|
|||||||
runner.c
|
runner.c
|
||||||
src/test_euler.c
|
src/test_euler.c
|
||||||
src/test_bezier.c
|
src/test_bezier.c
|
||||||
src/test_cam.c
|
|
||||||
src/test_cam_lh_zo.c
|
|
||||||
src/test_cam_rh_zo.c
|
|
||||||
src/test_cam_lh_no.c
|
|
||||||
src/test_cam_rh_no.c
|
|
||||||
src/test_struct.c
|
src/test_struct.c
|
||||||
src/test_clamp.c
|
src/test_clamp.c
|
||||||
src/test_common.c
|
src/test_common.c
|
||||||
|
|||||||
@@ -25,7 +25,9 @@ main(int argc, const char * argv[]) {
|
|||||||
total = 0.0;
|
total = 0.0;
|
||||||
count = sizeof(tests) / sizeof(tests[0]);
|
count = sizeof(tests) / sizeof(tests[0]);
|
||||||
|
|
||||||
fprintf(stderr, CYAN "\nWelcome to cglm tests\n\n" RESET);
|
fprintf(stderr, CYAN "\nWelcome to cglm tests ( " RESET);
|
||||||
|
glm_arch_print(stderr);
|
||||||
|
fprintf(stderr, CYAN " )\n\n" RESET);
|
||||||
|
|
||||||
srand((unsigned int)time(NULL));
|
srand((unsigned int)time(NULL));
|
||||||
|
|
||||||
|
|||||||
@@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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"
|
|
||||||
|
|
||||||
TEST_IMPL(camera_lookat) {
|
|
||||||
mat4 view1, view2;
|
|
||||||
vec3 center,
|
|
||||||
eye = {0.024f, 14.6f, 67.04f},
|
|
||||||
dir = {0.0f, 0.0f, -1.0f},
|
|
||||||
up = {0.0f, 1.0f, 0.0f};
|
|
||||||
|
|
||||||
glm_vec3_add(eye, dir, center);
|
|
||||||
glm_lookat(eye, center, up, view1);
|
|
||||||
|
|
||||||
glm_look(eye, dir, up, view2);
|
|
||||||
|
|
||||||
ASSERTIFY(test_assert_mat4_eq(view1, view2))
|
|
||||||
|
|
||||||
TEST_SUCCESS
|
|
||||||
}
|
|
||||||
|
|
||||||
TEST_IMPL(camera_decomp) {
|
|
||||||
mat4 proj, proj2;
|
|
||||||
vec4 sizes;
|
|
||||||
float aspect, fovy, nearZ, farZ;
|
|
||||||
|
|
||||||
aspect = 0.782f;
|
|
||||||
fovy = glm_rad(49.984f);
|
|
||||||
nearZ = 0.1f;
|
|
||||||
farZ = 100.0f;
|
|
||||||
|
|
||||||
glm_perspective(fovy, aspect, nearZ, farZ, proj);
|
|
||||||
ASSERT(fabsf(aspect - glm_persp_aspect(proj)) < GLM_FLT_EPSILON)
|
|
||||||
ASSERT(fabsf(fovy - glm_persp_fovy(proj)) < GLM_FLT_EPSILON)
|
|
||||||
ASSERT(fabsf(49.984f - glm_deg(glm_persp_fovy(proj))) < GLM_FLT_EPSILON)
|
|
||||||
|
|
||||||
glm_persp_sizes(proj, fovy, sizes);
|
|
||||||
|
|
||||||
glm_frustum(-sizes[0] * 0.5f,
|
|
||||||
sizes[0] * 0.5f,
|
|
||||||
-sizes[1] * 0.5f,
|
|
||||||
sizes[1] * 0.5f,
|
|
||||||
nearZ,
|
|
||||||
farZ,
|
|
||||||
proj2);
|
|
||||||
|
|
||||||
ASSERTIFY(test_assert_mat4_eq(proj, proj2))
|
|
||||||
|
|
||||||
TEST_SUCCESS
|
|
||||||
}
|
|
||||||
@@ -66,3 +66,50 @@ TEST_IMPL(GLM_PREFIX, frustum) {
|
|||||||
|
|
||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, camera_lookat) {
|
||||||
|
mat4 view1, view2;
|
||||||
|
vec3 center,
|
||||||
|
eye = {0.024f, 14.6f, 67.04f},
|
||||||
|
dir = {0.0f, 0.0f, -1.0f},
|
||||||
|
up = {0.0f, 1.0f, 0.0f};
|
||||||
|
|
||||||
|
glm_vec3_add(eye, dir, center);
|
||||||
|
glm_lookat(eye, center, up, view1);
|
||||||
|
|
||||||
|
glm_look(eye, dir, up, view2);
|
||||||
|
|
||||||
|
ASSERTIFY(test_assert_mat4_eq(view1, view2))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, camera_decomp) {
|
||||||
|
mat4 proj, proj2;
|
||||||
|
vec4 sizes;
|
||||||
|
float aspect, fovy, nearZ, farZ;
|
||||||
|
|
||||||
|
aspect = 0.782f;
|
||||||
|
fovy = glm_rad(49.984f);
|
||||||
|
nearZ = 0.1f;
|
||||||
|
farZ = 100.0f;
|
||||||
|
|
||||||
|
glm_perspective(fovy, aspect, nearZ, farZ, proj);
|
||||||
|
ASSERT(fabsf(aspect - glm_persp_aspect(proj)) < GLM_FLT_EPSILON)
|
||||||
|
ASSERT(fabsf(fovy - glm_persp_fovy(proj)) < GLM_FLT_EPSILON)
|
||||||
|
ASSERT(fabsf(49.984f - glm_deg(glm_persp_fovy(proj))) < GLM_FLT_EPSILON)
|
||||||
|
|
||||||
|
glm_persp_sizes(proj, fovy, sizes);
|
||||||
|
|
||||||
|
glm_frustum(-sizes[0] * 0.5f,
|
||||||
|
sizes[0] * 0.5f,
|
||||||
|
-sizes[1] * 0.5f,
|
||||||
|
sizes[1] * 0.5f,
|
||||||
|
nearZ,
|
||||||
|
farZ,
|
||||||
|
proj2);
|
||||||
|
|
||||||
|
ASSERTIFY(test_assert_mat4_eq(proj, proj2))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
@@ -6,15 +6,17 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "test_common.h"
|
#include "test_common.h"
|
||||||
|
#include "../../include/cglm/clipspace/persp_lh_no.h"
|
||||||
|
#include "../../include/cglm/call/clipspace/persp_lh_no.h"
|
||||||
|
|
||||||
TEST_IMPL(perspective_lh_no) {
|
TEST_IMPL(GLM_PREFIX, perspective_lh_no) {
|
||||||
mat4 dst;
|
mat4 dst;
|
||||||
const float fovy = glm_rad(45.0f);
|
const float fovy = glm_rad(45.0f);
|
||||||
const float aspect = 640/480.0f;
|
const float aspect = 640/480.0f;
|
||||||
const float zNearVal = 0.1f;
|
const float zNearVal = 0.1f;
|
||||||
const float zFarVal = 100.0f;
|
const float zFarVal = 100.0f;
|
||||||
|
|
||||||
glm_perspective_lh_no(fovy, aspect, zNearVal, zFarVal, dst);
|
GLM(perspective_lh_no)(fovy, aspect, zNearVal, zFarVal, dst);
|
||||||
|
|
||||||
/* Sanity mk. I: longhand version */
|
/* Sanity mk. I: longhand version */
|
||||||
ASSERT(test_eq(dst[0][0], 1.0f / (tanf(fovy / 2) * aspect)))
|
ASSERT(test_eq(dst[0][0], 1.0f / (tanf(fovy / 2) * aspect)))
|
||||||
@@ -6,15 +6,17 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "test_common.h"
|
#include "test_common.h"
|
||||||
|
#include "../../include/cglm/clipspace/persp_lh_zo.h"
|
||||||
|
#include "../../include/cglm/call/clipspace/persp_lh_zo.h"
|
||||||
|
|
||||||
TEST_IMPL(perspective_lh_zo) {
|
TEST_IMPL(GLM_PREFIX, perspective_lh_zo) {
|
||||||
mat4 dst;
|
mat4 dst;
|
||||||
const float fovy = glm_rad(45.0f);
|
const float fovy = glm_rad(45.0f);
|
||||||
const float aspect = 640/480.0f;
|
const float aspect = 640/480.0f;
|
||||||
const float zNearVal = 0.1f;
|
const float zNearVal = 0.1f;
|
||||||
const float zFarVal = 100.0f;
|
const float zFarVal = 100.0f;
|
||||||
|
|
||||||
glm_perspective_lh_zo(fovy, aspect, zNearVal, zFarVal, dst);
|
GLM(perspective_lh_zo)(fovy, aspect, zNearVal, zFarVal, dst);
|
||||||
|
|
||||||
/* Sanity mk. I: longhand version */
|
/* Sanity mk. I: longhand version */
|
||||||
ASSERT(test_eq(dst[0][0], 1.0f / (tanf(fovy / 2) * aspect)))
|
ASSERT(test_eq(dst[0][0], 1.0f / (tanf(fovy / 2) * aspect)))
|
||||||
@@ -6,15 +6,17 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "test_common.h"
|
#include "test_common.h"
|
||||||
|
#include "../../include/cglm/clipspace/persp_rh_no.h"
|
||||||
|
#include "../../include/cglm/call/clipspace/persp_rh_no.h"
|
||||||
|
|
||||||
TEST_IMPL(perspective_rh_no) {
|
TEST_IMPL(GLM_PREFIX, perspective_rh_no) {
|
||||||
mat4 dst;
|
mat4 dst;
|
||||||
const float fovy = glm_rad(45.0f);
|
const float fovy = glm_rad(45.0f);
|
||||||
const float aspect = 640/480.0f;
|
const float aspect = 640/480.0f;
|
||||||
const float zNearVal = 0.1f;
|
const float zNearVal = 0.1f;
|
||||||
const float zFarVal = 100.0f;
|
const float zFarVal = 100.0f;
|
||||||
|
|
||||||
glm_perspective_rh_no(fovy, aspect, zNearVal, zFarVal, dst);
|
GLM(perspective_rh_no)(fovy, aspect, zNearVal, zFarVal, dst);
|
||||||
|
|
||||||
/* Sanity mk. I: longhand version */
|
/* Sanity mk. I: longhand version */
|
||||||
ASSERT(test_eq(dst[0][0], 1.0f / (tanf(fovy / 2) * aspect)))
|
ASSERT(test_eq(dst[0][0], 1.0f / (tanf(fovy / 2) * aspect)))
|
||||||
@@ -6,15 +6,17 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "test_common.h"
|
#include "test_common.h"
|
||||||
|
#include "../../include/cglm/clipspace/persp_rh_zo.h"
|
||||||
|
#include "../../include/cglm/call/clipspace/persp_rh_zo.h"
|
||||||
|
|
||||||
TEST_IMPL(perspective_rh_zo) {
|
TEST_IMPL(GLM_PREFIX, perspective_rh_zo) {
|
||||||
mat4 dst;
|
mat4 dst;
|
||||||
const float fovy = glm_rad(45.0f);
|
const float fovy = glm_rad(45.0f);
|
||||||
const float aspect = 640/480.0f;
|
const float aspect = 640/480.0f;
|
||||||
const float zNearVal = 0.1f;
|
const float zNearVal = 0.1f;
|
||||||
const float zFarVal = 100.0f;
|
const float zFarVal = 100.0f;
|
||||||
|
|
||||||
glm_perspective_rh_zo(fovy, aspect, zNearVal, zFarVal, dst);
|
GLM(perspective_rh_zo)(fovy, aspect, zNearVal, zFarVal, dst);
|
||||||
|
|
||||||
/* Sanity mk. I: longhand version */
|
/* Sanity mk. I: longhand version */
|
||||||
ASSERT(test_eq(dst[0][0], 1 / (tanf(fovy / 2) * aspect)))
|
ASSERT(test_eq(dst[0][0], 1 / (tanf(fovy / 2) * aspect)))
|
||||||
@@ -10,6 +10,10 @@
|
|||||||
|
|
||||||
#include "../include/common.h"
|
#include "../include/common.h"
|
||||||
|
|
||||||
|
#if !defined(_WIN32) && !defined(_MSC_VER)
|
||||||
|
# pragma GCC diagnostic ignored "-Wstrict-prototypes"
|
||||||
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
test_rand_mat4(mat4 dest);
|
test_rand_mat4(mat4 dest);
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include "test_common.h"
|
#include "test_common.h"
|
||||||
|
|
||||||
#define A_MATRIX2x2 {{1,2},{5,6}}
|
#define A_MATRIX2x2 {{1,2},{5,6}}
|
||||||
|
#define MAT2_ARRAY {1, 5, 2, 7}
|
||||||
|
|
||||||
#ifndef CGLM_TEST_MAT2_ONCE
|
#ifndef CGLM_TEST_MAT2_ONCE
|
||||||
#define CGLM_TEST_MAT2_ONCE
|
#define CGLM_TEST_MAT2_ONCE
|
||||||
@@ -80,7 +81,7 @@ TEST_IMPL(GLM_PREFIX, mat2_identity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TEST_IMPL(GLM_PREFIX, mat2_identity_array) {
|
TEST_IMPL(GLM_PREFIX, mat2_identity_array) {
|
||||||
int i, count;
|
size_t i, count;
|
||||||
mat2 matrices[4] = {
|
mat2 matrices[4] = {
|
||||||
A_MATRIX2x2,
|
A_MATRIX2x2,
|
||||||
A_MATRIX2x2,
|
A_MATRIX2x2,
|
||||||
@@ -283,4 +284,19 @@ TEST_IMPL(GLM_PREFIX, mat2_rmc) {
|
|||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, mat2_make) {
|
||||||
|
mat2 dest;
|
||||||
|
unsigned int i, j;
|
||||||
|
float src[4] = MAT2_ARRAY;
|
||||||
|
|
||||||
|
GLM(mat2_make)(src, dest);
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=2, j++) {
|
||||||
|
ASSERT(test_eq(dest[j][0], src[i]))
|
||||||
|
ASSERT(test_eq(dest[j][1], src[i+1]))
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
#undef A_MATRIX2x2
|
#undef A_MATRIX2x2
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include "test_common.h"
|
#include "test_common.h"
|
||||||
|
|
||||||
#define A_MATRIX {{1,2,3},{5,6,7},{9,10,11}}
|
#define A_MATRIX {{1,2,3},{5,6,7},{9,10,11}}
|
||||||
|
#define MAT3_ARRAY {1, 5, 2, 7, 12, 1, 4, 6, 0}
|
||||||
|
|
||||||
TEST_IMPL(GLM_PREFIX, mat3_copy) {
|
TEST_IMPL(GLM_PREFIX, mat3_copy) {
|
||||||
mat3 m1 = A_MATRIX;
|
mat3 m1 = A_MATRIX;
|
||||||
@@ -35,7 +36,7 @@ TEST_IMPL(GLM_PREFIX, mat3_identity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TEST_IMPL(GLM_PREFIX, mat3_identity_array) {
|
TEST_IMPL(GLM_PREFIX, mat3_identity_array) {
|
||||||
int i, count;
|
size_t i, count;
|
||||||
mat3 matrices[4] = {
|
mat3 matrices[4] = {
|
||||||
A_MATRIX,
|
A_MATRIX,
|
||||||
A_MATRIX,
|
A_MATRIX,
|
||||||
@@ -308,4 +309,21 @@ TEST_IMPL(GLM_PREFIX, mat3_rmc) {
|
|||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, mat3_make) {
|
||||||
|
mat3 dest;
|
||||||
|
unsigned int i, j;
|
||||||
|
float src[9] = MAT3_ARRAY;
|
||||||
|
|
||||||
|
GLM(mat3_make)(src, dest);
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=3, j++) {
|
||||||
|
ASSERT(test_eq(dest[j][0], src[i]))
|
||||||
|
ASSERT(test_eq(dest[j][1], src[i+1]))
|
||||||
|
ASSERT(test_eq(dest[j][2], src[i+2]))
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
#undef A_MATRIX
|
#undef A_MATRIX
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#define A_MATRIX {{1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}}
|
#define A_MATRIX {{1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}}
|
||||||
#define A_MATRIX3 {{1,2,3},{5,6,7},{9,10,11}}
|
#define A_MATRIX3 {{1,2,3},{5,6,7},{9,10,11}}
|
||||||
|
#define MAT4_ARRAY {1, 5, 2, 7, 12, 1, 4, 6, 0, 8, 1, 0, 6, 5, 0, 1}
|
||||||
|
|
||||||
TEST_IMPL(GLM_PREFIX, mat4_ucopy) {
|
TEST_IMPL(GLM_PREFIX, mat4_ucopy) {
|
||||||
mat4 m1 = A_MATRIX;
|
mat4 m1 = A_MATRIX;
|
||||||
@@ -47,7 +48,7 @@ TEST_IMPL(GLM_PREFIX, mat4_identity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TEST_IMPL(GLM_PREFIX, mat4_identity_array) {
|
TEST_IMPL(GLM_PREFIX, mat4_identity_array) {
|
||||||
int i, count;
|
size_t i, count;
|
||||||
mat4 matrices[4] = {
|
mat4 matrices[4] = {
|
||||||
A_MATRIX,
|
A_MATRIX,
|
||||||
A_MATRIX,
|
A_MATRIX,
|
||||||
@@ -484,5 +485,22 @@ TEST_IMPL(GLM_PREFIX, mat4_rmc) {
|
|||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, mat4_make) {
|
||||||
|
mat4 dest;
|
||||||
|
unsigned int i, j;
|
||||||
|
float src[16] = MAT4_ARRAY;
|
||||||
|
|
||||||
|
GLM(mat4_make)(src, dest);
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=4, j++) {
|
||||||
|
ASSERT(test_eq(dest[j][0], src[i]))
|
||||||
|
ASSERT(test_eq(dest[j][1], src[i+1]))
|
||||||
|
ASSERT(test_eq(dest[j][2], src[i+2]))
|
||||||
|
ASSERT(test_eq(dest[j][3], src[i+3]))
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
#undef A_MATRIX
|
#undef A_MATRIX
|
||||||
#undef A_MATRIX3
|
#undef A_MATRIX3
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ TEST_IMPL(GLM_PREFIX, quat_identity) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TEST_IMPL(GLM_PREFIX, quat_identity_array) {
|
TEST_IMPL(GLM_PREFIX, quat_identity_array) {
|
||||||
int i, count;
|
size_t i, count;
|
||||||
versor quats[4] = {
|
versor quats[4] = {
|
||||||
{1.0f, 2.0f, 3.0f, 4.0f},
|
{1.0f, 2.0f, 3.0f, 4.0f},
|
||||||
{1.0f, 2.0f, 3.0f, 4.0f},
|
{1.0f, 2.0f, 3.0f, 4.0f},
|
||||||
@@ -1084,3 +1084,25 @@ TEST_IMPL(GLM_PREFIX, quat_rotate_atm) {
|
|||||||
|
|
||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, quat_make) {
|
||||||
|
versor dest[3];
|
||||||
|
float src[12] = {
|
||||||
|
7.2f, 1.0f, 2.5f, 6.1f,
|
||||||
|
0.2f, 2.8f, 17.3f, 5.1f,
|
||||||
|
4.2f, 7.3f, 6.6f, 8.8f
|
||||||
|
};
|
||||||
|
|
||||||
|
float *srcp = src;
|
||||||
|
unsigned int i, j;
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=4,j++) {
|
||||||
|
GLM(quat_make)(srcp + i, dest[j]);
|
||||||
|
ASSERT(test_eq(src[ i ], dest[j][0]));
|
||||||
|
ASSERT(test_eq(src[i+1], dest[j][1]));
|
||||||
|
ASSERT(test_eq(src[i+2], dest[j][2]));
|
||||||
|
ASSERT(test_eq(src[i+3], dest[j][3]));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|||||||
@@ -637,3 +637,23 @@ TEST_IMPL(GLM_PREFIX, vec2_complex_div) {
|
|||||||
|
|
||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, vec2_make) {
|
||||||
|
float src[6] = {
|
||||||
|
7.2f, 1.0f,
|
||||||
|
2.5f, 6.1f,
|
||||||
|
17.7f, 4.3f
|
||||||
|
};
|
||||||
|
vec2 dest[3];
|
||||||
|
|
||||||
|
float *srcp = src;
|
||||||
|
unsigned int i, j;
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=2,j++) {
|
||||||
|
GLM(vec2_make)(srcp + i, dest[j]);
|
||||||
|
ASSERT(test_eq(src[ i ], dest[j][0]));
|
||||||
|
ASSERT(test_eq(src[i+1], dest[j][1]));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|||||||
@@ -1729,3 +1729,24 @@ TEST_IMPL(GLM_PREFIX, vec3_sqrt) {
|
|||||||
|
|
||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, vec3_make) {
|
||||||
|
float src[9] = {
|
||||||
|
7.2f, 1.0f, 5.8f,
|
||||||
|
2.5f, 6.1f, 9.9f,
|
||||||
|
17.7f, 4.3f, 3.2f
|
||||||
|
};
|
||||||
|
vec3 dest[3];
|
||||||
|
|
||||||
|
float *srcp = src;
|
||||||
|
unsigned int i, j;
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=3,j++) {
|
||||||
|
GLM(vec3_make)(srcp + i, dest[j]);
|
||||||
|
ASSERT(test_eq(src[ i ], dest[j][0]));
|
||||||
|
ASSERT(test_eq(src[i+1], dest[j][1]));
|
||||||
|
ASSERT(test_eq(src[i+2], dest[j][2]));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|||||||
@@ -1418,3 +1418,25 @@ TEST_IMPL(GLM_PREFIX, vec4_sqrt) {
|
|||||||
|
|
||||||
TEST_SUCCESS
|
TEST_SUCCESS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, vec4_make) {
|
||||||
|
float src[12] = {
|
||||||
|
7.2f, 1.0f, 5.8f, 0.0f,
|
||||||
|
2.5f, 6.1f, 9.9f, 1.0f,
|
||||||
|
17.7f, 4.3f, 3.2f, 1.0f
|
||||||
|
};
|
||||||
|
vec4 dest[3];
|
||||||
|
|
||||||
|
float *srcp = src;
|
||||||
|
unsigned int i, j;
|
||||||
|
|
||||||
|
for (i = 0, j = 0; i < sizeof(src) / sizeof(float); i+=4,j++) {
|
||||||
|
GLM(vec4_make)(srcp + i, dest[j]);
|
||||||
|
ASSERT(test_eq(src[ i ], dest[j][0]));
|
||||||
|
ASSERT(test_eq(src[i+1], dest[j][1]));
|
||||||
|
ASSERT(test_eq(src[i+2], dest[j][2]));
|
||||||
|
ASSERT(test_eq(src[i+3], dest[j][3]));
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,7 +28,11 @@
|
|||||||
#include "test_affine2d.h"
|
#include "test_affine2d.h"
|
||||||
#include "test_affine_mat.h"
|
#include "test_affine_mat.h"
|
||||||
#include "test_ray.h"
|
#include "test_ray.h"
|
||||||
#include "test_camera.h"
|
#include "test_cam.h"
|
||||||
|
#include "test_cam_lh_no.h"
|
||||||
|
#include "test_cam_lh_zo.h"
|
||||||
|
#include "test_cam_rh_no.h"
|
||||||
|
#include "test_cam_rh_zo.h"
|
||||||
|
|
||||||
#undef GLM
|
#undef GLM
|
||||||
#undef GLM_PREFIX
|
#undef GLM_PREFIX
|
||||||
@@ -55,7 +59,11 @@
|
|||||||
#include "test_affine2d.h"
|
#include "test_affine2d.h"
|
||||||
#include "test_affine_mat.h"
|
#include "test_affine_mat.h"
|
||||||
#include "test_ray.h"
|
#include "test_ray.h"
|
||||||
#include "test_camera.h"
|
#include "test_cam.h"
|
||||||
|
#include "test_cam_lh_no.h"
|
||||||
|
#include "test_cam_lh_zo.h"
|
||||||
|
#include "test_cam_rh_no.h"
|
||||||
|
#include "test_cam_rh_zo.h"
|
||||||
|
|
||||||
#undef GLM
|
#undef GLM
|
||||||
#undef GLM_PREFIX
|
#undef GLM_PREFIX
|
||||||
|
|||||||
66
test/tests.h
66
test/tests.h
@@ -124,6 +124,7 @@ TEST_DECLARE(glm_mat4_inv_precise)
|
|||||||
TEST_DECLARE(glm_mat4_swap_col)
|
TEST_DECLARE(glm_mat4_swap_col)
|
||||||
TEST_DECLARE(glm_mat4_swap_row)
|
TEST_DECLARE(glm_mat4_swap_row)
|
||||||
TEST_DECLARE(glm_mat4_rmc)
|
TEST_DECLARE(glm_mat4_rmc)
|
||||||
|
TEST_DECLARE(glm_mat4_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_mat4_ucopy)
|
TEST_DECLARE(glmc_mat4_ucopy)
|
||||||
TEST_DECLARE(glmc_mat4_copy)
|
TEST_DECLARE(glmc_mat4_copy)
|
||||||
@@ -150,6 +151,7 @@ TEST_DECLARE(glmc_mat4_inv_fast)
|
|||||||
TEST_DECLARE(glmc_mat4_swap_col)
|
TEST_DECLARE(glmc_mat4_swap_col)
|
||||||
TEST_DECLARE(glmc_mat4_swap_row)
|
TEST_DECLARE(glmc_mat4_swap_row)
|
||||||
TEST_DECLARE(glmc_mat4_rmc)
|
TEST_DECLARE(glmc_mat4_rmc)
|
||||||
|
TEST_DECLARE(glmc_mat4_make)
|
||||||
|
|
||||||
/* mat3 */
|
/* mat3 */
|
||||||
TEST_DECLARE(glm_mat3_copy)
|
TEST_DECLARE(glm_mat3_copy)
|
||||||
@@ -168,6 +170,7 @@ TEST_DECLARE(glm_mat3_inv)
|
|||||||
TEST_DECLARE(glm_mat3_swap_col)
|
TEST_DECLARE(glm_mat3_swap_col)
|
||||||
TEST_DECLARE(glm_mat3_swap_row)
|
TEST_DECLARE(glm_mat3_swap_row)
|
||||||
TEST_DECLARE(glm_mat3_rmc)
|
TEST_DECLARE(glm_mat3_rmc)
|
||||||
|
TEST_DECLARE(glm_mat3_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_mat3_copy)
|
TEST_DECLARE(glmc_mat3_copy)
|
||||||
TEST_DECLARE(glmc_mat3_identity)
|
TEST_DECLARE(glmc_mat3_identity)
|
||||||
@@ -185,6 +188,7 @@ TEST_DECLARE(glmc_mat3_inv)
|
|||||||
TEST_DECLARE(glmc_mat3_swap_col)
|
TEST_DECLARE(glmc_mat3_swap_col)
|
||||||
TEST_DECLARE(glmc_mat3_swap_row)
|
TEST_DECLARE(glmc_mat3_swap_row)
|
||||||
TEST_DECLARE(glmc_mat3_rmc)
|
TEST_DECLARE(glmc_mat3_rmc)
|
||||||
|
TEST_DECLARE(glmc_mat3_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)
|
||||||
@@ -205,6 +209,7 @@ TEST_DECLARE(glm_mat2_inv)
|
|||||||
TEST_DECLARE(glm_mat2_swap_col)
|
TEST_DECLARE(glm_mat2_swap_col)
|
||||||
TEST_DECLARE(glm_mat2_swap_row)
|
TEST_DECLARE(glm_mat2_swap_row)
|
||||||
TEST_DECLARE(glm_mat2_rmc)
|
TEST_DECLARE(glm_mat2_rmc)
|
||||||
|
TEST_DECLARE(glm_mat2_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_mat2_copy)
|
TEST_DECLARE(glmc_mat2_copy)
|
||||||
TEST_DECLARE(glmc_mat2_identity)
|
TEST_DECLARE(glmc_mat2_identity)
|
||||||
@@ -221,14 +226,22 @@ TEST_DECLARE(glmc_mat2_inv)
|
|||||||
TEST_DECLARE(glmc_mat2_swap_col)
|
TEST_DECLARE(glmc_mat2_swap_col)
|
||||||
TEST_DECLARE(glmc_mat2_swap_row)
|
TEST_DECLARE(glmc_mat2_swap_row)
|
||||||
TEST_DECLARE(glmc_mat2_rmc)
|
TEST_DECLARE(glmc_mat2_rmc)
|
||||||
|
TEST_DECLARE(glmc_mat2_make)
|
||||||
|
|
||||||
/* camera (incl [LR]H cross [NZ]O) */
|
/* camera (incl [LR]H cross [NZ]O) */
|
||||||
TEST_DECLARE(perspective_lh_zo)
|
TEST_DECLARE(glm_perspective_lh_zo)
|
||||||
TEST_DECLARE(perspective_rh_zo)
|
TEST_DECLARE(glm_perspective_rh_zo)
|
||||||
TEST_DECLARE(perspective_lh_no)
|
TEST_DECLARE(glm_perspective_lh_no)
|
||||||
TEST_DECLARE(perspective_rh_no)
|
TEST_DECLARE(glm_perspective_rh_no)
|
||||||
TEST_DECLARE(camera_lookat)
|
TEST_DECLARE(glm_camera_lookat)
|
||||||
TEST_DECLARE(camera_decomp)
|
TEST_DECLARE(glm_camera_decomp)
|
||||||
|
|
||||||
|
TEST_DECLARE(glmc_perspective_lh_zo)
|
||||||
|
TEST_DECLARE(glmc_perspective_rh_zo)
|
||||||
|
TEST_DECLARE(glmc_perspective_lh_no)
|
||||||
|
TEST_DECLARE(glmc_perspective_rh_no)
|
||||||
|
TEST_DECLARE(glmc_camera_lookat)
|
||||||
|
TEST_DECLARE(glmc_camera_decomp)
|
||||||
|
|
||||||
TEST_DECLARE(glm_frustum)
|
TEST_DECLARE(glm_frustum)
|
||||||
|
|
||||||
@@ -298,6 +311,7 @@ TEST_DECLARE(glm_quat_rotate)
|
|||||||
TEST_DECLARE(glm_quat_rotate_at)
|
TEST_DECLARE(glm_quat_rotate_at)
|
||||||
TEST_DECLARE(glm_quat_rotate_atm)
|
TEST_DECLARE(glm_quat_rotate_atm)
|
||||||
TEST_DECLARE(glm_quat_from_vecs)
|
TEST_DECLARE(glm_quat_from_vecs)
|
||||||
|
TEST_DECLARE(glm_quat_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_quat_identity)
|
TEST_DECLARE(glmc_quat_identity)
|
||||||
TEST_DECLARE(glmc_quat_identity_array)
|
TEST_DECLARE(glmc_quat_identity_array)
|
||||||
@@ -336,6 +350,7 @@ TEST_DECLARE(glmc_quat_rotate)
|
|||||||
TEST_DECLARE(glmc_quat_rotate_at)
|
TEST_DECLARE(glmc_quat_rotate_at)
|
||||||
TEST_DECLARE(glmc_quat_rotate_atm)
|
TEST_DECLARE(glmc_quat_rotate_atm)
|
||||||
TEST_DECLARE(glmc_quat_from_vecs)
|
TEST_DECLARE(glmc_quat_from_vecs)
|
||||||
|
TEST_DECLARE(glmc_quat_make)
|
||||||
|
|
||||||
/* bezier */
|
/* bezier */
|
||||||
TEST_DECLARE(bezier)
|
TEST_DECLARE(bezier)
|
||||||
@@ -383,6 +398,7 @@ TEST_DECLARE(glm_vec2_abs)
|
|||||||
TEST_DECLARE(glm_vec2_lerp)
|
TEST_DECLARE(glm_vec2_lerp)
|
||||||
TEST_DECLARE(glm_vec2_complex_mul)
|
TEST_DECLARE(glm_vec2_complex_mul)
|
||||||
TEST_DECLARE(glm_vec2_complex_div)
|
TEST_DECLARE(glm_vec2_complex_div)
|
||||||
|
TEST_DECLARE(glm_vec2_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_vec2)
|
TEST_DECLARE(glmc_vec2)
|
||||||
TEST_DECLARE(glmc_vec2_copy)
|
TEST_DECLARE(glmc_vec2_copy)
|
||||||
@@ -421,6 +437,7 @@ TEST_DECLARE(glmc_vec2_abs)
|
|||||||
TEST_DECLARE(glmc_vec2_lerp)
|
TEST_DECLARE(glmc_vec2_lerp)
|
||||||
TEST_DECLARE(glmc_vec2_complex_mul)
|
TEST_DECLARE(glmc_vec2_complex_mul)
|
||||||
TEST_DECLARE(glmc_vec2_complex_div)
|
TEST_DECLARE(glmc_vec2_complex_div)
|
||||||
|
TEST_DECLARE(glmc_vec2_make)
|
||||||
|
|
||||||
/* vec3 */
|
/* vec3 */
|
||||||
TEST_DECLARE(MACRO_GLM_VEC3_ONE_INIT)
|
TEST_DECLARE(MACRO_GLM_VEC3_ONE_INIT)
|
||||||
@@ -516,6 +533,7 @@ TEST_DECLARE(glm_vec3_abs)
|
|||||||
TEST_DECLARE(glm_vec3_fract)
|
TEST_DECLARE(glm_vec3_fract)
|
||||||
TEST_DECLARE(glm_vec3_hadd)
|
TEST_DECLARE(glm_vec3_hadd)
|
||||||
TEST_DECLARE(glm_vec3_sqrt)
|
TEST_DECLARE(glm_vec3_sqrt)
|
||||||
|
TEST_DECLARE(glm_vec3_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_vec3)
|
TEST_DECLARE(glmc_vec3)
|
||||||
TEST_DECLARE(glmc_vec3_copy)
|
TEST_DECLARE(glmc_vec3_copy)
|
||||||
@@ -585,6 +603,7 @@ TEST_DECLARE(glmc_vec3_abs)
|
|||||||
TEST_DECLARE(glmc_vec3_fract)
|
TEST_DECLARE(glmc_vec3_fract)
|
||||||
TEST_DECLARE(glmc_vec3_hadd)
|
TEST_DECLARE(glmc_vec3_hadd)
|
||||||
TEST_DECLARE(glmc_vec3_sqrt)
|
TEST_DECLARE(glmc_vec3_sqrt)
|
||||||
|
TEST_DECLARE(glmc_vec3_make)
|
||||||
|
|
||||||
/* vec4 */
|
/* vec4 */
|
||||||
TEST_DECLARE(MACRO_GLM_VEC4_ONE_INIT)
|
TEST_DECLARE(MACRO_GLM_VEC4_ONE_INIT)
|
||||||
@@ -666,6 +685,7 @@ TEST_DECLARE(glm_vec4_abs)
|
|||||||
TEST_DECLARE(glm_vec4_fract)
|
TEST_DECLARE(glm_vec4_fract)
|
||||||
TEST_DECLARE(glm_vec4_hadd)
|
TEST_DECLARE(glm_vec4_hadd)
|
||||||
TEST_DECLARE(glm_vec4_sqrt)
|
TEST_DECLARE(glm_vec4_sqrt)
|
||||||
|
TEST_DECLARE(glm_vec4_make)
|
||||||
|
|
||||||
TEST_DECLARE(glmc_vec4)
|
TEST_DECLARE(glmc_vec4)
|
||||||
TEST_DECLARE(glmc_vec4_copy3)
|
TEST_DECLARE(glmc_vec4_copy3)
|
||||||
@@ -731,6 +751,7 @@ TEST_DECLARE(glmc_vec4_abs)
|
|||||||
TEST_DECLARE(glmc_vec4_fract)
|
TEST_DECLARE(glmc_vec4_fract)
|
||||||
TEST_DECLARE(glmc_vec4_hadd)
|
TEST_DECLARE(glmc_vec4_hadd)
|
||||||
TEST_DECLARE(glmc_vec4_sqrt)
|
TEST_DECLARE(glmc_vec4_sqrt)
|
||||||
|
TEST_DECLARE(glmc_vec4_make)
|
||||||
|
|
||||||
/* ivec2 */
|
/* ivec2 */
|
||||||
TEST_DECLARE(glm_ivec2)
|
TEST_DECLARE(glm_ivec2)
|
||||||
@@ -958,6 +979,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_mat4_swap_col)
|
TEST_ENTRY(glm_mat4_swap_col)
|
||||||
TEST_ENTRY(glm_mat4_swap_row)
|
TEST_ENTRY(glm_mat4_swap_row)
|
||||||
TEST_ENTRY(glm_mat4_rmc)
|
TEST_ENTRY(glm_mat4_rmc)
|
||||||
|
TEST_ENTRY(glm_mat4_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_mat4_ucopy)
|
TEST_ENTRY(glmc_mat4_ucopy)
|
||||||
TEST_ENTRY(glmc_mat4_copy)
|
TEST_ENTRY(glmc_mat4_copy)
|
||||||
@@ -984,6 +1006,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_mat4_swap_col)
|
TEST_ENTRY(glmc_mat4_swap_col)
|
||||||
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)
|
||||||
|
|
||||||
/* mat3 */
|
/* mat3 */
|
||||||
TEST_ENTRY(glm_mat3_copy)
|
TEST_ENTRY(glm_mat3_copy)
|
||||||
@@ -1002,6 +1025,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_mat3_swap_col)
|
TEST_ENTRY(glm_mat3_swap_col)
|
||||||
TEST_ENTRY(glm_mat3_swap_row)
|
TEST_ENTRY(glm_mat3_swap_row)
|
||||||
TEST_ENTRY(glm_mat3_rmc)
|
TEST_ENTRY(glm_mat3_rmc)
|
||||||
|
TEST_ENTRY(glm_mat3_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_mat3_copy)
|
TEST_ENTRY(glmc_mat3_copy)
|
||||||
TEST_ENTRY(glmc_mat3_identity)
|
TEST_ENTRY(glmc_mat3_identity)
|
||||||
@@ -1019,6 +1043,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_mat3_swap_col)
|
TEST_ENTRY(glmc_mat3_swap_col)
|
||||||
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(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)
|
||||||
@@ -1039,6 +1064,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_mat2_swap_col)
|
TEST_ENTRY(glm_mat2_swap_col)
|
||||||
TEST_ENTRY(glm_mat2_swap_row)
|
TEST_ENTRY(glm_mat2_swap_row)
|
||||||
TEST_ENTRY(glm_mat2_rmc)
|
TEST_ENTRY(glm_mat2_rmc)
|
||||||
|
TEST_ENTRY(glm_mat2_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_mat2_copy)
|
TEST_ENTRY(glmc_mat2_copy)
|
||||||
TEST_ENTRY(glmc_mat2_identity)
|
TEST_ENTRY(glmc_mat2_identity)
|
||||||
@@ -1055,14 +1081,22 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_mat2_swap_col)
|
TEST_ENTRY(glmc_mat2_swap_col)
|
||||||
TEST_ENTRY(glmc_mat2_swap_row)
|
TEST_ENTRY(glmc_mat2_swap_row)
|
||||||
TEST_ENTRY(glmc_mat2_rmc)
|
TEST_ENTRY(glmc_mat2_rmc)
|
||||||
|
TEST_ENTRY(glmc_mat2_make)
|
||||||
|
|
||||||
/* camera (incl [LR]H cross [NZ]O) */
|
/* camera (incl [LR]H cross [NZ]O) */
|
||||||
TEST_ENTRY(perspective_lh_zo)
|
TEST_ENTRY(glm_perspective_lh_zo)
|
||||||
TEST_ENTRY(perspective_rh_zo)
|
TEST_ENTRY(glm_perspective_rh_zo)
|
||||||
TEST_ENTRY(perspective_lh_no)
|
TEST_ENTRY(glm_perspective_lh_no)
|
||||||
TEST_ENTRY(perspective_rh_no)
|
TEST_ENTRY(glm_perspective_rh_no)
|
||||||
TEST_ENTRY(camera_lookat)
|
TEST_ENTRY(glm_camera_lookat)
|
||||||
TEST_ENTRY(camera_decomp)
|
TEST_ENTRY(glm_camera_decomp)
|
||||||
|
|
||||||
|
TEST_ENTRY(glmc_perspective_lh_zo)
|
||||||
|
TEST_ENTRY(glmc_perspective_rh_zo)
|
||||||
|
TEST_ENTRY(glmc_perspective_lh_no)
|
||||||
|
TEST_ENTRY(glmc_perspective_rh_no)
|
||||||
|
TEST_ENTRY(glmc_camera_lookat)
|
||||||
|
TEST_ENTRY(glmc_camera_decomp)
|
||||||
|
|
||||||
TEST_ENTRY(glm_frustum)
|
TEST_ENTRY(glm_frustum)
|
||||||
|
|
||||||
@@ -1132,6 +1166,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_quat_rotate_at)
|
TEST_ENTRY(glm_quat_rotate_at)
|
||||||
TEST_ENTRY(glm_quat_rotate_atm)
|
TEST_ENTRY(glm_quat_rotate_atm)
|
||||||
TEST_ENTRY(glm_quat_from_vecs)
|
TEST_ENTRY(glm_quat_from_vecs)
|
||||||
|
TEST_ENTRY(glm_quat_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_quat_identity)
|
TEST_ENTRY(glmc_quat_identity)
|
||||||
TEST_ENTRY(glmc_quat_identity_array)
|
TEST_ENTRY(glmc_quat_identity_array)
|
||||||
@@ -1170,6 +1205,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_quat_rotate_at)
|
TEST_ENTRY(glmc_quat_rotate_at)
|
||||||
TEST_ENTRY(glmc_quat_rotate_atm)
|
TEST_ENTRY(glmc_quat_rotate_atm)
|
||||||
TEST_ENTRY(glmc_quat_from_vecs)
|
TEST_ENTRY(glmc_quat_from_vecs)
|
||||||
|
TEST_ENTRY(glmc_quat_make)
|
||||||
|
|
||||||
/* bezier */
|
/* bezier */
|
||||||
TEST_ENTRY(bezier)
|
TEST_ENTRY(bezier)
|
||||||
@@ -1216,6 +1252,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_vec2_lerp)
|
TEST_ENTRY(glm_vec2_lerp)
|
||||||
TEST_ENTRY(glm_vec2_complex_mul)
|
TEST_ENTRY(glm_vec2_complex_mul)
|
||||||
TEST_ENTRY(glm_vec2_complex_div)
|
TEST_ENTRY(glm_vec2_complex_div)
|
||||||
|
TEST_ENTRY(glm_vec2_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_vec2)
|
TEST_ENTRY(glmc_vec2)
|
||||||
TEST_ENTRY(glmc_vec2_copy)
|
TEST_ENTRY(glmc_vec2_copy)
|
||||||
@@ -1254,6 +1291,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_vec2_lerp)
|
TEST_ENTRY(glmc_vec2_lerp)
|
||||||
TEST_ENTRY(glmc_vec2_complex_mul)
|
TEST_ENTRY(glmc_vec2_complex_mul)
|
||||||
TEST_ENTRY(glmc_vec2_complex_div)
|
TEST_ENTRY(glmc_vec2_complex_div)
|
||||||
|
TEST_ENTRY(glmc_vec2_make)
|
||||||
|
|
||||||
/* vec3 */
|
/* vec3 */
|
||||||
TEST_ENTRY(MACRO_GLM_VEC3_ONE_INIT)
|
TEST_ENTRY(MACRO_GLM_VEC3_ONE_INIT)
|
||||||
@@ -1348,6 +1386,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_vec3_fract)
|
TEST_ENTRY(glm_vec3_fract)
|
||||||
TEST_ENTRY(glm_vec3_hadd)
|
TEST_ENTRY(glm_vec3_hadd)
|
||||||
TEST_ENTRY(glm_vec3_sqrt)
|
TEST_ENTRY(glm_vec3_sqrt)
|
||||||
|
TEST_ENTRY(glm_vec3_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_vec3)
|
TEST_ENTRY(glmc_vec3)
|
||||||
TEST_ENTRY(glmc_vec3_copy)
|
TEST_ENTRY(glmc_vec3_copy)
|
||||||
@@ -1417,6 +1456,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_vec3_fract)
|
TEST_ENTRY(glmc_vec3_fract)
|
||||||
TEST_ENTRY(glmc_vec3_hadd)
|
TEST_ENTRY(glmc_vec3_hadd)
|
||||||
TEST_ENTRY(glmc_vec3_sqrt)
|
TEST_ENTRY(glmc_vec3_sqrt)
|
||||||
|
TEST_ENTRY(glmc_vec3_make)
|
||||||
|
|
||||||
/* vec4 */
|
/* vec4 */
|
||||||
TEST_ENTRY(MACRO_GLM_VEC4_ONE_INIT)
|
TEST_ENTRY(MACRO_GLM_VEC4_ONE_INIT)
|
||||||
@@ -1498,6 +1538,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glm_vec4_fract)
|
TEST_ENTRY(glm_vec4_fract)
|
||||||
TEST_ENTRY(glm_vec4_hadd)
|
TEST_ENTRY(glm_vec4_hadd)
|
||||||
TEST_ENTRY(glm_vec4_sqrt)
|
TEST_ENTRY(glm_vec4_sqrt)
|
||||||
|
TEST_ENTRY(glm_vec4_make)
|
||||||
|
|
||||||
TEST_ENTRY(glmc_vec4)
|
TEST_ENTRY(glmc_vec4)
|
||||||
TEST_ENTRY(glmc_vec4_copy3)
|
TEST_ENTRY(glmc_vec4_copy3)
|
||||||
@@ -1563,6 +1604,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_vec4_fract)
|
TEST_ENTRY(glmc_vec4_fract)
|
||||||
TEST_ENTRY(glmc_vec4_hadd)
|
TEST_ENTRY(glmc_vec4_hadd)
|
||||||
TEST_ENTRY(glmc_vec4_sqrt)
|
TEST_ENTRY(glmc_vec4_sqrt)
|
||||||
|
TEST_ENTRY(glmc_vec4_make)
|
||||||
|
|
||||||
/* ivec2 */
|
/* ivec2 */
|
||||||
TEST_ENTRY(glm_ivec2)
|
TEST_ENTRY(glm_ivec2)
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user