Compare commits

...

49 Commits

Author SHA1 Message Date
Recep Aslantas
c221f8883a struct: provide option to omit struct api namespace e.g. glms_ and an … 2023-04-09 17:20:38 +03:00
Recep Aslantas
ea8ef4a3c9 struct: provide option to omit struct api namespace e.g. glms_ and an option to add s suffix e.g. mat4s_mul if preferred 2023-04-09 14:28:05 +03:00
Recep Aslantas
0b3049dca0 utility to print selected simd path (docs) 2023-04-08 01:03:31 +03:00
Recep Aslantas
a542d54fca utility to print selected simd path 2023-04-08 00:59:06 +03:00
Recep Aslantas
1d51459a4f Merge pull request #287 from krishna2803/patch-1
Updated parameter name (d -> dest)
2023-04-02 14:00:14 +03:00
krishna2803
6e35d927eb Updated parameter name (d -> dest) 2023-04-02 16:20:45 +05:30
Recep Aslantas
92a8e38162 vscode settings 2023-03-23 23:18:08 +03:00
Recep Aslantas
dd3c3ceae0 Merge pull request #280 from recp/win32-msvc-arm-neon
fix building ARM NEON on windows & msvc
2023-03-16 13:19:47 +03:00
Recep Aslantas
77b4c5cffb reset visual studio tool verisons 2023-03-16 13:16:24 +03:00
Recep Aslantas
e276b5b405 Update intrin.h 2023-03-14 09:54:32 +03:00
Recep Aslantas
13ed79a61a arm: fix checking arm64 2023-03-12 16:43:47 +03:00
Recep Aslantas
ba993b3ea9 arm: use intrin to set/init vec4 as @gottfriedleibniz suggests 2023-03-11 14:15:30 +03:00
Recep Aslantas
4a6fc485fd use CGLM_SIMD_NEON instead of CGLM_NEON_FP 2023-03-09 22:16:39 +03:00
Recep Aslantas
9ed325018d Update intrin.h 2023-03-09 22:06:20 +03:00
Recep Aslantas
a30baffafa arm: update ARM/NEON macros 2023-03-09 21:56:25 +03:00
Recep Aslantas
8a117017ea fix building ARM NEON on windows & msvc 2023-03-07 13:11:08 +03:00
Recep Aslantas
799749fc6a Merge pull request #279 from NeRdTheNed/master
Check for builtin before using it
2023-03-07 03:44:36 +03:00
Ned Loynd
f4c9ddf530 Check for builtin before using it
The check for __has_builtin being defined and using the __has_builtin() macro need to be on different lines, as when __has_builtin is not defined, using the __has_builtin() macro is an invalid preprocessor directive.
2023-03-07 10:17:44 +11:00
Recep Aslantas
bc8dc72739 now working on v0.9.0 2023-02-08 18:12:23 +03:00
Recep Aslantas
3eafc599ac Merge pull request #277 from Ransel117/patch-1
Fixed glm_mat4_mulv3
2023-02-08 18:09:58 +03:00
Ransel117
7fba424f64 Fixed glm_mat4_mulv3
Fixed it so that the function has all of it's parameters in the comments
2023-02-05 20:57:36 +01:00
Recep Aslantas
c51040cd41 Merge pull request #276 from recp/cmake-fix-buildtype
cmake: prevent overriding CMAKE_BUILD_TYPE if it is subdirectory
2023-01-27 21:01:54 +03:00
Recep Aslantas
9fc3a20d0f cmake: prevent overriding CMAKE_BUILD_TYPE if it is subdirectory 2023-01-26 11:07:08 +03:00
Recep Aslantas
7f1c062696 Merge pull request #274 from duarm/master
Adding initialization macros for ivec types
2023-01-17 21:07:32 +03:00
duarm
e70571e9e0 ivec initialization macros docs, fixing vec2 macro docs 2023-01-15 20:52:18 -03:00
duarm
007ee48b58 adding initialization macros for ivec types 2023-01-15 20:47:40 -03:00
Recep Aslantas
38771599c7 Merge pull request #273 from JulianSchoenbaechler/fix-Wdouble-promotion
Make implicit double promotion/casting explicit (fixes #228)
2022-12-31 21:18:40 +03:00
Julian Schönbächler
bfd87acfc4 Make double promotion in printf args explicit
Also use f-suffix on epsilon definitions for float comparisons.
2022-12-29 13:00:15 +01:00
Recep Aslantas
a38622e1d6 Merge pull request #272 from Artturin/revert259
Revert "fix: simplified pkgconfig generation"
2022-12-19 20:07:37 +03:00
Artturin
9c7012bb39 Revert "fix: simplified pkgconfig generation"
This reverts commit c7393f75c3.
2022-12-19 00:22:55 +02:00
Recep Aslantas
71367b67cf now working on v0.8.9 2022-12-14 14:12:29 +03:00
Recep Aslantas
3894ea32fb Merge pull request #270 from suicvne/cglm-pc-fix-cmake
Switch CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR for cmake.pc
2022-12-13 20:17:03 +03:00
Michael Santiago
a430408ec4 Switch CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR for cmake.pc install target 2022-12-13 10:59:54 -05:00
Recep Aslantas
3815e18fea bring the fix https://github.com/recp/cglm/pull/269 outside Emscripten 2022-12-12 00:37:07 +03:00
Recep Aslantas
8b5eaa5301 Merge pull request #269 from KivApple/master
Fix missing abs declaration on Emscripten
2022-12-09 14:54:37 +03:00
Ivan Kolesikov
6037618942 Fix missing abs declaration on Emscripten 2022-12-09 00:24:53 +01:00
Recep Aslantas
c6d198d780 Merge pull request #268 from bl4ckb0ne/test-clamp-fix
test_clamp: use glm_eq for floating point comparison
2022-12-07 23:17:13 +03:00
Simon Zeni
d001593f9c test_clamp: use glm_eq for floating point comparison
Fixes #266
2022-12-07 15:06:45 -05:00
Recep Aslantas
ac9461778c possible fix for https://github.com/recp/cglm/issues/266 2022-12-07 12:57:26 +03:00
Recep Aslantas
0b3d227568 Merge branch 'master' of https://github.com/recp/cglm 2022-12-07 12:55:57 +03:00
Recep Aslantas
78236d24a1 now working on v0.8.8 2022-12-07 12:55:51 +03:00
Recep Aslantas
b41858f184 Merge pull request #265 from duarm/abs-functions
New abs functions for vec2, ivec2, ivec3, ivec4
2022-11-20 12:16:49 +03:00
duarm
60bf21ba43 add missing table of contents 2022-11-19 17:48:32 -03:00
duarm
2386cdcc19 docs 2022-11-19 17:46:08 -03:00
duarm
a0f01c5ed1 new abs functions for vec2, ivec2, ivec3, ivec4 2022-11-18 14:28:39 -03:00
Recep Aslantas
8cfc98d283 Merge branch 'master' of https://github.com/recp/cglm 2022-10-26 23:15:54 +03:00
Recep Aslantas
074189163f add missing struct affine functions and headers 2022-10-26 23:15:27 +03:00
Recep Aslantas
bfbd9ba1dc add struct affine functions and headers 2022-10-26 23:13:36 +03:00
Recep Aslantas
89cee7912a now working on v0.8.7 2022-10-26 23:12:52 +03:00
63 changed files with 1687 additions and 518 deletions

20
.vscode/c_cpp_properties.json vendored Normal file
View File

@@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [],
"macFrameworkPath": [
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
],
"compilerPath": "/usr/bin/clang",
"cStandard": "c23",
"cppStandard": "c++23",
"intelliSenseMode": "macos-clang-arm64",
"configurationProvider": "vector-of-bool.cmake-tools"
}
],
"version": 4
}

29
.vscode/settings.json vendored
View File

@@ -1,4 +1,31 @@
{
"C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
"restructuredtext.confPath": "${workspaceFolder}/docs/source"
"restructuredtext.confPath": "${workspaceFolder}/docs/source",
"workbench.colorTheme": "Default Light+ Experimental",
"editor.fontSize": 14,
"workbench.colorCustomizations": {
"[Default Light*]": {
"editor.background": "#fefefe",
"sideBar.background": "#fefefe",
"sideBar.foreground": "#343436",
"sideBarTitle.foreground": "#343436",
"sideBar.border": "#e2e2e4",
"statusBar.background": "#fefefe",
"titleBar.activeBackground": "#fefefe",
"tab.activeBackground": "#f4fff4aa",
"tab.inactiveBackground": "#fefefe",
"activityBar.background": "#fefefe",
"editorGroupHeader.tabsBackground": "#fefefe"
},
"[Default Dark*]": {
"editor.background": "#1D1D25",
"sideBar.background": "#1D1D25",
"statusBar.background": "#1D1D25",
"titleBar.activeBackground": "#1D1D25",
"tab.activeBackground": "#2C2C3A",
"tab.inactiveBackground": "#1D1D25",
"activityBar.background": "#1D1D25",
"editorGroupHeader.tabsBackground": "#1D1D25"
}
},
}

View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.8.2)
project(cglm
VERSION 0.8.6
VERSION 0.9.0
HOMEPAGE_URL https://github.com/recp/cglm
DESCRIPTION "OpenGL Mathematics (glm) for C"
LANGUAGES C
@@ -41,7 +41,9 @@ else()
add_compile_options(-Wall -Werror -O3)
endif()
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
get_directory_property(hasParent PARENT_DIRECTORY)
if(NOT hasParent AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui
@@ -157,7 +159,21 @@ install(EXPORT ${PROJECT_NAME}
NAMESPACE ${PROJECT_NAME}::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
set(PACKAGE_NAME ${PROJECT_NAME})
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
else()
set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()
if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
set(libdir "${CMAKE_INSTALL_LIBDIR}")
else()
set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
endif()
set(PACKAGE_VERSION "${PROJECT_VERSION}")
configure_file(cglm.pc.in cglm.pc @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/cglm.pc
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cglm.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

View File

@@ -45,6 +45,8 @@ cglm_HEADERS = include/cglm/version.h \
include/cglm/mat4.h \
include/cglm/mat3.h \
include/cglm/mat2.h \
include/cglm/affine-pre.h \
include/cglm/affine-post.h \
include/cglm/affine.h \
include/cglm/affine-mat.h \
include/cglm/vec2.h \

View File

@@ -1,11 +1,11 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix="${prefix}"
libdir="${exec_prefix}/lib"
includedir="${prefix}/include"
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: @PROJECT_NAME@
Description: @CMAKE_PROJECT_DESCRIPTION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
Name: @PACKAGE_NAME@
Description: OpenGL Mathematics (glm) for C
URL: https://github.com/recp/cglm
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcglm @LIBS@

View File

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
# Description
s.name = "cglm"
s.version = "0.8.4"
s.version = "0.8.9"
s.summary = "📽 Highly Optimized Graphics Math (glm) for C"
s.description = <<-DESC
cglm is math library for graphics programming for C. See the documentation or README for all features.

View File

@@ -7,7 +7,7 @@
#*****************************************************************************
AC_PREREQ([2.69])
AC_INIT([cglm], [0.8.6], [info@recp.me])
AC_INIT([cglm], [0.9.0], [info@recp.me])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects serial-tests])
# Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.

View File

@@ -101,7 +101,7 @@ Functions documentation
Parameters:
| *[in]* **box** AABB
| *[in]* **padding** padding
| *[out]* **d** result matrix
| *[out]* **dest** result matrix
.. c:function:: void glm_ortho_aabb_pz(vec3 box[2], float padding, mat4 dest)
@@ -113,7 +113,7 @@ Functions documentation
Parameters:
| *[in]* **box** AABB
| *[in]* **padding** padding for near and far
| *[out]* **d** result matrix
| *[out]* **dest** result matrix
Returns:
square of norm / magnitude

View File

@@ -62,9 +62,9 @@ author = u'Recep Aslantas'
# built documents.
#
# The short X.Y version.
version = u'0.8.6'
version = u'0.9.0'
# The full version, including alpha/beta/rc tags.
release = u'0.8.6'
release = u'0.9.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View File

@@ -8,6 +8,13 @@ Header: cglm/ivec2.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_IVEC2_ONE_INIT
#. GLM_IVEC2_ZERO_INIT
#. GLM_IVEC2_ONE
#. GLM_IVEC2_ZERO
Functions:
1. :c:func:`glm_ivec2`
@@ -25,6 +32,7 @@ Functions:
#. :c:func:`glm_ivec2_maxv`
#. :c:func:`glm_ivec2_minv`
#. :c:func:`glm_ivec2_clamp`
#. :c:func:`glm_ivec2_abs`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,3 +169,11 @@ Functions documentation
| *[in, out]* **v** vector
| *[in]* **minVal** minimum value
| *[in]* **maxVal** maximum value
.. c:function:: void glm_ivec2_abs(ivec2 v, ivec2 dest)
absolute value of each vector item
Parameters:
| *[in]* **v** vector
| *[out]* **dest** destination vector

View File

@@ -8,6 +8,13 @@ Header: cglm/ivec3.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_IVEC3_ONE_INIT
#. GLM_IVEC3_ZERO_INIT
#. GLM_IVEC3_ONE
#. GLM_IVEC3_ZERO
Functions:
1. :c:func:`glm_ivec3`
@@ -25,6 +32,7 @@ Functions:
#. :c:func:`glm_ivec3_maxv`
#. :c:func:`glm_ivec3_minv`
#. :c:func:`glm_ivec3_clamp`
#. :c:func:`glm_ivec2_abs`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,3 +169,11 @@ Functions documentation
| *[in, out]* **v** vector
| *[in]* **minVal** minimum value
| *[in]* **maxVal** maximum value
.. c:function:: void glm_ivec3_abs(ivec3 v, ivec3 dest)
absolute value of each vector item
Parameters:
| *[in]* **v** vector
| *[out]* **dest** destination vector

View File

@@ -8,6 +8,13 @@ Header: cglm/ivec4.h
Table of contents (click to go):
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Macros:
1. GLM_IVEC4_ONE_INIT
#. GLM_IVEC4_ZERO_INIT
#. GLM_IVEC4_ONE
#. GLM_IVEC4_ZERO
Functions:
1. :c:func:`glm_ivec4`
@@ -25,6 +32,7 @@ Functions:
#. :c:func:`glm_ivec4_maxv`
#. :c:func:`glm_ivec4_minv`
#. :c:func:`glm_ivec4_clamp`
#. :c:func:`glm_ivec4_abs`
Functions documentation
~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,3 +169,11 @@ Functions documentation
| *[in, out]* **v** vector
| *[in]* **minVal** minimum value
| *[in]* **maxVal** maximum value
.. c:function:: void glm_ivec4_abs(ivec4 v, ivec4 dest)
absolute value of each vector item
Parameters:
| *[in]* **v** vector
| *[out]* **dest** destination vector

View File

@@ -26,6 +26,7 @@ Functions:
#. :c:func:`glm_vec2_isinf`
#. :c:func:`glm_vec2_isvalid`
#. :c:func:`glm_vec2_sign`
#. :c:func:`glm_vec2_abs`
#. :c:func:`glm_vec2_sqrt`
Functions documentation
@@ -125,6 +126,14 @@ Functions documentation
| *[in]* **v** vector
| *[out]* **dest** sign vector (only keeps signs as -1, 0, -1)
.. c:function:: void glm_vec2_abs(vec2 v, vec2 dest)
absolute value of each vector item
Parameters:
| *[in]* **v** vector
| *[out]* **dest** destination vector
.. c:function:: void glm_vec2_sqrt(vec2 v, vec2 dest)
square root of each vector item

View File

@@ -10,10 +10,10 @@ Table of contents (click to go):
Macros:
1. GLM_vec2_ONE_INIT
#. GLM_vec2_ZERO_INIT
#. GLM_vec2_ONE
#. GLM_vec2_ZERO
1. GLM_VEC2_ONE_INIT
#. GLM_VEC2_ZERO_INIT
#. GLM_VEC2_ONE
#. GLM_VEC2_ZERO
Functions:

View File

@@ -27,6 +27,7 @@ Functions:
#. :c:func:`glm_vec3_isinf`
#. :c:func:`glm_vec3_isvalid`
#. :c:func:`glm_vec3_sign`
#. :c:func:`glm_vec3_abs`
#. :c:func:`glm_vec3_sqrt`
Functions documentation
@@ -134,6 +135,14 @@ Functions documentation
| *[in]* **v** vector
| *[out]* **dest** sign vector (only keeps signs as -1, 0, -1)
.. c:function:: void glm_vec3_abs(vec3 v, vec3 dest)
absolute value of each vector item
Parameters:
| *[in]* **v** vector
| *[out]* **dest** destination vector
.. c:function:: void glm_vec3_sqrt(vec3 v, vec3 dest)
square root of each vector item

View File

@@ -73,6 +73,10 @@ CGLM_EXPORT
void
glmc_ivec2_clamp(ivec2 v, int minVal, int maxVal);
CGLM_EXPORT
void
glmc_ivec2_abs(ivec2 v, ivec2 dest);
#ifdef __cplusplus
}
#endif

View File

@@ -73,6 +73,10 @@ CGLM_EXPORT
void
glmc_ivec3_clamp(ivec3 v, int minVal, int maxVal);
CGLM_EXPORT
void
glmc_ivec3_abs(ivec3 v, ivec3 dest);
#ifdef __cplusplus
}
#endif

View File

@@ -73,6 +73,10 @@ CGLM_EXPORT
void
glmc_ivec4_clamp(ivec4 v, int minVal, int maxVal);
CGLM_EXPORT
void
glmc_ivec4_abs(ivec4 v, ivec4 dest);
#ifdef __cplusplus
}
#endif

View File

@@ -145,6 +145,10 @@ CGLM_EXPORT
void
glmc_vec2_clamp(vec2 v, float minval, float maxval);
CGLM_EXPORT
void
glmc_vec2_abs(vec2 v, vec2 dest);
CGLM_EXPORT
void
glmc_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest);

View File

@@ -18,6 +18,7 @@
#include <stdint.h>
#include <stddef.h>
#include <stdlib.h>
#include <math.h>
#include <float.h>
#include <stdbool.h>
@@ -44,7 +45,7 @@
#ifndef CGLM_USE_DEFAULT_EPSILON
# ifndef GLM_FLT_EPSILON
# define GLM_FLT_EPSILON 1e-5
# define GLM_FLT_EPSILON 1e-5f
# endif
#else
# define GLM_FLT_EPSILON FLT_EPSILON
@@ -81,4 +82,34 @@
# endif
#endif
/* struct API configurator */
/* TODO: move struct/common.h? */
/* WARN: dont use concant helpers outside cglm headers, because they may be changed */
#define CGLM_MACRO_CONCAT_HELPER(A, B, C, D, E, ...) A ## B ## C ## D ## E ## __VA_ARGS__
#define CGLM_MACRO_CONCAT(A, B, C, D, E, ...) CGLM_MACRO_CONCAT_HELPER(A, B, C, D, E,__VA_ARGS__)
#ifndef CGLM_OMIT_NS_FROM_STRUCT_API
# ifndef CGLM_STRUCT_API_NS
# define CGLM_STRUCT_API_NS glms
# endif
# ifndef CGLM_STRUCT_API_NS_SEPERATOR
# define CGLM_STRUCT_API_NS_SEPERATOR _
# endif
#else
# define CGLM_STRUCT_API_NS
# define CGLM_STRUCT_API_NS_SEPERATOR
#endif
#ifndef CGLM_STRUCT_API_NAME_SUFFIX
# define CGLM_STRUCT_API_NAME_SUFFIX
#endif
#define CGLM_STRUCTAPI(A, ...) CGLM_MACRO_CONCAT(CGLM_STRUCT_API_NS, \
CGLM_STRUCT_API_NS_SEPERATOR, \
A, \
CGLM_STRUCT_API_NAME_SUFFIX, \
_, \
__VA_ARGS__)
#endif /* cglm_common_h */

View File

@@ -49,7 +49,7 @@
#endif
#ifndef CGLM_PRINT_MAX_TO_SHORT
# define CGLM_PRINT_MAX_TO_SHORT 1e5
# define CGLM_PRINT_MAX_TO_SHORT 1e5f
#endif
#ifndef CGLM_PRINT_COLOR
@@ -60,6 +60,32 @@
# define CGLM_PRINT_COLOR_RESET "\033[0m"
#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) {
#ifdef CGLM_SIMD_x86
fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: x86 SSE*"
#ifdef __AVX__
" AVX"
#endif
"\n\n" CGLM_PRINT_COLOR_RESET);
#elif defined(CGLM_SIMD_ARM)
fprintf(ostream, CGLM_PRINT_COLOR "\ncglm arch: arm"
#ifndef __ARM_NEON_FP
" NEON_FP"
#endif
#ifdef CGLM_ARM64
" ARM64"
#endif
"\n\n" CGLM_PRINT_COLOR_RESET);
#endif
}
CGLM_INLINE
void
glm_mat4_print(mat4 matrix,
@@ -77,9 +103,9 @@ glm_mat4_print(mat4 matrix,
for (i = 0; i < m; i++) {
for (j = 0; j < n; j++) {
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, (double)matrix[i][j]);
else
cwi = sprintf(buff, "% g", matrix[i][j]);
cwi = sprintf(buff, "% g", (double)matrix[i][j]);
cw[i] = GLM_MAX(cw[i], cwi);
}
}
@@ -89,9 +115,9 @@ glm_mat4_print(mat4 matrix,
for (j = 0; j < n; j++)
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, matrix[j][i]);
fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, (double)matrix[j][i]);
else
fprintf(ostream, " % *g", cw[j], matrix[j][i]);
fprintf(ostream, " % *g", cw[j], (double)matrix[j][i]);
fprintf(ostream, " |\n");
}
@@ -120,9 +146,9 @@ glm_mat3_print(mat3 matrix,
for (i = 0; i < m; i++) {
for (j = 0; j < n; j++) {
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, (double)matrix[i][j]);
else
cwi = sprintf(buff, "% g", matrix[i][j]);
cwi = sprintf(buff, "% g", (double)matrix[i][j]);
cw[i] = GLM_MAX(cw[i], cwi);
}
}
@@ -132,9 +158,9 @@ glm_mat3_print(mat3 matrix,
for (j = 0; j < n; j++)
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, matrix[j][i]);
fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, (double)matrix[j][i]);
else
fprintf(ostream, " % *g", cw[j], matrix[j][i]);
fprintf(ostream, " % *g", cw[j], (double)matrix[j][i]);
fprintf(ostream, " |\n");
}
@@ -162,9 +188,9 @@ glm_mat2_print(mat2 matrix,
for (i = 0; i < m; i++) {
for (j = 0; j < n; j++) {
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, (double)matrix[i][j]);
else
cwi = sprintf(buff, "% g", matrix[i][j]);
cwi = sprintf(buff, "% g", (double)matrix[i][j]);
cw[i] = GLM_MAX(cw[i], cwi);
}
}
@@ -174,9 +200,9 @@ glm_mat2_print(mat2 matrix,
for (j = 0; j < n; j++)
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, matrix[j][i]);
fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, (double)matrix[j][i]);
else
fprintf(ostream, " % *g", cw[j], matrix[j][i]);
fprintf(ostream, " % *g", cw[j], (double)matrix[j][i]);
fprintf(ostream, " |\n");
}
@@ -199,9 +225,9 @@ glm_vec4_print(vec4 vec,
for (i = 0; i < m; i++) {
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
else
fprintf(ostream, " % g", vec[i]);
fprintf(ostream, " % g", (double)vec[i]);
}
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
@@ -221,9 +247,9 @@ glm_vec3_print(vec3 vec,
for (i = 0; i < m; i++) {
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
else
fprintf(ostream, " % g", vec[i]);
fprintf(ostream, " % g", (double)vec[i]);
}
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
@@ -261,9 +287,9 @@ glm_vec2_print(vec2 vec,
for (i = 0; i < m; i++) {
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
else
fprintf(ostream, " % g", vec[i]);
fprintf(ostream, " % g", (double)vec[i]);
}
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
@@ -283,9 +309,9 @@ glm_versor_print(versor vec,
for (i = 0; i < m; i++) {
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
else
fprintf(ostream, " % g", vec[i]);
fprintf(ostream, " % g", (double)vec[i]);
}
@@ -310,9 +336,9 @@ glm_aabb_print(vec3 bbox[2],
for (j = 0; j < m; j++) {
if (bbox[i][j] < CGLM_PRINT_MAX_TO_SHORT)
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, bbox[i][j]);
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)bbox[i][j]);
else
fprintf(ostream, " % g", bbox[i][j]);
fprintf(ostream, " % g", (double)bbox[i][j]);
}
fprintf(ostream, " )\n");

View File

@@ -6,7 +6,13 @@
*/
/*
FUNCTIONS:
Macros:
GLM_IVEC2_ONE_INIT
GLM_IVEC2_ZERO_INIT
GLM_IVEC2_ONE
GLM_IVEC2_ZERO
Functions:
CGLM_INLINE void glm_ivec2(int * __restrict v, ivec2 dest)
CGLM_INLINE void glm_ivec2_copy(ivec2 a, ivec2 dest)
CGLM_INLINE void glm_ivec2_zero(ivec2 v)
@@ -22,6 +28,7 @@ FUNCTIONS:
CGLM_INLINE void glm_ivec2_maxv(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_minv(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_clamp(ivec2 v, int minVal, int maxVal)
CGLM_INLINE void glm_ivec2_abs(ivec2 v, ivec2 dest)
*/
#ifndef cglm_ivec2_h
@@ -29,6 +36,12 @@ FUNCTIONS:
#include "common.h"
#define GLM_IVEC2_ONE_INIT {1, 1}
#define GLM_IVEC2_ZERO_INIT {0, 0}
#define GLM_IVEC2_ONE ((ivec2)GLM_IVEC2_ONE_INIT)
#define GLM_IVEC2_ZERO ((ivec2)GLM_IVEC2_ZERO_INIT)
/*!
* @brief init ivec2 using vec3 or vec4
*
@@ -239,4 +252,17 @@ glm_ivec2_clamp(ivec2 v, int minVal, int maxVal) {
v[1] = maxVal;
}
/*!
* @brief absolute value of v
*
* @param[in] v vector
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_ivec2_abs(ivec2 v, ivec2 dest) {
dest[0] = abs(v[0]);
dest[1] = abs(v[1]);
}
#endif /* cglm_ivec2_h */

View File

@@ -6,7 +6,13 @@
*/
/*
FUNCTIONS:
Macros:
GLM_IVEC3_ONE_INIT
GLM_IVEC3_ZERO_INIT
GLM_IVEC3_ONE
GLM_IVEC3_ZERO
Functions:
CGLM_INLINE void glm_ivec3(ivec4 v4, ivec3 dest)
CGLM_INLINE void glm_ivec3_copy(ivec3 a, ivec3 dest)
CGLM_INLINE void glm_ivec3_zero(ivec3 v)
@@ -22,6 +28,7 @@ FUNCTIONS:
CGLM_INLINE void glm_ivec3_maxv(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_minv(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_clamp(ivec3 v, int minVal, int maxVal)
CGLM_INLINE void glm_ivec3_abs(ivec3 v, ivec3 dest)
*/
#ifndef cglm_ivec3_h
@@ -29,6 +36,12 @@ FUNCTIONS:
#include "common.h"
#define GLM_IVEC3_ONE_INIT {1, 1, 1}
#define GLM_IVEC3_ZERO_INIT {0, 0, 0}
#define GLM_IVEC3_ONE ((ivec3)GLM_IVEC3_ONE_INIT)
#define GLM_IVEC3_ZERO ((ivec3)GLM_IVEC3_ZERO_INIT)
/*!
* @brief init ivec3 using ivec4
*
@@ -255,4 +268,18 @@ glm_ivec3_clamp(ivec3 v, int minVal, int maxVal) {
v[2] = maxVal;
}
/*!
* @brief absolute value of v
*
* @param[in] v vector
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_ivec3_abs(ivec3 v, ivec3 dest) {
dest[0] = abs(v[0]);
dest[1] = abs(v[1]);
dest[2] = abs(v[2]);
}
#endif /* cglm_ivec3_h */

View File

@@ -6,7 +6,13 @@
*/
/*
FUNCTIONS:
Macros:
GLM_IVEC4_ONE_INIT
GLM_IVEC4_ZERO_INIT
GLM_IVEC4_ONE
GLM_IVEC4_ZERO
Functions:
CGLM_INLINE void glm_ivec4(ivec3 v3, int last, ivec4 dest)
CGLM_INLINE void glm_ivec4_copy(ivec4 a, ivec4 dest)
CGLM_INLINE void glm_ivec4_zero(ivec4 v)
@@ -22,6 +28,7 @@ FUNCTIONS:
CGLM_INLINE void glm_ivec4_maxv(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_minv(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_clamp(ivec4 v, int minVal, int maxVal)
CGLM_INLINE void glm_ivec4_abs(ivec4 v, ivec4 dest)
*/
#ifndef cglm_ivec4_h
@@ -29,6 +36,12 @@ FUNCTIONS:
#include "common.h"
#define GLM_IVEC4_ONE_INIT {1, 1, 1, 1}
#define GLM_IVEC4_ZERO_INIT {0, 0, 0, 0}
#define GLM_IVEC4_ONE ((ivec4)GLM_IVEC4_ONE_INIT)
#define GLM_IVEC4_ZERO ((ivec4)GLM_IVEC4_ZERO_INIT)
/*!
* @brief init ivec4 using ivec3
*
@@ -272,4 +285,19 @@ glm_ivec4_clamp(ivec4 v, int minVal, int maxVal) {
v[3] = maxVal;
}
/*!
* @brief absolute value of v
*
* @param[in] v vector
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_ivec4_abs(ivec4 v, ivec4 dest) {
dest[0] = abs(v[0]);
dest[1] = abs(v[1]);
dest[2] = abs(v[2]);
dest[3] = abs(v[3]);
}
#endif /* cglm_ivec4_h */

View File

@@ -29,7 +29,7 @@
CGLM_INLINE void glm_mat4_mul(mat4 m1, mat4 m2, mat4 dest);
CGLM_INLINE void glm_mat4_mulN(mat4 *matrices[], int len, mat4 dest);
CGLM_INLINE void glm_mat4_mulv(mat4 m, vec4 v, vec4 dest);
CGLM_INLINE void glm_mat4_mulv3(mat4 m, vec3 v, vec3 dest);
CGLM_INLINE void glm_mat4_mulv3(mat4 m, vec3 v, float last, vec3 dest);
CGLM_INLINE float glm_mat4_trace(mat4 m);
CGLM_INLINE float glm_mat4_trace3(mat4 m);
CGLM_INLINE void glm_mat4_quat(mat4 m, versor dest) ;

View File

@@ -12,6 +12,8 @@
#if defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC) || defined(__aarch64__)
# define CGLM_ARM64 1
#else
# define CGLM_ARM64 0
#endif
#define glmm_load(p) vld1q_f32(p)
@@ -38,6 +40,18 @@
#define glmm_combine_lh(x, y) vcombine_f32(vget_low_f32(x), vget_high_f32(y))
#define glmm_combine_hh(x, y) vcombine_f32(vget_high_f32(x), vget_high_f32(y))
#if defined(_WIN32) && defined(_MSC_VER)
/* # define glmm_float32x4_init(x, y, z, w) { .n128_f32 = { x, y, z, w } } */
CGLM_INLINE
float32x4_t
glmm_float32x4_init(float x, float y, float z, float w) {
CGLM_ALIGN(16) float v[4] = {x, y, z, w};
return vld1q_f32(v);
}
#else
# define glmm_float32x4_init(x, y, z, w) { x, y, z, w }
#endif
static inline
float32x4_t
glmm_abs(float32x4_t v) {

View File

@@ -63,17 +63,43 @@
#endif
/* ARM Neon */
#if defined(__ARM_NEON)
#if defined(_WIN32)
/* TODO: non-ARM stuff already inported, will this be better option */
/* # include <intrin.h> */
# if defined(_M_ARM64) || defined(_M_HYBRID_X86_ARM64) || defined(_M_ARM64EC)
# include <arm64intr.h>
# include <arm64_neon.h>
# ifndef CGLM_NEON_FP
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# elif defined(_M_ARM)
# include <armintr.h>
# include <arm_neon.h>
# ifndef CGLM_NEON_FP
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# endif
#else /* non-windows */
# if defined(__ARM_NEON) || defined(__ARM_NEON__)
# include <arm_neon.h>
# if defined(__ARM_NEON_FP)
# define CGLM_NEON_FP 1
# endif
# ifndef CGLM_SIMD_ARM
# define CGLM_SIMD_ARM
# endif
# endif
#endif
#if defined(CGLM_SIMD_x86) || defined(CGLM_NEON_FP)
#if defined(CGLM_SIMD_x86) || defined(CGLM_SIMD_ARM)
# ifndef CGLM_SIMD
# define CGLM_SIMD
# endif

View File

@@ -7,7 +7,7 @@
#ifndef cglm_affine_neon_h
#define cglm_affine_neon_h
#if defined(__ARM_NEON_FP)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"

View File

@@ -7,7 +7,7 @@
#ifndef cglm_mat2_neon_h
#define cglm_mat2_neon_h
#if defined(__ARM_NEON_FP)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"

View File

@@ -7,7 +7,7 @@
#ifndef cglm_mat4_neon_h
#define cglm_mat4_neon_h
#if defined(__ARM_NEON_FP)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"
@@ -108,7 +108,7 @@ glm_mat4_det_neon(mat4 mat) {
float32x4_t r0, r1, r2, r3, x0, x1, x2;
float32x2_t ij, op, mn, kl, nn, mm, jj, ii, gh, ef, t12, t34;
float32x4x2_t a1;
float32x4_t x3 = { 0.f, -0.f, 0.f, -0.f };
float32x4_t x3 = glmm_float32x4_init(0.f, -0.f, 0.f, -0.f);
/* 127 <- 0, [square] det(A) = det(At) */
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;
float32x4x2_t a1;
float32x2_t lp, ko, hg, jn, im, fe, ae, bf, cg, dh;
float32x4_t x9 = { -0.f, 0.f, -0.f, 0.f };
float32x4_t x9 = glmm_float32x4_init(-0.f, 0.f, -0.f, 0.f);
x8 = vrev64q_f32(x9);

View File

@@ -7,7 +7,7 @@
#ifndef cglm_quat_neon_h
#define cglm_quat_neon_h
#if defined(__ARM_NEON_FP)
#if defined(CGLM_NEON_FP)
#include "../../common.h"
#include "../intrin.h"
@@ -23,7 +23,7 @@ glm_quat_mul_neon(versor p, versor q, versor dest) {
*/
glmm_128 xp, xq, xqr, r, x, y, z, s2, s3;
glmm_128 s1 = {-0.f, 0.f, 0.f, -0.f};
glmm_128 s1 = glmm_float32x4_init(-0.f, 0.f, 0.f, -0.f);
float32x2_t qh, ql;
xp = glmm_load(p); /* 3 2 1 0 */

View File

@@ -0,0 +1,184 @@
/*
* 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_translated(mat4s m, vec3s v);
CGLM_INLINE mat4s glms_translated_x(mat4s m, float x);
CGLM_INLINE mat4s glms_translated_y(mat4s m, float y);
CGLM_INLINE mat4s glms_translated_z(mat4s m, float z);
CGLM_INLINE mat4s glms_rotated_x(mat4s m, float angle);
CGLM_INLINE mat4s glms_rotated_y(mat4s m, float angle);
CGLM_INLINE mat4s glms_rotated_z(mat4s m, float angle);
CGLM_INLINE mat4s glms_rotated(mat4s m, float angle, vec3s axis);
CGLM_INLINE mat4s glms_rotated_at(mat4s m, vec3s pivot, float angle, vec3s axis);
CGLM_INLINE mat4s glms_spinned(mat4s m, float angle, vec3s axis);
*/
#ifndef cglms_affines_post_h
#define cglms_affines_post_h
#include "../common.h"
#include "../types-struct.h"
#include "../affine.h"
#include "vec3.h"
#include "vec4.h"
#include "mat4.h"
/*!
* @brief translate existing transform matrix by v vector
* and stores result in same matrix
*
* @param[in] m affine transfrom
* @param[in] v translate vector [x, y, z]
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translated(mat4s m, vec3s v) {
glm_translated(m.raw, v.raw);
return m;
}
/*!
* @brief translate existing transform matrix by x factor
*
* @param[in] m affine transfrom
* @param[in] x x factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translated_x(mat4s m, float x) {
glm_translated_x(m.raw, x);
return m;
}
/*!
* @brief translate existing transform matrix by y factor
*
* @param[in] m affine transfrom
* @param[in] y y factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translated_y(mat4s m, float y) {
glm_translated_y(m.raw, y);
return m;
}
/*!
* @brief translate existing transform matrix by z factor
*
* @param[in] m affine transfrom
* @param[in] z z factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translated_z(mat4s m, float z) {
glm_translated_z(m.raw, z);
return m;
}
/*!
* @brief rotate existing transform matrix around X axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotated_x(mat4s m, float angle) {
mat4s r;
glm_rotated_x(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around Y axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotated_y(mat4s m, float angle) {
mat4s r;
glm_rotated_y(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around Z axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotated_z(mat4s m, float angle) {
mat4s r;
glm_rotated_z(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around given axis by angle
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_rotated(mat4s m, float angle, vec3s axis) {
glm_rotated(m.raw, angle, axis.raw);
return m;
}
/*!
* @brief rotate existing transform
* around given axis by angle at given pivot point (rotation center)
*
* @param[in] m affine transfrom
* @param[in] pivot rotation center
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_rotated_at(mat4s m, vec3s pivot, float angle, vec3s axis) {
glm_rotated_at(m.raw, pivot.raw, angle, axis.raw);
return m;
}
/*!
* @brief rotate existing transform matrix around given axis by angle around self (doesn't affected by position)
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_spinned(mat4s m, float angle, vec3s axis) {
glm_spinned(m.raw, angle, axis.raw);
return m;
}
#endif /* cglms_affines_post_h */

View File

@@ -0,0 +1,184 @@
/*
* 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_translate(mat4s m, vec3s v);
CGLM_INLINE mat4s glms_translate_x(mat4s m, float x);
CGLM_INLINE mat4s glms_translate_y(mat4s m, float y);
CGLM_INLINE mat4s glms_translate_z(mat4s m, float z);
CGLM_INLINE mat4s glms_rotate_x(mat4s m, float angle);
CGLM_INLINE mat4s glms_rotate_y(mat4s m, float angle);
CGLM_INLINE mat4s glms_rotate_z(mat4s m, float angle);
CGLM_INLINE mat4s glms_rotate(mat4s m, float angle, vec3s axis);
CGLM_INLINE mat4s glms_rotate_at(mat4s m, vec3s pivot, float angle, vec3s axis);
CGLM_INLINE mat4s glms_spin(mat4s m, float angle, vec3s axis);
*/
#ifndef cglms_affines_pre_h
#define cglms_affines_pre_h
#include "../common.h"
#include "../types-struct.h"
#include "../affine.h"
#include "vec3.h"
#include "vec4.h"
#include "mat4.h"
/*!
* @brief translate existing transform matrix by v vector
* and stores result in same matrix
*
* @param[in] m affine transfrom
* @param[in] v translate vector [x, y, z]
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate(mat4s m, vec3s v) {
glm_translate(m.raw, v.raw);
return m;
}
/*!
* @brief translate existing transform matrix by x factor
*
* @param[in] m affine transfrom
* @param[in] x x factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate_x(mat4s m, float x) {
glm_translate_x(m.raw, x);
return m;
}
/*!
* @brief translate existing transform matrix by y factor
*
* @param[in] m affine transfrom
* @param[in] y y factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate_y(mat4s m, float y) {
glm_translate_y(m.raw, y);
return m;
}
/*!
* @brief translate existing transform matrix by z factor
*
* @param[in] m affine transfrom
* @param[in] z z factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate_z(mat4s m, float z) {
glm_translate_z(m.raw, z);
return m;
}
/*!
* @brief rotate existing transform matrix around X axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotate_x(mat4s m, float angle) {
mat4s r;
glm_rotate_x(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around Y axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotate_y(mat4s m, float angle) {
mat4s r;
glm_rotate_y(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around Z axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotate_z(mat4s m, float angle) {
mat4s r;
glm_rotate_z(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around given axis by angle
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_rotate(mat4s m, float angle, vec3s axis) {
glm_rotate(m.raw, angle, axis.raw);
return m;
}
/*!
* @brief rotate existing transform
* around given axis by angle at given pivot point (rotation center)
*
* @param[in] m affine transfrom
* @param[in] pivot rotation center
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_rotate_at(mat4s m, vec3s pivot, float angle, vec3s axis) {
glm_rotate_at(m.raw, pivot.raw, angle, axis.raw);
return m;
}
/*!
* @brief rotate existing transform matrix around given axis by angle around self (doesn't affected by position)
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_spin(mat4s m, float angle, vec3s axis) {
glm_spin(m.raw, angle, axis.raw);
return m;
}
#endif /* cglms_affines_pre_h */

View File

@@ -40,63 +40,6 @@
#include "vec4.h"
#include "mat4.h"
/*!
* @brief translate existing transform matrix by v vector
* and stores result in same matrix
*
* @param[in] m affine transfrom
* @param[in] v translate vector [x, y, z]
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate(mat4s m, vec3s v) {
glm_translate(m.raw, v.raw);
return m;
}
/*!
* @brief translate existing transform matrix by x factor
*
* @param[in] m affine transfrom
* @param[in] x x factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate_x(mat4s m, float x) {
glm_translate_x(m.raw, x);
return m;
}
/*!
* @brief translate existing transform matrix by y factor
*
* @param[in] m affine transfrom
* @param[in] y y factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate_y(mat4s m, float y) {
glm_translate_y(m.raw, y);
return m;
}
/*!
* @brief translate existing transform matrix by z factor
*
* @param[in] m affine transfrom
* @param[in] z z factor
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_translate_z(mat4s m, float z) {
glm_translate_z(m.raw, z);
return m;
}
/*!
* @brief creates NEW translate transform matrix by v vector
*
@@ -156,54 +99,6 @@ glms_scale_uni(mat4s m, float s) {
return m;
}
/*!
* @brief rotate existing transform matrix around X axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotate_x(mat4s m, float angle) {
mat4s r;
glm_rotate_x(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around Y axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotate_y(mat4s m, float angle) {
mat4s r;
glm_rotate_y(m.raw, angle, r.raw);
return r;
}
/*!
* @brief rotate existing transform matrix around Z axis by angle
* and store result in dest
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @returns rotated matrix
*/
CGLM_INLINE
mat4s
glms_rotate_z(mat4s m, float angle) {
mat4s r;
glm_rotate_z(m.raw, angle, r.raw);
return r;
}
/*!
* @brief creates NEW rotation matrix by angle and axis
*
@@ -221,38 +116,6 @@ glms_rotate_make(float angle, vec3s axis) {
return m;
}
/*!
* @brief rotate existing transform matrix around given axis by angle
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_rotate(mat4s m, float angle, vec3s axis) {
glm_rotate(m.raw, angle, axis.raw);
return m;
}
/*!
* @brief rotate existing transform
* around given axis by angle at given pivot point (rotation center)
*
* @param[in] m affine transfrom
* @param[in] pivot rotation center
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_rotate_at(mat4s m, vec3s pivot, float angle, vec3s axis) {
glm_rotate_at(m.raw, pivot.raw, angle, axis.raw);
return m;
}
/*!
* @brief creates NEW rotation matrix by angle and axis at given point
*
@@ -274,21 +137,6 @@ glms_rotate_atm(mat4s m, vec3s pivot, float angle, vec3s axis) {
return m;
}
/*!
* @brief rotate existing transform matrix around given axis by angle around self (doesn't affected by position)
*
* @param[in] m affine transfrom
* @param[in] angle angle (radians)
* @param[in] axis axis
* @returns affine transfrom
*/
CGLM_INLINE
mat4s
glms_spin(mat4s m, float angle, vec3s axis) {
glm_spin(m.raw, angle, axis.raw);
return m;
}
/*!
* @brief decompose scale vector
*
@@ -346,4 +194,7 @@ glms_decompose(mat4s m, vec4s * __restrict t, mat4s * __restrict r, vec3s * __re
glm_decompose(m.raw, t->raw, r->raw, s->raw);
}
#include "affine-pre.h"
#include "affine-post.h"
#endif /* cglms_affines_h */

View File

@@ -15,6 +15,9 @@
#include "vec4.h"
#include "mat4.h"
/* api definition */
#define glms_aabb_(NAME) CGLM_STRUCTAPI(aabb, NAME)
/*!
* @brief apply transform to Axis-Aligned Bounding Box
*
@@ -24,7 +27,7 @@
*/
CGLM_INLINE
void
glms_aabb_transform(vec3s box[2], mat4s m, vec3s dest[2]) {
glms_aabb_(transform)(vec3s box[2], mat4s m, vec3s dest[2]) {
vec3 rawBox[2];
vec3 rawDest[2];
@@ -45,7 +48,7 @@ glms_aabb_transform(vec3s box[2], mat4s m, vec3s dest[2]) {
*/
CGLM_INLINE
void
glms_aabb_merge(vec3s box1[2], vec3s box2[2], vec3s dest[2]) {
glms_aabb_(merge)(vec3s box1[2], vec3s box2[2], vec3s dest[2]) {
vec3 rawBox1[2];
vec3 rawBox2[2];
vec3 rawDest[2];
@@ -69,7 +72,7 @@ glms_aabb_merge(vec3s box1[2], vec3s box2[2], vec3s dest[2]) {
*/
CGLM_INLINE
void
glms_aabb_crop(vec3s box[2], vec3s cropBox[2], vec3s dest[2]) {
glms_aabb_(crop)(vec3s box[2], vec3s cropBox[2], vec3s dest[2]) {
vec3 rawBox[2];
vec3 rawCropBox[2];
vec3 rawDest[2];
@@ -94,7 +97,7 @@ glms_aabb_crop(vec3s box[2], vec3s cropBox[2], vec3s dest[2]) {
*/
CGLM_INLINE
void
glms_aabb_crop_until(vec3s box[2],
glms_aabb_(crop_until)(vec3s box[2],
vec3s cropBox[2],
vec3s clampBox[2],
vec3s dest[2]) {
@@ -118,7 +121,7 @@ glms_aabb_crop_until(vec3s box[2],
*/
CGLM_INLINE
bool
glms_aabb_frustum(vec3s box[2], vec4s planes[6]) {
glms_aabb_(frustum)(vec3s box[2], vec4s planes[6]) {
vec3 rawBox[2];
vec4 rawPlanes[6];
@@ -134,7 +137,7 @@ glms_aabb_frustum(vec3s box[2], vec4s planes[6]) {
*/
CGLM_INLINE
void
glms_aabb_invalidate(vec3s box[2]) {
glms_aabb_(invalidate)(vec3s box[2]) {
box[0] = glms_vec3_broadcast(FLT_MAX);
box[1] = glms_vec3_broadcast(-FLT_MAX);
}
@@ -146,7 +149,7 @@ glms_aabb_invalidate(vec3s box[2]) {
*/
CGLM_INLINE
bool
glms_aabb_isvalid(vec3s box[2]) {
glms_aabb_(isvalid)(vec3s box[2]) {
vec3 rawBox[2];
glms_vec3_unpack(rawBox, box, 2);
return glm_aabb_isvalid(rawBox);
@@ -159,7 +162,7 @@ glms_aabb_isvalid(vec3s box[2]) {
*/
CGLM_INLINE
float
glms_aabb_size(vec3s box[2]) {
glms_aabb_(size)(vec3s box[2]) {
return glm_vec3_distance(box[0].raw, box[1].raw);
}
@@ -170,7 +173,7 @@ glms_aabb_size(vec3s box[2]) {
*/
CGLM_INLINE
float
glms_aabb_radius(vec3s box[2]) {
glms_aabb_(radius)(vec3s box[2]) {
return glms_aabb_size(box) * 0.5f;
}
@@ -182,7 +185,7 @@ glms_aabb_radius(vec3s box[2]) {
*/
CGLM_INLINE
vec3s
glms_aabb_center(vec3s box[2]) {
glms_aabb_(center)(vec3s box[2]) {
return glms_vec3_center(box[0], box[1]);
}
@@ -194,7 +197,7 @@ glms_aabb_center(vec3s box[2]) {
*/
CGLM_INLINE
bool
glms_aabb_aabb(vec3s box[2], vec3s other[2]) {
glms_aabb_(aabb)(vec3s box[2], vec3s other[2]) {
vec3 rawBox[2];
vec3 rawOther[2];
@@ -214,7 +217,7 @@ glms_aabb_aabb(vec3s box[2], vec3s other[2]) {
*/
CGLM_INLINE
bool
glms_aabb_sphere(vec3s box[2], vec4s s) {
glms_aabb_(sphere)(vec3s box[2], vec4s s) {
vec3 rawBox[2];
glms_vec3_unpack(rawBox, box, 2);
@@ -229,7 +232,7 @@ glms_aabb_sphere(vec3s box[2], vec4s s) {
*/
CGLM_INLINE
bool
glms_aabb_point(vec3s box[2], vec3s point) {
glms_aabb_(point)(vec3s box[2], vec3s point) {
vec3 rawBox[2];
glms_vec3_unpack(rawBox, box, 2);
@@ -244,7 +247,7 @@ glms_aabb_point(vec3s box[2], vec3s point) {
*/
CGLM_INLINE
bool
glms_aabb_contains(vec3s box[2], vec3s other[2]) {
glms_aabb_(contains)(vec3s box[2], vec3s other[2]) {
vec3 rawBox[2];
vec3 rawOther[2];

View File

@@ -36,6 +36,9 @@
#include "../types-struct.h"
#include "../mat2.h"
/* api definition */
#define glms_mat2_(NAME) CGLM_STRUCTAPI(mat2, NAME)
#define GLMS_MAT2_IDENTITY_INIT {GLM_MAT2_IDENTITY_INIT}
#define GLMS_MAT2_ZERO_INIT {GLM_MAT2_ZERO_INIT}
@@ -59,7 +62,7 @@
*/
CGLM_INLINE
mat2s
glms_mat2_identity(void) {
glms_mat2_(identity)(void) {
mat2s r;
glm_mat2_identity(r.raw);
return r;
@@ -75,7 +78,7 @@ glms_mat2_identity(void) {
*/
CGLM_INLINE
void
glms_mat2_identity_array(mat2s * __restrict mat, size_t count) {
glms_mat2_(identity_array)(mat2s * __restrict mat, size_t count) {
CGLM_ALIGN_MAT mat2s t = GLMS_MAT2_IDENTITY_INIT;
size_t i;
@@ -91,7 +94,7 @@ glms_mat2_identity_array(mat2s * __restrict mat, size_t count) {
*/
CGLM_INLINE
mat2s
glms_mat2_zero(void) {
glms_mat2_(zero)(void) {
mat2s r;
glm_mat2_zero(r.raw);
return r;
@@ -114,7 +117,7 @@ glms_mat2_zero(void) {
*/
CGLM_INLINE
mat2s
glms_mat2_mul(mat2s m1, mat2s m2) {
glms_mat2_(mul)(mat2s m1, mat2s m2) {
mat2s r;
glm_mat2_mul(m1.raw, m2.raw, r.raw);
return r;
@@ -129,7 +132,7 @@ glms_mat2_mul(mat2s m1, mat2s m2) {
*/
CGLM_INLINE
mat2s
glms_mat2_transpose(mat2s m) {
glms_mat2_(transpose)(mat2s m) {
glm_mat2_transpose(m.raw);
return m;
}
@@ -143,7 +146,7 @@ glms_mat2_transpose(mat2s m) {
*/
CGLM_INLINE
vec2s
glms_mat2_mulv(mat2s m, vec2s v) {
glms_mat2_(mulv)(mat2s m, vec2s v) {
vec2s r;
glm_mat2_mulv(m.raw, v.raw, r.raw);
return r;
@@ -158,7 +161,7 @@ glms_mat2_mulv(mat2s m, vec2s v) {
*/
CGLM_INLINE
float
glms_mat2_trace(mat2s m) {
glms_mat2_(trace)(mat2s m) {
return glm_mat2_trace(m.raw);
}
@@ -173,7 +176,7 @@ glms_mat2_trace(mat2s m) {
*/
CGLM_INLINE
mat2s
glms_mat2_scale(mat2s m, float s) {
glms_mat2_(scale)(mat2s m, float s) {
glm_mat2_scale(m.raw, s);
return m;
}
@@ -187,7 +190,7 @@ glms_mat2_scale(mat2s m, float s) {
*/
CGLM_INLINE
float
glms_mat2_det(mat2s mat) {
glms_mat2_(det)(mat2s mat) {
return glm_mat2_det(mat.raw);
}
@@ -199,7 +202,7 @@ glms_mat2_det(mat2s mat) {
*/
CGLM_INLINE
mat2s
glms_mat2_inv(mat2s mat) {
glms_mat2_(inv)(mat2s mat) {
mat2s r;
glm_mat2_inv(mat.raw, r.raw);
return r;
@@ -215,7 +218,7 @@ glms_mat2_inv(mat2s mat) {
*/
CGLM_INLINE
mat2s
glms_mat2_swap_col(mat2s mat, int col1, int col2) {
glms_mat2_(swap_col)(mat2s mat, int col1, int col2) {
glm_mat2_swap_col(mat.raw, col1, col2);
return mat;
}
@@ -230,7 +233,7 @@ glms_mat2_swap_col(mat2s mat, int col1, int col2) {
*/
CGLM_INLINE
mat2s
glms_mat2_swap_row(mat2s mat, int row1, int row2) {
glms_mat2_(swap_row)(mat2s mat, int row1, int row2) {
glm_mat2_swap_row(mat.raw, row1, row2);
return mat;
}
@@ -251,7 +254,7 @@ glms_mat2_swap_row(mat2s mat, int row1, int row2) {
*/
CGLM_INLINE
float
glms_mat2_rmc(vec2s r, mat2s m, vec2s c) {
glms_mat2_(rmc)(vec2s r, mat2s m, vec2s c) {
return glm_mat2_rmc(r.raw, m.raw, c.raw);
}

View File

@@ -38,6 +38,9 @@
#include "../mat3.h"
#include "vec3.h"
/* api definition */
#define glms_mat3_(NAME) CGLM_STRUCTAPI(mat3, NAME)
#define GLMS_MAT3_IDENTITY_INIT {GLM_MAT3_IDENTITY_INIT}
#define GLMS_MAT3_ZERO_INIT {GLM_MAT3_ZERO_INIT}
@@ -53,7 +56,7 @@
*/
CGLM_INLINE
mat3s
glms_mat3_copy(mat3s mat) {
glms_mat3_(copy)(mat3s mat) {
mat3s r;
glm_mat3_copy(mat.raw, r.raw);
return r;
@@ -75,7 +78,7 @@ glms_mat3_copy(mat3s mat) {
*/
CGLM_INLINE
mat3s
glms_mat3_identity(void) {
glms_mat3_(identity)(void) {
mat3s r;
glm_mat3_identity(r.raw);
return r;
@@ -91,7 +94,7 @@ glms_mat3_identity(void) {
*/
CGLM_INLINE
void
glms_mat3_identity_array(mat3s * __restrict mat, size_t count) {
glms_mat3_(identity_array)(mat3s * __restrict mat, size_t count) {
CGLM_ALIGN_MAT mat3s t = GLMS_MAT3_IDENTITY_INIT;
size_t i;
@@ -107,7 +110,7 @@ glms_mat3_identity_array(mat3s * __restrict mat, size_t count) {
*/
CGLM_INLINE
mat3s
glms_mat3_zero(void) {
glms_mat3_(zero)(void) {
mat3s r;
glm_mat3_zero(r.raw);
return r;
@@ -129,7 +132,7 @@ glms_mat3_zero(void) {
*/
CGLM_INLINE
mat3s
glms_mat3_mul(mat3s m1, mat3s m2) {
glms_mat3_(mul)(mat3s m1, mat3s m2) {
mat3s r;
glm_mat3_mul(m1.raw, m2.raw, r.raw);
return r;
@@ -142,7 +145,7 @@ glms_mat3_mul(mat3s m1, mat3s m2) {
*/
CGLM_INLINE
mat3s
glms_mat3_transpose(mat3s m) {
glms_mat3_(transpose)(mat3s m) {
glm_mat3_transpose(m.raw);
return m;
}
@@ -156,7 +159,7 @@ glms_mat3_transpose(mat3s m) {
*/
CGLM_INLINE
vec3s
glms_mat3_mulv(mat3s m, vec3s v) {
glms_mat3_(mulv)(mat3s m, vec3s v) {
vec3s r;
glm_mat3_mulv(m.raw, v.raw, r.raw);
return r;
@@ -171,7 +174,7 @@ glms_mat3_mulv(mat3s m, vec3s v) {
*/
CGLM_INLINE
float
glms_mat3_trace(mat3s m) {
glms_mat3_(trace)(mat3s m) {
return glm_mat3_trace(m.raw);
}
@@ -183,7 +186,7 @@ glms_mat3_trace(mat3s m) {
*/
CGLM_INLINE
versors
glms_mat3_quat(mat3s m) {
glms_mat3_(quat)(mat3s m) {
versors r;
glm_mat3_quat(m.raw, r.raw);
return r;
@@ -200,7 +203,7 @@ glms_mat3_quat(mat3s m) {
*/
CGLM_INLINE
mat3s
glms_mat3_scale(mat3s m, float s) {
glms_mat3_(scale)(mat3s m, float s) {
glm_mat3_scale(m.raw, s);
return m;
}
@@ -214,7 +217,7 @@ glms_mat3_scale(mat3s m, float s) {
*/
CGLM_INLINE
float
glms_mat3_det(mat3s mat) {
glms_mat3_(det)(mat3s mat) {
return glm_mat3_det(mat.raw);
}
@@ -226,7 +229,7 @@ glms_mat3_det(mat3s mat) {
*/
CGLM_INLINE
mat3s
glms_mat3_inv(mat3s mat) {
glms_mat3_(inv)(mat3s mat) {
mat3s r;
glm_mat3_inv(mat.raw, r.raw);
return r;
@@ -242,7 +245,7 @@ glms_mat3_inv(mat3s mat) {
*/
CGLM_INLINE
mat3s
glms_mat3_swap_col(mat3s mat, int col1, int col2) {
glms_mat3_(swap_col)(mat3s mat, int col1, int col2) {
glm_mat3_swap_col(mat.raw, col1, col2);
return mat;
}
@@ -257,7 +260,7 @@ glms_mat3_swap_col(mat3s mat, int col1, int col2) {
*/
CGLM_INLINE
mat3s
glms_mat3_swap_row(mat3s mat, int row1, int row2) {
glms_mat3_(swap_row)(mat3s mat, int row1, int row2) {
glm_mat3_swap_row(mat.raw, row1, row2);
return mat;
}
@@ -278,7 +281,7 @@ glms_mat3_swap_row(mat3s mat, int row1, int row2) {
*/
CGLM_INLINE
float
glms_mat3_rmc(vec3s r, mat3s m, vec3s c) {
glms_mat3_(rmc)(vec3s r, mat3s m, vec3s c) {
return glm_mat3_rmc(r.raw, m.raw, c.raw);
}

View File

@@ -53,6 +53,9 @@
#include "vec4.h"
#include "vec3.h"
/* api definition */
#define glms_mat4_(NAME) CGLM_STRUCTAPI(mat4, NAME)
#define GLMS_MAT4_IDENTITY_INIT {GLM_MAT4_IDENTITY_INIT}
#define GLMS_MAT4_ZERO_INIT {GLM_MAT4_ZERO_INIT}
@@ -71,7 +74,7 @@
*/
CGLM_INLINE
mat4s
glms_mat4_ucopy(mat4s mat) {
glms_mat4_(ucopy)(mat4s mat) {
mat4s r;
glm_mat4_ucopy(mat.raw, r.raw);
return r;
@@ -85,7 +88,7 @@ glms_mat4_ucopy(mat4s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_copy(mat4s mat) {
glms_mat4_(copy)(mat4s mat) {
mat4s r;
glm_mat4_copy(mat.raw, r.raw);
return r;
@@ -107,7 +110,7 @@ glms_mat4_copy(mat4s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_identity(void) {
glms_mat4_(identity)(void) {
mat4s r;
glm_mat4_identity(r.raw);
return r;
@@ -123,7 +126,7 @@ glms_mat4_identity(void) {
*/
CGLM_INLINE
void
glms_mat4_identity_array(mat4s * __restrict mat, size_t count) {
glms_mat4_(identity_array)(mat4s * __restrict mat, size_t count) {
CGLM_ALIGN_MAT mat4s t = GLMS_MAT4_IDENTITY_INIT;
size_t i;
@@ -139,7 +142,7 @@ glms_mat4_identity_array(mat4s * __restrict mat, size_t count) {
*/
CGLM_INLINE
mat4s
glms_mat4_zero(void) {
glms_mat4_(zero)(void) {
mat4s r;
glm_mat4_zero(r.raw);
return r;
@@ -153,7 +156,7 @@ glms_mat4_zero(void) {
*/
CGLM_INLINE
mat3s
glms_mat4_pick3(mat4s mat) {
glms_mat4_(pick3)(mat4s mat) {
mat3s r;
glm_mat4_pick3(mat.raw, r.raw);
return r;
@@ -169,7 +172,7 @@ glms_mat4_pick3(mat4s mat) {
*/
CGLM_INLINE
mat3s
glms_mat4_pick3t(mat4s mat) {
glms_mat4_(pick3t)(mat4s mat) {
mat3s r;
glm_mat4_pick3t(mat.raw, r.raw);
return r;
@@ -183,7 +186,7 @@ glms_mat4_pick3t(mat4s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_ins3(mat3s mat) {
glms_mat4_(ins3)(mat3s mat) {
mat4s r;
glm_mat4_ins3(mat.raw, r.raw);
return r;
@@ -205,7 +208,7 @@ glms_mat4_ins3(mat3s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_mul(mat4s m1, mat4s m2) {
glms_mat4_(mul)(mat4s m1, mat4s m2) {
mat4s r;
glm_mat4_mul(m1.raw, m2.raw, r.raw);
return r;
@@ -232,7 +235,7 @@ glms_mat4_mul(mat4s m1, mat4s m2) {
*/
CGLM_INLINE
mat4s
glms_mat4_mulN(mat4s * __restrict matrices[], uint32_t len) {
glms_mat4_(mulN)(mat4s * __restrict matrices[], uint32_t len) {
CGLM_ALIGN_MAT mat4s r = GLMS_MAT4_IDENTITY_INIT;
size_t i;
@@ -252,7 +255,7 @@ glms_mat4_mulN(mat4s * __restrict matrices[], uint32_t len) {
*/
CGLM_INLINE
vec4s
glms_mat4_mulv(mat4s m, vec4s v) {
glms_mat4_(mulv)(mat4s m, vec4s v) {
vec4s r;
glm_mat4_mulv(m.raw, v.raw, r.raw);
return r;
@@ -267,7 +270,7 @@ glms_mat4_mulv(mat4s m, vec4s v) {
*/
CGLM_INLINE
float
glms_mat4_trace(mat4s m) {
glms_mat4_(trace)(mat4s m) {
return glm_mat4_trace(m.raw);
}
@@ -280,7 +283,7 @@ glms_mat4_trace(mat4s m) {
*/
CGLM_INLINE
float
glms_mat4_trace3(mat4s m) {
glms_mat4_(trace3)(mat4s m) {
return glm_mat4_trace3(m.raw);
}
@@ -292,7 +295,7 @@ glms_mat4_trace3(mat4s m) {
*/
CGLM_INLINE
versors
glms_mat4_quat(mat4s m) {
glms_mat4_(quat)(mat4s m) {
versors r;
glm_mat4_quat(m.raw, r.raw);
return r;
@@ -308,7 +311,7 @@ glms_mat4_quat(mat4s m) {
*/
CGLM_INLINE
vec3s
glms_mat4_mulv3(mat4s m, vec3s v, float last) {
glms_mat4_(mulv3)(mat4s m, vec3s v, float last) {
vec3s r;
glm_mat4_mulv3(m.raw, v.raw, last, r.raw);
return r;
@@ -322,7 +325,7 @@ glms_mat4_mulv3(mat4s m, vec3s v, float last) {
*/
CGLM_INLINE
mat4s
glms_mat4_transpose(mat4s m) {
glms_mat4_(transpose)(mat4s m) {
glm_mat4_transpose(m.raw);
return m;
}
@@ -338,7 +341,7 @@ glms_mat4_transpose(mat4s m) {
*/
CGLM_INLINE
mat4s
glms_mat4_scale_p(mat4s m, float s) {
glms_mat4_(scale_p)(mat4s m, float s) {
glm_mat4_scale_p(m.raw, s);
return m;
}
@@ -354,7 +357,7 @@ glms_mat4_scale_p(mat4s m, float s) {
*/
CGLM_INLINE
mat4s
glms_mat4_scale(mat4s m, float s) {
glms_mat4_(scale)(mat4s m, float s) {
glm_mat4_scale(m.raw, s);
return m;
}
@@ -368,7 +371,7 @@ glms_mat4_scale(mat4s m, float s) {
*/
CGLM_INLINE
float
glms_mat4_det(mat4s mat) {
glms_mat4_(det)(mat4s mat) {
return glm_mat4_det(mat.raw);
}
@@ -380,7 +383,7 @@ glms_mat4_det(mat4s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_inv(mat4s mat) {
glms_mat4_(inv)(mat4s mat) {
mat4s r;
glm_mat4_inv(mat.raw, r.raw);
return r;
@@ -400,7 +403,7 @@ glms_mat4_inv(mat4s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_inv_fast(mat4s mat) {
glms_mat4_(inv_fast)(mat4s mat) {
mat4s r;
glm_mat4_inv_fast(mat.raw, r.raw);
return r;
@@ -416,7 +419,7 @@ glms_mat4_inv_fast(mat4s mat) {
*/
CGLM_INLINE
mat4s
glms_mat4_swap_col(mat4s mat, int col1, int col2) {
glms_mat4_(swap_col)(mat4s mat, int col1, int col2) {
glm_mat4_swap_col(mat.raw, col1, col2);
return mat;
}
@@ -431,7 +434,7 @@ glms_mat4_swap_col(mat4s mat, int col1, int col2) {
*/
CGLM_INLINE
mat4s
glms_mat4_swap_row(mat4s mat, int row1, int row2) {
glms_mat4_(swap_row)(mat4s mat, int row1, int row2) {
glm_mat4_swap_row(mat.raw, row1, row2);
return mat;
}
@@ -452,7 +455,7 @@ glms_mat4_swap_row(mat4s mat, int row1, int row2) {
*/
CGLM_INLINE
float
glms_mat4_rmc(vec4s r, mat4s m, vec4s c) {
glms_mat4_(rmc)(vec4s r, mat4s m, vec4s c) {
return glm_mat4_rmc(r.raw, m.raw, c.raw);
}

View File

@@ -54,6 +54,9 @@
#include "../plane.h"
#include "../quat.h"
/* api definition */
#define glms_quat_(NAME) CGLM_STRUCTAPI(quat, NAME)
/*
* IMPORTANT:
* ----------------------------------------------------------------------------
@@ -74,7 +77,7 @@
*/
CGLM_INLINE
versors
glms_quat_identity(void) {
glms_quat_(identity)(void) {
versors dest;
glm_quat_identity(dest.raw);
return dest;
@@ -90,7 +93,7 @@ glms_quat_identity(void) {
*/
CGLM_INLINE
void
glms_quat_identity_array(versors * __restrict q, size_t count) {
glms_quat_(identity_array)(versors * __restrict q, size_t count) {
CGLM_ALIGN(16) versor v = GLM_QUAT_IDENTITY_INIT;
size_t i;
@@ -110,7 +113,7 @@ glms_quat_identity_array(versors * __restrict q, size_t count) {
*/
CGLM_INLINE
versors
glms_quat_init(float x, float y, float z, float w) {
glms_quat_(init)(float x, float y, float z, float w) {
versors dest;
glm_quat_init(dest.raw, x, y, z, w);
return dest;
@@ -157,7 +160,7 @@ glms_quat(float angle, float x, float y, float z) {
*/
CGLM_INLINE
versors
glms_quat_from_vecs(vec3s a, vec3s b) {
glms_quat_(from_vecs)(vec3s a, vec3s b) {
versors dest;
glm_quat_from_vecs(a.raw, b.raw, dest.raw);
return dest;
@@ -170,7 +173,7 @@ glms_quat_from_vecs(vec3s a, vec3s b) {
*/
CGLM_INLINE
float
glms_quat_norm(versors q) {
glms_quat_(norm)(versors q) {
return glm_quat_norm(q.raw);
}
@@ -182,7 +185,7 @@ glms_quat_norm(versors q) {
*/
CGLM_INLINE
versors
glms_quat_normalize(versors q) {
glms_quat_(normalize)(versors q) {
versors dest;
glm_quat_normalize_to(q.raw, dest.raw);
return dest;
@@ -197,7 +200,7 @@ glms_quat_normalize(versors q) {
*/
CGLM_INLINE
float
glms_quat_dot(versors p, versors q) {
glms_quat_(dot)(versors p, versors q) {
return glm_quat_dot(p.raw, q.raw);
}
@@ -209,7 +212,7 @@ glms_quat_dot(versors p, versors q) {
*/
CGLM_INLINE
versors
glms_quat_conjugate(versors q) {
glms_quat_(conjugate)(versors q) {
versors dest;
glm_quat_conjugate(q.raw, dest.raw);
return dest;
@@ -223,7 +226,7 @@ glms_quat_conjugate(versors q) {
*/
CGLM_INLINE
versors
glms_quat_inv(versors q) {
glms_quat_(inv)(versors q) {
versors dest;
glm_quat_inv(q.raw, dest.raw);
return dest;
@@ -238,7 +241,7 @@ glms_quat_inv(versors q) {
*/
CGLM_INLINE
versors
glms_quat_add(versors p, versors q) {
glms_quat_(add)(versors p, versors q) {
versors dest;
glm_quat_add(p.raw, q.raw, dest.raw);
return dest;
@@ -253,7 +256,7 @@ glms_quat_add(versors p, versors q) {
*/
CGLM_INLINE
versors
glms_quat_sub(versors p, versors q) {
glms_quat_(sub)(versors p, versors q) {
versors dest;
glm_quat_sub(p.raw, q.raw, dest.raw);
return dest;
@@ -266,7 +269,7 @@ glms_quat_sub(versors p, versors q) {
*/
CGLM_INLINE
vec3s
glms_quat_imagn(versors q) {
glms_quat_(imagn)(versors q) {
vec3s dest;
glm_normalize_to(q.raw, dest.raw);
return dest;
@@ -279,7 +282,7 @@ glms_quat_imagn(versors q) {
*/
CGLM_INLINE
float
glms_quat_imaglen(versors q) {
glms_quat_(imaglen)(versors q) {
return glm_quat_imaglen(q.raw);
}
@@ -290,7 +293,7 @@ glms_quat_imaglen(versors q) {
*/
CGLM_INLINE
float
glms_quat_angle(versors q) {
glms_quat_(angle)(versors q) {
return glm_quat_angle(q.raw);
}
@@ -302,7 +305,7 @@ glms_quat_angle(versors q) {
*/
CGLM_INLINE
vec3s
glms_quat_axis(versors q) {
glms_quat_(axis)(versors q) {
vec3s dest;
glm_quat_axis(q.raw, dest.raw);
return dest;
@@ -322,7 +325,7 @@ glms_quat_axis(versors q) {
*/
CGLM_INLINE
versors
glms_quat_mul(versors p, versors q) {
glms_quat_(mul)(versors p, versors q) {
versors dest;
glm_quat_mul(p.raw, q.raw, dest.raw);
return dest;
@@ -336,7 +339,7 @@ glms_quat_mul(versors p, versors q) {
*/
CGLM_INLINE
mat4s
glms_quat_mat4(versors q) {
glms_quat_(mat4)(versors q) {
mat4s dest;
glm_quat_mat4(q.raw, dest.raw);
return dest;
@@ -350,7 +353,7 @@ glms_quat_mat4(versors q) {
*/
CGLM_INLINE
mat4s
glms_quat_mat4t(versors q) {
glms_quat_(mat4t)(versors q) {
mat4s dest;
glm_quat_mat4t(q.raw, dest.raw);
return dest;
@@ -364,7 +367,7 @@ glms_quat_mat4t(versors q) {
*/
CGLM_INLINE
mat3s
glms_quat_mat3(versors q) {
glms_quat_(mat3)(versors q) {
mat3s dest;
glm_quat_mat3(q.raw, dest.raw);
return dest;
@@ -378,7 +381,7 @@ glms_quat_mat3(versors q) {
*/
CGLM_INLINE
mat3s
glms_quat_mat3t(versors q) {
glms_quat_(mat3t)(versors q) {
mat3s dest;
glm_quat_mat3t(q.raw, dest.raw);
return dest;
@@ -395,7 +398,7 @@ glms_quat_mat3t(versors q) {
*/
CGLM_INLINE
versors
glms_quat_lerp(versors from, versors to, float t) {
glms_quat_(lerp)(versors from, versors to, float t) {
versors dest;
glm_quat_lerp(from.raw, to.raw, t, dest.raw);
return dest;
@@ -412,7 +415,7 @@ glms_quat_lerp(versors from, versors to, float t) {
*/
CGLM_INLINE
versors
glms_quat_lerpc(versors from, versors to, float t) {
glms_quat_(lerpc)(versors from, versors to, float t) {
versors dest;
glm_quat_lerpc(from.raw, to.raw, t, dest.raw);
return dest;
@@ -430,7 +433,7 @@ glms_quat_lerpc(versors from, versors to, float t) {
*/
CGLM_INLINE
versors
glms_quat_nlerp(versors from, versors to, float t) {
glms_quat_(nlerp)(versors from, versors to, float t) {
versors dest;
glm_quat_nlerp(from.raw, to.raw, t, dest.raw);
return dest;
@@ -447,7 +450,7 @@ glms_quat_nlerp(versors from, versors to, float t) {
*/
CGLM_INLINE
versors
glms_quat_slerp(versors from, versors to, float t) {
glms_quat_(slerp)(versors from, versors to, float t) {
versors dest;
glm_quat_slerp(from.raw, to.raw, t, dest.raw);
return dest;
@@ -462,7 +465,7 @@ glms_quat_slerp(versors from, versors to, float t) {
*/
CGLM_INLINE
mat4s
glms_quat_look(vec3s eye, versors ori) {
glms_quat_(look)(vec3s eye, versors ori) {
mat4s dest;
glm_quat_look(eye.raw, ori.raw, dest.raw);
return dest;
@@ -477,7 +480,7 @@ glms_quat_look(vec3s eye, versors ori) {
*/
CGLM_INLINE
versors
glms_quat_for(vec3s dir, vec3s up) {
glms_quat_(for)(vec3s dir, vec3s up) {
versors dest;
glm_quat_for(dir.raw, up.raw, dest.raw);
return dest;
@@ -494,7 +497,7 @@ glms_quat_for(vec3s dir, vec3s up) {
*/
CGLM_INLINE
versors
glms_quat_forp(vec3s from, vec3s to, vec3s up) {
glms_quat_(forp)(vec3s from, vec3s to, vec3s up) {
versors dest;
glm_quat_forp(from.raw, to.raw, up.raw, dest.raw);
return dest;
@@ -509,7 +512,7 @@ glms_quat_forp(vec3s from, vec3s to, vec3s up) {
*/
CGLM_INLINE
vec3s
glms_quat_rotatev(versors q, vec3s v) {
glms_quat_(rotatev)(versors q, vec3s v) {
vec3s dest;
glm_quat_rotatev(q.raw, v.raw, dest.raw);
return dest;
@@ -524,7 +527,7 @@ glms_quat_rotatev(versors q, vec3s v) {
*/
CGLM_INLINE
mat4s
glms_quat_rotate(mat4s m, versors q) {
glms_quat_(rotate)(mat4s m, versors q) {
glm_quat_rotate(m.raw, q.raw, m.raw);
return m;
}
@@ -538,7 +541,7 @@ glms_quat_rotate(mat4s m, versors q) {
*/
CGLM_INLINE
mat4s
glms_quat_rotate_at(mat4s m, versors q, vec3s pivot) {
glms_quat_(rotate_at)(mat4s m, versors q, vec3s pivot) {
glm_quat_rotate_at(m.raw, q.raw, pivot.raw);
return m;
}
@@ -556,7 +559,7 @@ glms_quat_rotate_at(mat4s m, versors q, vec3s pivot) {
*/
CGLM_INLINE
mat4s
glms_quat_rotate_atm(versors q, vec3s pivot) {
glms_quat_(rotate_atm)(versors q, vec3s pivot) {
mat4s dest;
glm_quat_rotate_atm(dest.raw, q.raw, pivot.raw);
return dest;

View File

@@ -34,6 +34,9 @@
#include "../util.h"
#include "../vec2-ext.h"
/* api definition */
#define glms_vec2_(NAME) CGLM_STRUCTAPI(vec2, NAME)
/*!
* @brief fill a vector with specified value
*
@@ -42,7 +45,7 @@
*/
CGLM_INLINE
vec2s
glms_vec2_fill(float val) {
glms_vec2_(fill)(float val) {
vec2s r;
glm_vec2_fill(r.raw, val);
return r;
@@ -56,7 +59,7 @@ glms_vec2_fill(float val) {
*/
CGLM_INLINE
bool
glms_vec2_eq(vec2s v, float val) {
glms_vec2_(eq)(vec2s v, float val) {
return glm_vec2_eq(v.raw, val);
}
@@ -68,7 +71,7 @@ glms_vec2_eq(vec2s v, float val) {
*/
CGLM_INLINE
bool
glms_vec2_eq_eps(vec2s v, float val) {
glms_vec2_(eq_eps)(vec2s v, float val) {
return glm_vec2_eq_eps(v.raw, val);
}
@@ -79,7 +82,7 @@ glms_vec2_eq_eps(vec2s v, float val) {
*/
CGLM_INLINE
bool
glms_vec2_eq_all(vec2s v) {
glms_vec2_(eq_all)(vec2s v) {
return glm_vec2_eq_all(v.raw);
}
@@ -91,7 +94,7 @@ glms_vec2_eq_all(vec2s v) {
*/
CGLM_INLINE
bool
glms_vec2_eqv(vec2s a, vec2s b) {
glms_vec2_(eqv)(vec2s a, vec2s b) {
return glm_vec2_eqv(a.raw, b.raw);
}
@@ -103,7 +106,7 @@ glms_vec2_eqv(vec2s a, vec2s b) {
*/
CGLM_INLINE
bool
glms_vec2_eqv_eps(vec2s a, vec2s b) {
glms_vec2_(eqv_eps)(vec2s a, vec2s b) {
return glm_vec2_eqv_eps(a.raw, b.raw);
}
@@ -114,7 +117,7 @@ glms_vec2_eqv_eps(vec2s a, vec2s b) {
*/
CGLM_INLINE
float
glms_vec2_max(vec2s v) {
glms_vec2_(max)(vec2s v) {
return glm_vec2_max(v.raw);
}
@@ -137,7 +140,7 @@ glms_vec2_min(vec2s v) {
*/
CGLM_INLINE
bool
glms_vec2_isnan(vec2s v) {
glms_vec2_(isnan)(vec2s v) {
return glm_vec2_isnan(v.raw);
}
@@ -149,7 +152,7 @@ glms_vec2_isnan(vec2s v) {
*/
CGLM_INLINE
bool
glms_vec2_isinf(vec2s v) {
glms_vec2_(isinf)(vec2s v) {
return glm_vec2_isinf(v.raw);
}
@@ -175,7 +178,7 @@ glms_vec2_isvalid(vec2s v) {
*/
CGLM_INLINE
vec2s
glms_vec2_sign(vec2s v) {
glms_vec2_(sign)(vec2s v) {
vec2s r;
glm_vec2_sign(v.raw, r.raw);
return r;
@@ -189,7 +192,7 @@ glms_vec2_sign(vec2s v) {
*/
CGLM_INLINE
vec2s
glms_vec2_sqrt(vec2s v) {
glms_vec2_(sqrt)(vec2s v) {
vec2s r;
glm_vec2_sqrt(v.raw, r.raw);
return r;
@@ -204,7 +207,7 @@ glms_vec2_sqrt(vec2s v) {
*/
CGLM_INLINE
vec2s
glms_vec2_complex_mul(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(complex_mul)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_complex_mul(a.raw, b.raw, dest.raw);
return dest;
}
@@ -218,7 +221,7 @@ glms_vec2_complex_mul(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_complex_div(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(complex_div)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_complex_div(a.raw, b.raw, dest.raw);
return dest;
}
@@ -231,7 +234,7 @@ glms_vec2_complex_div(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_complex_conjugate(vec2s a, vec2s dest) {
glms_vec2_(complex_conjugate)(vec2s a, vec2s dest) {
glm_vec2_complex_conjugate(a.raw, dest.raw);
return dest;
}

View File

@@ -86,7 +86,7 @@ glms_vec2(vec3s v3) {
*/
CGLM_INLINE
void
glms_vec2_pack(vec2s dst[], vec2 src[], size_t len) {
glms_vec2_(pack)(vec2s dst[], vec2 src[], size_t len) {
size_t i;
for (i = 0; i < len; i++) {
@@ -103,7 +103,7 @@ glms_vec2_pack(vec2s dst[], vec2 src[], size_t len) {
*/
CGLM_INLINE
void
glms_vec2_unpack(vec2 dst[], vec2s src[], size_t len) {
glms_vec2_(unpack)(vec2 dst[], vec2s src[], size_t len) {
size_t i;
for (i = 0; i < len; i++) {
@@ -118,7 +118,7 @@ glms_vec2_unpack(vec2 dst[], vec2s src[], size_t len) {
*/
CGLM_INLINE
vec2s
glms_vec2_zero(void) {
glms_vec2_(zero)(void) {
vec2s r;
glm_vec2_zero(r.raw);
return r;
@@ -131,7 +131,7 @@ glms_vec2_zero(void) {
*/
CGLM_INLINE
vec2s
glms_vec2_one(void) {
glms_vec2_(one)(void) {
vec2s r;
glm_vec2_one(r.raw);
return r;
@@ -147,7 +147,7 @@ glms_vec2_one(void) {
*/
CGLM_INLINE
float
glms_vec2_dot(vec2s a, vec2s b) {
glms_vec2_(dot)(vec2s a, vec2s b) {
return glm_vec2_dot(a.raw, b.raw);
}
@@ -163,7 +163,7 @@ glms_vec2_dot(vec2s a, vec2s b) {
*/
CGLM_INLINE
float
glms_vec2_cross(vec2s a, vec2s b) {
glms_vec2_(cross)(vec2s a, vec2s b) {
return glm_vec2_cross(a.raw, b.raw);
}
@@ -180,7 +180,7 @@ glms_vec2_cross(vec2s a, vec2s b) {
*/
CGLM_INLINE
float
glms_vec2_norm2(vec2s v) {
glms_vec2_(norm2)(vec2s v) {
return glm_vec2_norm2(v.raw);
}
@@ -193,7 +193,7 @@ glms_vec2_norm2(vec2s v) {
*/
CGLM_INLINE
float
glms_vec2_norm(vec2s v) {
glms_vec2_(norm)(vec2s v) {
return glm_vec2_norm(v.raw);
}
@@ -206,7 +206,7 @@ glms_vec2_norm(vec2s v) {
*/
CGLM_INLINE
vec2s
glms_vec2_add(vec2s a, vec2s b) {
glms_vec2_(add)(vec2s a, vec2s b) {
vec2s r;
glm_vec2_add(a.raw, b.raw, r.raw);
return r;
@@ -221,7 +221,7 @@ glms_vec2_add(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_adds(vec2s a, float s) {
glms_vec2_(adds)(vec2s a, float s) {
vec2s r;
glm_vec2_adds(a.raw, s, r.raw);
return r;
@@ -236,7 +236,7 @@ glms_vec2_adds(vec2s a, float s) {
*/
CGLM_INLINE
vec2s
glms_vec2_sub(vec2s a, vec2s b) {
glms_vec2_(sub)(vec2s a, vec2s b) {
vec2s r;
glm_vec2_sub(a.raw, b.raw, r.raw);
return r;
@@ -251,7 +251,7 @@ glms_vec2_sub(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_subs(vec2s a, float s) {
glms_vec2_(subs)(vec2s a, float s) {
vec2s r;
glm_vec2_subs(a.raw, s, r.raw);
return r;
@@ -266,7 +266,7 @@ glms_vec2_subs(vec2s a, float s) {
*/
CGLM_INLINE
vec2s
glms_vec2_mul(vec2s a, vec2s b) {
glms_vec2_(mul)(vec2s a, vec2s b) {
vec2s r;
glm_vec2_mul(a.raw, b.raw, r.raw);
return r;
@@ -281,7 +281,7 @@ glms_vec2_mul(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_scale(vec2s v, float s) {
glms_vec2_(scale)(vec2s v, float s) {
vec2s r;
glm_vec2_scale(v.raw, s, r.raw);
return r;
@@ -296,7 +296,7 @@ glms_vec2_scale(vec2s v, float s) {
*/
CGLM_INLINE
vec2s
glms_vec2_scale_as(vec2s v, float s) {
glms_vec2_(scale_as)(vec2s v, float s) {
vec2s r;
glm_vec2_scale_as(v.raw, s, r.raw);
return r;
@@ -311,7 +311,7 @@ glms_vec2_scale_as(vec2s v, float s) {
*/
CGLM_INLINE
vec2s
glms_vec2_div(vec2s a, vec2s b) {
glms_vec2_(div)(vec2s a, vec2s b) {
vec2s r;
glm_vec2_div(a.raw, b.raw, r.raw);
return r;
@@ -326,7 +326,7 @@ glms_vec2_div(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_divs(vec2s a, float s) {
glms_vec2_(divs)(vec2s a, float s) {
vec2s r;
glm_vec2_divs(a.raw, s, r.raw);
return r;
@@ -343,7 +343,7 @@ glms_vec2_divs(vec2s a, float s) {
*/
CGLM_INLINE
vec2s
glms_vec2_addadd(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(addadd)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_addadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -359,7 +359,7 @@ glms_vec2_addadd(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_subadd(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(subadd)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_subadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -375,7 +375,7 @@ glms_vec2_subadd(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_muladd(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(muladd)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_muladd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -391,7 +391,7 @@ glms_vec2_muladd(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_muladds(vec2s a, float s, vec2s dest) {
glms_vec2_(muladds)(vec2s a, float s, vec2s dest) {
glm_vec2_muladds(a.raw, s, dest.raw);
return dest;
}
@@ -407,7 +407,7 @@ glms_vec2_muladds(vec2s a, float s, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_maxadd(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(maxadd)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_maxadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -423,7 +423,7 @@ glms_vec2_maxadd(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_minadd(vec2s a, vec2s b, vec2s dest) {
glms_vec2_(minadd)(vec2s a, vec2s b, vec2s dest) {
glm_vec2_minadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -436,7 +436,7 @@ glms_vec2_minadd(vec2s a, vec2s b, vec2s dest) {
*/
CGLM_INLINE
vec2s
glms_vec2_negate(vec2s v) {
glms_vec2_(negate)(vec2s v) {
glm_vec2_negate(v.raw);
return v;
}
@@ -449,7 +449,7 @@ glms_vec2_negate(vec2s v) {
*/
CGLM_INLINE
vec2s
glms_vec2_normalize(vec2s v) {
glms_vec2_(normalize)(vec2s v) {
glm_vec2_normalize(v.raw);
return v;
}
@@ -463,7 +463,7 @@ glms_vec2_normalize(vec2s v) {
*/
CGLM_INLINE
vec2s
glms_vec2_rotate(vec2s v, float angle) {
glms_vec2_(rotate)(vec2s v, float angle) {
vec2s r;
glm_vec2_rotate(v.raw, angle, r.raw);
return r;
@@ -478,7 +478,7 @@ glms_vec2_rotate(vec2s v, float angle) {
*/
CGLM_INLINE
float
glms_vec2_distance(vec2s a, vec2s b) {
glms_vec2_(distance)(vec2s a, vec2s b) {
return glm_vec2_distance(a.raw, b.raw);
}
@@ -491,7 +491,7 @@ glms_vec2_distance(vec2s a, vec2s b) {
*/
CGLM_INLINE
float
glms_vec2_distance2(vec2s a, vec2s b) {
glms_vec2_(distance2)(vec2s a, vec2s b) {
return glm_vec2_distance2(a.raw, b.raw);
}
@@ -504,7 +504,7 @@ glms_vec2_distance2(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_maxv(vec2s a, vec2s b) {
glms_vec2_(maxv)(vec2s a, vec2s b) {
vec2s r;
glm_vec2_maxv(a.raw, b.raw, r.raw);
return r;
@@ -519,7 +519,7 @@ glms_vec2_maxv(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_minv(vec2s a, vec2s b) {
glms_vec2_(minv)(vec2s a, vec2s b) {
vec2s r;
glm_vec2_minv(a.raw, b.raw, r.raw);
return r;
@@ -535,7 +535,7 @@ glms_vec2_minv(vec2s a, vec2s b) {
*/
CGLM_INLINE
vec2s
glms_vec2_clamp(vec2s v, float minVal, float maxVal) {
glms_vec2_(clamp)(vec2s v, float minVal, float maxVal) {
glm_vec2_clamp(v.raw, minVal, maxVal);
return v;
}
@@ -552,7 +552,7 @@ glms_vec2_clamp(vec2s v, float minVal, float maxVal) {
*/
CGLM_INLINE
vec2s
glms_vec2_lerp(vec2s from, vec2s to, float t) {
glms_vec2_(lerp)(vec2s from, vec2s to, float t) {
vec2s r;
glm_vec2_lerp(from.raw, to.raw, t, r.raw);
return r;

View File

@@ -38,6 +38,9 @@
#include "../util.h"
#include "../vec3-ext.h"
/* api definition */
#define glms_vec3_(NAME) CGLM_STRUCTAPI(vec3, NAME)
/*!
* @brief fill a vector with specified value
*
@@ -46,7 +49,7 @@
*/
CGLM_INLINE
vec3s
glms_vec3_broadcast(float val) {
glms_vec3_(broadcast)(float val) {
vec3s r;
glm_vec3_broadcast(val, r.raw);
return r;
@@ -60,7 +63,7 @@ glms_vec3_broadcast(float val) {
*/
CGLM_INLINE
vec3s
glms_vec3_fill(float val) {
glms_vec3_(fill)(float val) {
vec3s r;
glm_vec3_fill(r.raw, val);
return r;
@@ -74,7 +77,7 @@ glms_vec3_fill(float val) {
*/
CGLM_INLINE
bool
glms_vec3_eq(vec3s v, float val) {
glms_vec3_(eq)(vec3s v, float val) {
return glm_vec3_eq(v.raw, val);
}
@@ -86,7 +89,7 @@ glms_vec3_eq(vec3s v, float val) {
*/
CGLM_INLINE
bool
glms_vec3_eq_eps(vec3s v, float val) {
glms_vec3_(eq_eps)(vec3s v, float val) {
return glm_vec3_eq_eps(v.raw, val);
}
@@ -97,7 +100,7 @@ glms_vec3_eq_eps(vec3s v, float val) {
*/
CGLM_INLINE
bool
glms_vec3_eq_all(vec3s v) {
glms_vec3_(eq_all)(vec3s v) {
return glm_vec3_eq_all(v.raw);
}
@@ -109,7 +112,7 @@ glms_vec3_eq_all(vec3s v) {
*/
CGLM_INLINE
bool
glms_vec3_eqv(vec3s a, vec3s b) {
glms_vec3_(eqv)(vec3s a, vec3s b) {
return glm_vec3_eqv(a.raw, b.raw);
}
@@ -121,7 +124,7 @@ glms_vec3_eqv(vec3s a, vec3s b) {
*/
CGLM_INLINE
bool
glms_vec3_eqv_eps(vec3s a, vec3s b) {
glms_vec3_(eqv_eps)(vec3s a, vec3s b) {
return glm_vec3_eqv_eps(a.raw, b.raw);
}
@@ -132,7 +135,7 @@ glms_vec3_eqv_eps(vec3s a, vec3s b) {
*/
CGLM_INLINE
float
glms_vec3_max(vec3s v) {
glms_vec3_(max)(vec3s v) {
return glm_vec3_max(v.raw);
}
@@ -143,7 +146,7 @@ glms_vec3_max(vec3s v) {
*/
CGLM_INLINE
float
glms_vec3_min(vec3s v) {
glms_vec3_(min)(vec3s v) {
return glm_vec3_min(v.raw);
}
@@ -155,7 +158,7 @@ glms_vec3_min(vec3s v) {
*/
CGLM_INLINE
bool
glms_vec3_isnan(vec3s v) {
glms_vec3_(isnan)(vec3s v) {
return glm_vec3_isnan(v.raw);
}
@@ -167,7 +170,7 @@ glms_vec3_isnan(vec3s v) {
*/
CGLM_INLINE
bool
glms_vec3_isinf(vec3s v) {
glms_vec3_(isinf)(vec3s v) {
return glm_vec3_isinf(v.raw);
}
@@ -179,7 +182,7 @@ glms_vec3_isinf(vec3s v) {
*/
CGLM_INLINE
bool
glms_vec3_isvalid(vec3s v) {
glms_vec3_(isvalid)(vec3s v) {
return glm_vec3_isvalid(v.raw);
}
@@ -193,7 +196,7 @@ glms_vec3_isvalid(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_sign(vec3s v) {
glms_vec3_(sign)(vec3s v) {
vec3s r;
glm_vec3_sign(v.raw, r.raw);
return r;
@@ -207,7 +210,7 @@ glms_vec3_sign(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_abs(vec3s v) {
glms_vec3_(abs)(vec3s v) {
vec3s r;
glm_vec3_abs(v.raw, r.raw);
return r;
@@ -221,7 +224,7 @@ glms_vec3_abs(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_fract(vec3s v) {
glms_vec3_(fract)(vec3s v) {
vec3s r;
glm_vec3_fract(v.raw, r.raw);
return r;
@@ -236,7 +239,7 @@ glms_vec3_fract(vec3s v) {
*/
CGLM_INLINE
float
glms_vec3_hadd(vec3s v) {
glms_vec3_(hadd)(vec3s v) {
return glm_vec3_hadd(v.raw);
}
@@ -248,7 +251,7 @@ glms_vec3_hadd(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_sqrt(vec3s v) {
glms_vec3_(sqrt)(vec3s v) {
vec3s r;
glm_vec3_sqrt(v.raw, r.raw);
return r;

View File

@@ -119,7 +119,7 @@ glms_vec3(vec4s v4) {
*/
CGLM_INLINE
void
glms_vec3_pack(vec3s dst[], vec3 src[], size_t len) {
glms_vec3_(pack)(vec3s dst[], vec3 src[], size_t len) {
size_t i;
for (i = 0; i < len; i++) {
@@ -136,7 +136,7 @@ glms_vec3_pack(vec3s dst[], vec3 src[], size_t len) {
*/
CGLM_INLINE
void
glms_vec3_unpack(vec3 dst[], vec3s src[], size_t len) {
glms_vec3_(unpack)(vec3 dst[], vec3s src[], size_t len) {
size_t i;
for (i = 0; i < len; i++) {
@@ -151,7 +151,7 @@ glms_vec3_unpack(vec3 dst[], vec3s src[], size_t len) {
*/
CGLM_INLINE
vec3s
glms_vec3_zero(void) {
glms_vec3_(zero)(void) {
vec3s r;
glm_vec3_zero(r.raw);
return r;
@@ -164,7 +164,7 @@ glms_vec3_zero(void) {
*/
CGLM_INLINE
vec3s
glms_vec3_one(void) {
glms_vec3_(one)(void) {
vec3s r;
glm_vec3_one(r.raw);
return r;
@@ -180,7 +180,7 @@ glms_vec3_one(void) {
*/
CGLM_INLINE
float
glms_vec3_dot(vec3s a, vec3s b) {
glms_vec3_(dot)(vec3s a, vec3s b) {
return glm_vec3_dot(a.raw, b.raw);
}
@@ -197,7 +197,7 @@ glms_vec3_dot(vec3s a, vec3s b) {
*/
CGLM_INLINE
float
glms_vec3_norm2(vec3s v) {
glms_vec3_(norm2)(vec3s v) {
return glm_vec3_norm2(v.raw);
}
@@ -210,7 +210,7 @@ glms_vec3_norm2(vec3s v) {
*/
CGLM_INLINE
float
glms_vec3_norm(vec3s v) {
glms_vec3_(norm)(vec3s v) {
return glm_vec3_norm(v.raw);
}
@@ -230,7 +230,7 @@ glms_vec3_norm(vec3s v) {
*/
CGLM_INLINE
float
glms_vec3_norm_one(vec3s v) {
glms_vec3_(norm_one)(vec3s v) {
return glm_vec3_norm_one(v.raw);
}
@@ -249,7 +249,7 @@ glms_vec3_norm_one(vec3s v) {
*/
CGLM_INLINE
float
glms_vec3_norm_inf(vec3s v) {
glms_vec3_(norm_inf)(vec3s v) {
return glm_vec3_norm_inf(v.raw);
}
@@ -262,7 +262,7 @@ glms_vec3_norm_inf(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_add(vec3s a, vec3s b) {
glms_vec3_(add)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_add(a.raw, b.raw, r.raw);
return r;
@@ -277,7 +277,7 @@ glms_vec3_add(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_adds(vec3s a, float s) {
glms_vec3_(adds)(vec3s a, float s) {
vec3s r;
glm_vec3_adds(a.raw, s, r.raw);
return r;
@@ -292,7 +292,7 @@ glms_vec3_adds(vec3s a, float s) {
*/
CGLM_INLINE
vec3s
glms_vec3_sub(vec3s a, vec3s b) {
glms_vec3_(sub)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_sub(a.raw, b.raw, r.raw);
return r;
@@ -307,7 +307,7 @@ glms_vec3_sub(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_subs(vec3s a, float s) {
glms_vec3_(subs)(vec3s a, float s) {
vec3s r;
glm_vec3_subs(a.raw, s, r.raw);
return r;
@@ -322,7 +322,7 @@ glms_vec3_subs(vec3s a, float s) {
*/
CGLM_INLINE
vec3s
glms_vec3_mul(vec3s a, vec3s b) {
glms_vec3_(mul)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_mul(a.raw, b.raw, r.raw);
return r;
@@ -337,7 +337,7 @@ glms_vec3_mul(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_scale(vec3s v, float s) {
glms_vec3_(scale)(vec3s v, float s) {
vec3s r;
glm_vec3_scale(v.raw, s, r.raw);
return r;
@@ -352,7 +352,7 @@ glms_vec3_scale(vec3s v, float s) {
*/
CGLM_INLINE
vec3s
glms_vec3_scale_as(vec3s v, float s) {
glms_vec3_(scale_as)(vec3s v, float s) {
vec3s r;
glm_vec3_scale_as(v.raw, s, r.raw);
return r;
@@ -367,7 +367,7 @@ glms_vec3_scale_as(vec3s v, float s) {
*/
CGLM_INLINE
vec3s
glms_vec3_div(vec3s a, vec3s b) {
glms_vec3_(div)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_div(a.raw, b.raw, r.raw);
return r;
@@ -382,7 +382,7 @@ glms_vec3_div(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_divs(vec3s a, float s) {
glms_vec3_(divs)(vec3s a, float s) {
vec3s r;
glm_vec3_divs(a.raw, s, r.raw);
return r;
@@ -399,7 +399,7 @@ glms_vec3_divs(vec3s a, float s) {
*/
CGLM_INLINE
vec3s
glms_vec3_addadd(vec3s a, vec3s b, vec3s dest) {
glms_vec3_(addadd)(vec3s a, vec3s b, vec3s dest) {
glm_vec3_addadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -415,7 +415,7 @@ glms_vec3_addadd(vec3s a, vec3s b, vec3s dest) {
*/
CGLM_INLINE
vec3s
glms_vec3_subadd(vec3s a, vec3s b, vec3s dest) {
glms_vec3_(subadd)(vec3s a, vec3s b, vec3s dest) {
glm_vec3_subadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -431,7 +431,7 @@ glms_vec3_subadd(vec3s a, vec3s b, vec3s dest) {
*/
CGLM_INLINE
vec3s
glms_vec3_muladd(vec3s a, vec3s b, vec3s dest) {
glms_vec3_(muladd)(vec3s a, vec3s b, vec3s dest) {
glm_vec3_muladd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -447,7 +447,7 @@ glms_vec3_muladd(vec3s a, vec3s b, vec3s dest) {
*/
CGLM_INLINE
vec3s
glms_vec3_muladds(vec3s a, float s, vec3s dest) {
glms_vec3_(muladds)(vec3s a, float s, vec3s dest) {
glm_vec3_muladds(a.raw, s, dest.raw);
return dest;
}
@@ -463,7 +463,7 @@ glms_vec3_muladds(vec3s a, float s, vec3s dest) {
*/
CGLM_INLINE
vec3s
glms_vec3_maxadd(vec3s a, vec3s b, vec3s dest) {
glms_vec3_(maxadd)(vec3s a, vec3s b, vec3s dest) {
glm_vec3_maxadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -479,7 +479,7 @@ glms_vec3_maxadd(vec3s a, vec3s b, vec3s dest) {
*/
CGLM_INLINE
vec3s
glms_vec3_minadd(vec3s a, vec3s b, vec3s dest) {
glms_vec3_(minadd)(vec3s a, vec3s b, vec3s dest) {
glm_vec3_minadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -492,7 +492,7 @@ glms_vec3_minadd(vec3s a, vec3s b, vec3s dest) {
*/
CGLM_INLINE
vec3s
glms_vec3_flipsign(vec3s v) {
glms_vec3_(flipsign)(vec3s v) {
glm_vec3_flipsign(v.raw);
return v;
}
@@ -505,7 +505,7 @@ glms_vec3_flipsign(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_negate(vec3s v) {
glms_vec3_(negate)(vec3s v) {
glm_vec3_negate(v.raw);
return v;
}
@@ -518,7 +518,7 @@ glms_vec3_negate(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_normalize(vec3s v) {
glms_vec3_(normalize)(vec3s v) {
glm_vec3_normalize(v.raw);
return v;
}
@@ -532,7 +532,7 @@ glms_vec3_normalize(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_cross(vec3s a, vec3s b) {
glms_vec3_(cross)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_cross(a.raw, b.raw, r.raw);
return r;
@@ -547,7 +547,7 @@ glms_vec3_cross(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_crossn(vec3s a, vec3s b) {
glms_vec3_(crossn)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_crossn(a.raw, b.raw, r.raw);
return r;
@@ -563,7 +563,7 @@ glms_vec3_crossn(vec3s a, vec3s b) {
*/
CGLM_INLINE
float
glms_vec3_angle(vec3s a, vec3s b) {
glms_vec3_(angle)(vec3s a, vec3s b) {
return glm_vec3_angle(a.raw, b.raw);
}
@@ -577,7 +577,7 @@ glms_vec3_angle(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_rotate(vec3s v, float angle, vec3s axis) {
glms_vec3_(rotate)(vec3s v, float angle, vec3s axis) {
glm_vec3_rotate(v.raw, angle, axis.raw);
return v;
}
@@ -597,7 +597,7 @@ glms_vec3_rotate(vec3s v, float angle, vec3s axis) {
*/
CGLM_INLINE
vec3s
glms_vec3_rotate_m4(mat4s m, vec3s v) {
glms_vec3_(rotate_m4)(mat4s m, vec3s v) {
vec3s r;
glm_vec3_rotate_m4(m.raw, v.raw, r.raw);
return r;
@@ -612,7 +612,7 @@ glms_vec3_rotate_m4(mat4s m, vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_rotate_m3(mat3s m, vec3s v) {
glms_vec3_(rotate_m3)(mat3s m, vec3s v) {
vec3s r;
glm_vec3_rotate_m3(m.raw, v.raw, r.raw);
return r;
@@ -627,7 +627,7 @@ glms_vec3_rotate_m3(mat3s m, vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_proj(vec3s a, vec3s b) {
glms_vec3_(proj)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_proj(a.raw, b.raw, r.raw);
return r;
@@ -642,7 +642,7 @@ glms_vec3_proj(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_center(vec3s a, vec3s b) {
glms_vec3_(center)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_center(a.raw, b.raw, r.raw);
return r;
@@ -657,7 +657,7 @@ glms_vec3_center(vec3s a, vec3s b) {
*/
CGLM_INLINE
float
glms_vec3_distance(vec3s a, vec3s b) {
glms_vec3_(distance)(vec3s a, vec3s b) {
return glm_vec3_distance(a.raw, b.raw);
}
@@ -670,7 +670,7 @@ glms_vec3_distance(vec3s a, vec3s b) {
*/
CGLM_INLINE
float
glms_vec3_distance2(vec3s a, vec3s b) {
glms_vec3_(distance2)(vec3s a, vec3s b) {
return glm_vec3_distance2(a.raw, b.raw);
}
@@ -683,7 +683,7 @@ glms_vec3_distance2(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_maxv(vec3s a, vec3s b) {
glms_vec3_(maxv)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_maxv(a.raw, b.raw, r.raw);
return r;
@@ -698,7 +698,7 @@ glms_vec3_maxv(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_minv(vec3s a, vec3s b) {
glms_vec3_(minv)(vec3s a, vec3s b) {
vec3s r;
glm_vec3_minv(a.raw, b.raw, r.raw);
return r;
@@ -712,7 +712,7 @@ glms_vec3_minv(vec3s a, vec3s b) {
*/
CGLM_INLINE
vec3s
glms_vec3_ortho(vec3s v) {
glms_vec3_(ortho)(vec3s v) {
vec3s r;
glm_vec3_ortho(v.raw, r.raw);
return r;
@@ -728,7 +728,7 @@ glms_vec3_ortho(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_clamp(vec3s v, float minVal, float maxVal) {
glms_vec3_(clamp)(vec3s v, float minVal, float maxVal) {
glm_vec3_clamp(v.raw, minVal, maxVal);
return v;
}
@@ -745,7 +745,7 @@ glms_vec3_clamp(vec3s v, float minVal, float maxVal) {
*/
CGLM_INLINE
vec3s
glms_vec3_lerp(vec3s from, vec3s to, float t) {
glms_vec3_(lerp)(vec3s from, vec3s to, float t) {
vec3s r;
glm_vec3_lerp(from.raw, to.raw, t, r.raw);
return r;
@@ -763,7 +763,7 @@ glms_vec3_lerp(vec3s from, vec3s to, float t) {
*/
CGLM_INLINE
vec3s
glms_vec3_lerpc(vec3s from, vec3s to, float t) {
glms_vec3_(lerpc)(vec3s from, vec3s to, float t) {
vec3s r;
glm_vec3_lerpc(from.raw, to.raw, t, r.raw);
return r;
@@ -781,7 +781,7 @@ glms_vec3_lerpc(vec3s from, vec3s to, float t) {
*/
CGLM_INLINE
vec3s
glms_vec3_mix(vec3s from, vec3s to, float t) {
glms_vec3_(mix)(vec3s from, vec3s to, float t) {
vec3s r;
glm_vec3_mix(from.raw, to.raw, t, r.raw);
return r;
@@ -799,7 +799,7 @@ glms_vec3_mix(vec3s from, vec3s to, float t) {
*/
CGLM_INLINE
vec3s
glms_vec3_mixc(vec3s from, vec3s to, float t) {
glms_vec3_(mixc)(vec3s from, vec3s to, float t) {
vec3s r;
glm_vec3_mixc(from.raw, to.raw, t, r.raw);
return r;
@@ -814,7 +814,7 @@ glms_vec3_mixc(vec3s from, vec3s to, float t) {
*/
CGLM_INLINE
vec3s
glms_vec3_step_uni(float edge, vec3s x) {
glms_vec3_(step_uni)(float edge, vec3s x) {
vec3s r;
glm_vec3_step_uni(edge, x.raw, r.raw);
return r;
@@ -829,7 +829,7 @@ glms_vec3_step_uni(float edge, vec3s x) {
*/
CGLM_INLINE
vec3s
glms_vec3_step(vec3s edge, vec3s x) {
glms_vec3_(step)(vec3s edge, vec3s x) {
vec3s r;
glm_vec3_step(edge.raw, x.raw, r.raw);
return r;
@@ -845,7 +845,7 @@ glms_vec3_step(vec3s edge, vec3s x) {
*/
CGLM_INLINE
vec3s
glms_vec3_smoothstep_uni(float edge0, float edge1, vec3s x) {
glms_vec3_(smoothstep_uni)(float edge0, float edge1, vec3s x) {
vec3s r;
glm_vec3_smoothstep_uni(edge0, edge1, x.raw, r.raw);
return r;
@@ -861,7 +861,7 @@ glms_vec3_smoothstep_uni(float edge0, float edge1, vec3s x) {
*/
CGLM_INLINE
vec3s
glms_vec3_smoothstep(vec3s edge0, vec3s edge1, vec3s x) {
glms_vec3_(smoothstep)(vec3s edge0, vec3s edge1, vec3s x) {
vec3s r;
glm_vec3_smoothstep(edge0.raw, edge1.raw, x.raw, r.raw);
return r;
@@ -879,7 +879,7 @@ glms_vec3_smoothstep(vec3s edge0, vec3s edge1, vec3s x) {
*/
CGLM_INLINE
vec3s
glms_vec3_smoothinterp(vec3s from, vec3s to, float t) {
glms_vec3_(smoothinterp)(vec3s from, vec3s to, float t) {
vec3s r;
glm_vec3_smoothinterp(from.raw, to.raw, t, r.raw);
return r;
@@ -897,7 +897,7 @@ glms_vec3_smoothinterp(vec3s from, vec3s to, float t) {
*/
CGLM_INLINE
vec3s
glms_vec3_smoothinterpc(vec3s from, vec3s to, float t) {
glms_vec3_(smoothinterpc)(vec3s from, vec3s to, float t) {
vec3s r;
glm_vec3_smoothinterpc(from.raw, to.raw, t, r.raw);
return r;
@@ -961,7 +961,7 @@ glms_normalize(vec3s v) {
*/
CGLM_INLINE
vec3s
glms_vec3_swizzle(vec3s v, int mask) {
glms_vec3_(swizzle)(vec3s v, int mask) {
vec3s dest;
glm_vec3_swizzle(v.raw, mask, dest.raw);
return dest;

View File

@@ -38,6 +38,9 @@
#include "../util.h"
#include "../vec4-ext.h"
/* api definition */
#define glms_vec4_(NAME) CGLM_STRUCTAPI(vec4, NAME)
/*!
* @brief fill a vector with specified value
*
@@ -46,7 +49,7 @@
*/
CGLM_INLINE
vec4s
glms_vec4_broadcast(float val) {
glms_vec4_(broadcast)(float val) {
vec4s r;
glm_vec4_broadcast(val, r.raw);
return r;
@@ -60,7 +63,7 @@ glms_vec4_broadcast(float val) {
*/
CGLM_INLINE
vec4s
glms_vec4_fill(float val) {
glms_vec4_(fill)(float val) {
vec4s r;
glm_vec4_fill(r.raw, val);
return r;
@@ -74,7 +77,7 @@ glms_vec4_fill(float val) {
*/
CGLM_INLINE
bool
glms_vec4_eq(vec4s v, float val) {
glms_vec4_(eq)(vec4s v, float val) {
return glm_vec4_eq(v.raw, val);
}
@@ -86,7 +89,7 @@ glms_vec4_eq(vec4s v, float val) {
*/
CGLM_INLINE
bool
glms_vec4_eq_eps(vec4s v, float val) {
glms_vec4_(eq_eps)(vec4s v, float val) {
return glm_vec4_eq_eps(v.raw, val);
}
@@ -97,7 +100,7 @@ glms_vec4_eq_eps(vec4s v, float val) {
*/
CGLM_INLINE
bool
glms_vec4_eq_all(vec4s v) {
glms_vec4_(eq_all)(vec4s v) {
return glm_vec4_eq_all(v.raw);
}
@@ -109,7 +112,7 @@ glms_vec4_eq_all(vec4s v) {
*/
CGLM_INLINE
bool
glms_vec4_eqv(vec4s a, vec4s b) {
glms_vec4_(eqv)(vec4s a, vec4s b) {
return glm_vec4_eqv(a.raw, b.raw);
}
@@ -121,7 +124,7 @@ glms_vec4_eqv(vec4s a, vec4s b) {
*/
CGLM_INLINE
bool
glms_vec4_eqv_eps(vec4s a, vec4s b) {
glms_vec4_(eqv_eps)(vec4s a, vec4s b) {
return glm_vec4_eqv_eps(a.raw, b.raw);
}
@@ -132,7 +135,7 @@ glms_vec4_eqv_eps(vec4s a, vec4s b) {
*/
CGLM_INLINE
float
glms_vec4_max(vec4s v) {
glms_vec4_(max)(vec4s v) {
return glm_vec4_max(v.raw);
}
@@ -143,7 +146,7 @@ glms_vec4_max(vec4s v) {
*/
CGLM_INLINE
float
glms_vec4_min(vec4s v) {
glms_vec4_(min)(vec4s v) {
return glm_vec4_min(v.raw);
}
@@ -155,7 +158,7 @@ glms_vec4_min(vec4s v) {
*/
CGLM_INLINE
bool
glms_vec4_isnan(vec4s v) {
glms_vec4_(isnan)(vec4s v) {
return glm_vec4_isnan(v.raw);
}
@@ -167,7 +170,7 @@ glms_vec4_isnan(vec4s v) {
*/
CGLM_INLINE
bool
glms_vec4_isinf(vec4s v) {
glms_vec4_(isinf)(vec4s v) {
return glm_vec4_isinf(v.raw);
}
@@ -179,7 +182,7 @@ glms_vec4_isinf(vec4s v) {
*/
CGLM_INLINE
bool
glms_vec4_isvalid(vec4s v) {
glms_vec4_(isvalid)(vec4s v) {
return glm_vec4_isvalid(v.raw);
}
@@ -193,7 +196,7 @@ glms_vec4_isvalid(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_sign(vec4s v) {
glms_vec4_(sign)(vec4s v) {
vec4s r;
glm_vec4_sign(v.raw, r.raw);
return r;
@@ -207,7 +210,7 @@ glms_vec4_sign(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_abs(vec4s v) {
glms_vec4_(abs)(vec4s v) {
vec4s r;
glm_vec4_abs(v.raw, r.raw);
return r;
@@ -221,7 +224,7 @@ glms_vec4_abs(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_fract(vec4s v) {
glms_vec4_(fract)(vec4s v) {
vec4s r;
glm_vec4_fract(v.raw, r.raw);
return r;
@@ -236,7 +239,7 @@ glms_vec4_fract(vec4s v) {
*/
CGLM_INLINE
float
glms_vec4_hadd(vec4s v) {
glms_vec4_(hadd)(vec4s v) {
return glm_vec4_hadd(v.raw);
}
@@ -248,7 +251,7 @@ glms_vec4_hadd(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_sqrt(vec4s v) {
glms_vec4_(sqrt)(vec4s v) {
vec4s r;
glm_vec4_sqrt(v.raw, r.raw);
return r;

View File

@@ -103,7 +103,7 @@ glms_vec4(vec3s v3, float last) {
*/
CGLM_INLINE
vec3s
glms_vec4_copy3(vec4s v) {
glms_vec4_(copy3)(vec4s v) {
vec3s r;
glm_vec4_copy3(v.raw, r.raw);
return r;
@@ -117,7 +117,7 @@ glms_vec4_copy3(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_copy(vec4s v) {
glms_vec4_(copy)(vec4s v) {
vec4s r;
glm_vec4_copy(v.raw, r.raw);
return r;
@@ -133,7 +133,7 @@ glms_vec4_copy(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_ucopy(vec4s v) {
glms_vec4_(ucopy)(vec4s v) {
vec4s r;
glm_vec4_ucopy(v.raw, r.raw);
return r;
@@ -148,7 +148,7 @@ glms_vec4_ucopy(vec4s v) {
*/
CGLM_INLINE
void
glms_vec4_pack(vec4s dst[], vec4 src[], size_t len) {
glms_vec4_(pack)(vec4s dst[], vec4 src[], size_t len) {
size_t i;
for (i = 0; i < len; i++) {
@@ -165,7 +165,7 @@ glms_vec4_pack(vec4s dst[], vec4 src[], size_t len) {
*/
CGLM_INLINE
void
glms_vec4_unpack(vec4 dst[], vec4s src[], size_t len) {
glms_vec4_(unpack)(vec4 dst[], vec4s src[], size_t len) {
size_t i;
for (i = 0; i < len; i++) {
@@ -180,7 +180,7 @@ glms_vec4_unpack(vec4 dst[], vec4s src[], size_t len) {
*/
CGLM_INLINE
vec4s
glms_vec4_zero(void) {
glms_vec4_(zero)(void) {
vec4s r;
glm_vec4_zero(r.raw);
return r;
@@ -193,7 +193,7 @@ glms_vec4_zero(void) {
*/
CGLM_INLINE
vec4s
glms_vec4_one(void) {
glms_vec4_(one)(void) {
vec4s r;
glm_vec4_one(r.raw);
return r;
@@ -209,7 +209,7 @@ glms_vec4_one(void) {
*/
CGLM_INLINE
float
glms_vec4_dot(vec4s a, vec4s b) {
glms_vec4_(dot)(vec4s a, vec4s b) {
return glm_vec4_dot(a.raw, b.raw);
}
@@ -226,7 +226,7 @@ glms_vec4_dot(vec4s a, vec4s b) {
*/
CGLM_INLINE
float
glms_vec4_norm2(vec4s v) {
glms_vec4_(norm2)(vec4s v) {
return glm_vec4_norm2(v.raw);
}
@@ -239,7 +239,7 @@ glms_vec4_norm2(vec4s v) {
*/
CGLM_INLINE
float
glms_vec4_norm(vec4s v) {
glms_vec4_(norm)(vec4s v) {
return glm_vec4_norm(v.raw);
}
@@ -259,7 +259,7 @@ glms_vec4_norm(vec4s v) {
*/
CGLM_INLINE
float
glms_vec4_norm_one(vec4s v) {
glms_vec4_(norm_one)(vec4s v) {
return glm_vec4_norm_one(v.raw);
}
@@ -278,7 +278,7 @@ glms_vec4_norm_one(vec4s v) {
*/
CGLM_INLINE
float
glms_vec4_norm_inf(vec4s v) {
glms_vec4_(norm_inf)(vec4s v) {
return glm_vec4_norm_inf(v.raw);
}
@@ -291,7 +291,7 @@ glms_vec4_norm_inf(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_add(vec4s a, vec4s b) {
glms_vec4_(add)(vec4s a, vec4s b) {
vec4s r;
glm_vec4_add(a.raw, b.raw, r.raw);
return r;
@@ -306,7 +306,7 @@ glms_vec4_add(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_adds(vec4s v, float s) {
glms_vec4_(adds)(vec4s v, float s) {
vec4s r;
glm_vec4_adds(v.raw, s, r.raw);
return r;
@@ -321,7 +321,7 @@ glms_vec4_adds(vec4s v, float s) {
*/
CGLM_INLINE
vec4s
glms_vec4_sub(vec4s a, vec4s b) {
glms_vec4_(sub)(vec4s a, vec4s b) {
vec4s r;
glm_vec4_sub(a.raw, b.raw, r.raw);
return r;
@@ -336,7 +336,7 @@ glms_vec4_sub(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_subs(vec4s v, float s) {
glms_vec4_(subs)(vec4s v, float s) {
vec4s r;
glm_vec4_subs(v.raw, s, r.raw);
return r;
@@ -351,7 +351,7 @@ glms_vec4_subs(vec4s v, float s) {
*/
CGLM_INLINE
vec4s
glms_vec4_mul(vec4s a, vec4s b) {
glms_vec4_(mul)(vec4s a, vec4s b) {
vec4s r;
glm_vec4_mul(a.raw, b.raw, r.raw);
return r;
@@ -366,7 +366,7 @@ glms_vec4_mul(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_scale(vec4s v, float s) {
glms_vec4_(scale)(vec4s v, float s) {
vec4s r;
glm_vec4_scale(v.raw, s, r.raw);
return r;
@@ -381,7 +381,7 @@ glms_vec4_scale(vec4s v, float s) {
*/
CGLM_INLINE
vec4s
glms_vec4_scale_as(vec4s v, float s) {
glms_vec4_(scale_as)(vec4s v, float s) {
vec4s r;
glm_vec4_scale_as(v.raw, s, r.raw);
return r;
@@ -396,7 +396,7 @@ glms_vec4_scale_as(vec4s v, float s) {
*/
CGLM_INLINE
vec4s
glms_vec4_div(vec4s a, vec4s b) {
glms_vec4_(div)(vec4s a, vec4s b) {
vec4s r;
glm_vec4_div(a.raw, b.raw, r.raw);
return r;
@@ -411,7 +411,7 @@ glms_vec4_div(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_divs(vec4s v, float s) {
glms_vec4_(divs)(vec4s v, float s) {
vec4s r;
glm_vec4_divs(v.raw, s, r.raw);
return r;
@@ -428,7 +428,7 @@ glms_vec4_divs(vec4s v, float s) {
*/
CGLM_INLINE
vec4s
glms_vec4_addadd(vec4s a, vec4s b, vec4s dest) {
glms_vec4_(addadd)(vec4s a, vec4s b, vec4s dest) {
glm_vec4_addadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -444,7 +444,7 @@ glms_vec4_addadd(vec4s a, vec4s b, vec4s dest) {
*/
CGLM_INLINE
vec4s
glms_vec4_subadd(vec4s a, vec4s b, vec4s dest) {
glms_vec4_(subadd)(vec4s a, vec4s b, vec4s dest) {
glm_vec4_subadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -460,7 +460,7 @@ glms_vec4_subadd(vec4s a, vec4s b, vec4s dest) {
*/
CGLM_INLINE
vec4s
glms_vec4_muladd(vec4s a, vec4s b, vec4s dest) {
glms_vec4_(muladd)(vec4s a, vec4s b, vec4s dest) {
glm_vec4_muladd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -476,7 +476,7 @@ glms_vec4_muladd(vec4s a, vec4s b, vec4s dest) {
*/
CGLM_INLINE
vec4s
glms_vec4_muladds(vec4s a, float s, vec4s dest) {
glms_vec4_(muladds)(vec4s a, float s, vec4s dest) {
glm_vec4_muladds(a.raw, s, dest.raw);
return dest;
}
@@ -492,7 +492,7 @@ glms_vec4_muladds(vec4s a, float s, vec4s dest) {
*/
CGLM_INLINE
vec4s
glms_vec4_maxadd(vec4s a, vec4s b, vec4s dest) {
glms_vec4_(maxadd)(vec4s a, vec4s b, vec4s dest) {
glm_vec4_maxadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -508,7 +508,7 @@ glms_vec4_maxadd(vec4s a, vec4s b, vec4s dest) {
*/
CGLM_INLINE
vec4s
glms_vec4_minadd(vec4s a, vec4s b, vec4s dest) {
glms_vec4_(minadd)(vec4s a, vec4s b, vec4s dest) {
glm_vec4_minadd(a.raw, b.raw, dest.raw);
return dest;
}
@@ -521,7 +521,7 @@ glms_vec4_minadd(vec4s a, vec4s b, vec4s dest) {
*/
CGLM_INLINE
vec4s
glms_vec4_negate(vec4s v) {
glms_vec4_(negate)(vec4s v) {
glm_vec4_negate(v.raw);
return v;
}
@@ -534,7 +534,7 @@ glms_vec4_negate(vec4s v) {
*/
CGLM_INLINE
vec4s
glms_vec4_normalize(vec4s v) {
glms_vec4_(normalize)(vec4s v) {
glm_vec4_normalize(v.raw);
return v;
}
@@ -548,7 +548,7 @@ glms_vec4_normalize(vec4s v) {
*/
CGLM_INLINE
float
glms_vec4_distance(vec4s a, vec4s b) {
glms_vec4_(distance)(vec4s a, vec4s b) {
return glm_vec4_distance(a.raw, b.raw);
}
@@ -561,7 +561,7 @@ glms_vec4_distance(vec4s a, vec4s b) {
*/
CGLM_INLINE
float
glms_vec4_distance2(vec4s a, vec4s b) {
glms_vec4_(distance2)(vec4s a, vec4s b) {
return glm_vec4_distance2(a.raw, b.raw);
}
@@ -574,7 +574,7 @@ glms_vec4_distance2(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_maxv(vec4s a, vec4s b) {
glms_vec4_(maxv)(vec4s a, vec4s b) {
vec4s r;
glm_vec4_maxv(a.raw, b.raw, r.raw);
return r;
@@ -589,7 +589,7 @@ glms_vec4_maxv(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_minv(vec4s a, vec4s b) {
glms_vec4_(minv)(vec4s a, vec4s b) {
vec4s r;
glm_vec4_minv(a.raw, b.raw, r.raw);
return r;
@@ -605,7 +605,7 @@ glms_vec4_minv(vec4s a, vec4s b) {
*/
CGLM_INLINE
vec4s
glms_vec4_clamp(vec4s v, float minVal, float maxVal) {
glms_vec4_(clamp)(vec4s v, float minVal, float maxVal) {
glm_vec4_clamp(v.raw, minVal, maxVal);
return v;
}
@@ -622,7 +622,7 @@ glms_vec4_clamp(vec4s v, float minVal, float maxVal) {
*/
CGLM_INLINE
vec4s
glms_vec4_lerp(vec4s from, vec4s to, float t) {
glms_vec4_(lerp)(vec4s from, vec4s to, float t) {
vec4s r;
glm_vec4_lerp(from.raw, to.raw, t, r.raw);
return r;
@@ -640,7 +640,7 @@ glms_vec4_lerp(vec4s from, vec4s to, float t) {
*/
CGLM_INLINE
vec4s
glms_vec4_lerpc(vec4s from, vec4s to, float t) {
glms_vec4_(lerpc)(vec4s from, vec4s to, float t) {
vec4s r;
glm_vec4_lerpc(from.raw, to.raw, t, r.raw);
return r;
@@ -658,7 +658,7 @@ glms_vec4_lerpc(vec4s from, vec4s to, float t) {
*/
CGLM_INLINE
vec4s
glms_vec4_mix(vec4s from, vec4s to, float t) {
glms_vec4_(mix)(vec4s from, vec4s to, float t) {
vec4s r;
glm_vec4_mix(from.raw, to.raw, t, r.raw);
return r;
@@ -676,7 +676,7 @@ glms_vec4_mix(vec4s from, vec4s to, float t) {
*/
CGLM_INLINE
vec4s
glms_vec4_mixc(vec4s from, vec4s to, float t) {
glms_vec4_(mixc)(vec4s from, vec4s to, float t) {
vec4s r;
glm_vec4_mixc(from.raw, to.raw, t, r.raw);
return r;
@@ -691,7 +691,7 @@ glms_vec4_mixc(vec4s from, vec4s to, float t) {
*/
CGLM_INLINE
vec4s
glms_vec4_step_uni(float edge, vec4s x) {
glms_vec4_(step_uni)(float edge, vec4s x) {
vec4s r;
glm_vec4_step_uni(edge, x.raw, r.raw);
return r;
@@ -706,7 +706,7 @@ glms_vec4_step_uni(float edge, vec4s x) {
*/
CGLM_INLINE
vec4s
glms_vec4_step(vec4s edge, vec4s x) {
glms_vec4_(step)(vec4s edge, vec4s x) {
vec4s r;
glm_vec4_step(edge.raw, x.raw, r.raw);
return r;
@@ -722,7 +722,7 @@ glms_vec4_step(vec4s edge, vec4s x) {
*/
CGLM_INLINE
vec4s
glms_vec4_smoothstep_uni(float edge0, float edge1, vec4s x) {
glms_vec4_(smoothstep_uni)(float edge0, float edge1, vec4s x) {
vec4s r;
glm_vec4_smoothstep_uni(edge0, edge1, x.raw, r.raw);
return r;
@@ -738,7 +738,7 @@ glms_vec4_smoothstep_uni(float edge0, float edge1, vec4s x) {
*/
CGLM_INLINE
vec4s
glms_vec4_smoothstep(vec4s edge0, vec4s edge1, vec4s x) {
glms_vec4_(smoothstep)(vec4s edge0, vec4s edge1, vec4s x) {
vec4s r;
glm_vec4_smoothstep(edge0.raw, edge1.raw, x.raw, r.raw);
return r;
@@ -756,7 +756,7 @@ glms_vec4_smoothstep(vec4s edge0, vec4s edge1, vec4s x) {
*/
CGLM_INLINE
vec4s
glms_vec4_smoothinterp(vec4s from, vec4s to, float t) {
glms_vec4_(smoothinterp)(vec4s from, vec4s to, float t) {
vec4s r;
glm_vec4_smoothinterp(from.raw, to.raw, t, r.raw);
return r;
@@ -774,7 +774,7 @@ glms_vec4_smoothinterp(vec4s from, vec4s to, float t) {
*/
CGLM_INLINE
vec4s
glms_vec4_smoothinterpc(vec4s from, vec4s to, float t) {
glms_vec4_(smoothinterpc)(vec4s from, vec4s to, float t) {
vec4s r;
glm_vec4_smoothinterpc(from.raw, to.raw, t, r.raw);
return r;
@@ -788,7 +788,7 @@ glms_vec4_smoothinterpc(vec4s from, vec4s to, float t) {
*/
CGLM_INLINE
vec4s
glms_vec4_cubic(float s) {
glms_vec4_(cubic)(float s) {
vec4s r;
glm_vec4_cubic(s, r.raw);
return r;
@@ -805,7 +805,7 @@ glms_vec4_cubic(float s) {
*/
CGLM_INLINE
vec4s
glms_vec4_swizzle(vec4s v, int mask) {
glms_vec4_(swizzle)(vec4s v, int mask) {
vec4s dest;
glm_vec4_swizzle(v.raw, mask, dest.raw);
return dest;

View File

@@ -32,12 +32,16 @@
# define CGLM_ALIGN_MAT CGLM_ALIGN(16)
#endif
#ifdef __GNUC__
#if defined(__has_builtin)
# if __has_builtin(__builtin_assume_aligned)
# define CGLM_ASSUME_ALIGNED(expr, alignment) \
__builtin_assume_aligned((expr), (alignment))
# else
# define CGLM_ASSUME_ALIGNED(expr, alignment) (expr)
# endif
#else
# define CGLM_ASSUME_ALIGNED(expr, alignment) (expr)
#endif
#define CGLM_CASTPTR_ASSUME_ALIGNED(expr, type) \
((type*)CGLM_ASSUME_ALIGNED((expr), __alignof__(type)))

View File

@@ -19,6 +19,7 @@
CGLM_INLINE bool glm_vec2_isinf(vec2 v);
CGLM_INLINE bool glm_vec2_isvalid(vec2 v);
CGLM_INLINE void glm_vec2_sign(vec2 v, vec2 dest);
CGLM_INLINE void glm_vec2_abs(vec2 v, vec2 dest);
CGLM_INLINE void glm_vec2_sqrt(vec2 v, vec2 dest);
CGLM_INLINE void glm_vec2_complex_mul(vec2 a, vec2 b, vec2 dest)
CGLM_INLINE void glm_vec2_complex_div(vec2 a, vec2 b, vec2 dest)
@@ -176,6 +177,19 @@ glm_vec2_sign(vec2 v, vec2 dest) {
dest[1] = glm_signf(v[1]);
}
/*!
* @brief absolute value of v
*
* @param[in] v vector
* @param[out] dest destination
*/
CGLM_INLINE
void
glm_vec2_abs(vec2 v, vec2 dest) {
dest[0] = fabsf(v[0]);
dest[1] = fabsf(v[1]);
}
/*!
* @brief square root of each vector item
*
@@ -237,5 +251,4 @@ glm_vec2_complex_conjugate(vec2 a, vec2 dest) {
dest[1] = -a[1];
}
#endif /* cglm_vec2_ext_h */

View File

@@ -9,7 +9,7 @@
#define cglm_version_h
#define CGLM_VERSION_MAJOR 0
#define CGLM_VERSION_MINOR 8
#define CGLM_VERSION_PATCH 6
#define CGLM_VERSION_MINOR 9
#define CGLM_VERSION_PATCH 0
#endif /* cglm_version_h */

View File

@@ -1,5 +1,5 @@
project('cglm', 'c',
version : '0.8.6',
version : '0.9.0',
license : 'mit',
default_options : [
'c_std=c11',

View File

@@ -97,3 +97,10 @@ void
glmc_ivec2_clamp(ivec2 v, int minVal, int maxVal) {
glm_ivec2_clamp(v, minVal, maxVal);
}
CGLM_EXPORT
void
glmc_ivec2_abs(ivec2 v, ivec2 dest) {
glm_ivec2_abs(v, dest);
}

View File

@@ -97,3 +97,10 @@ void
glmc_ivec3_clamp(ivec3 v, int minVal, int maxVal) {
glm_ivec3_clamp(v, minVal, maxVal);
}
CGLM_EXPORT
void
glmc_ivec3_abs(ivec3 v, ivec3 dest) {
glm_ivec3_abs(v, dest);
}

View File

@@ -97,3 +97,10 @@ void
glmc_ivec4_clamp(ivec4 v, int minVal, int maxVal) {
glm_ivec4_clamp(v, minVal, maxVal);
}
CGLM_EXPORT
void
glmc_ivec4_abs(ivec4 v, ivec4 dest) {
glm_ivec4_abs(v, dest);
}

View File

@@ -206,6 +206,12 @@ glmc_vec2_clamp(vec2 v, float minval, float maxval) {
glm_vec2_clamp(v, minval, maxval);
}
CGLM_EXPORT
void
glmc_vec2_abs(vec2 v, vec2 dest) {
glm_vec2_abs(v, dest);
}
CGLM_EXPORT
void
glmc_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest) {

View File

@@ -11,21 +11,21 @@ TEST_IMPL(clamp) {
vec3 v3 = {15.07f, 0.4f, 17.3f};
vec4 v4 = {5.07f, 2.3f, 1.3f, 1.4f};
ASSERT(glm_clamp(1.6f, 0.0f, 1.0f) == 1.0f)
ASSERT(glm_clamp(-1.6f, 0.0f, 1.0f) == 0.0f)
ASSERT(glm_clamp(0.6f, 0.0f, 1.0f) == 0.6f)
ASSERT(glm_eq(glm_clamp(1.6f, 0.0f, 1.0f), 1.0f))
ASSERT(glm_eq(glm_clamp(-1.6f, 0.0f, 1.0f), 0.0f))
ASSERT(glm_eq(glm_clamp(0.6f, 0.0f, 1.0f), 0.6f))
glm_vec3_clamp(v3, 0.0, 1.0);
glm_vec4_clamp(v4, 1.5, 3.0);
ASSERT(v3[0] == 1.0f)
ASSERT(v3[1] == 0.4f)
ASSERT(v3[2] == 1.0f)
ASSERT(glm_eq(v3[0], 1.0f))
ASSERT(glm_eq(v3[1], 0.4f))
ASSERT(glm_eq(v3[2], 1.0f))
ASSERT(v4[0] == 3.0f)
ASSERT(v4[1] == 2.3f)
ASSERT(v4[2] == 1.5f)
ASSERT(v4[3] == 1.5f)
ASSERT(glm_eq(v4[0], 3.0f))
ASSERT(glm_eq(v4[1], 2.3f))
ASSERT(glm_eq(v4[2], 1.5f))
ASSERT(glm_eq(v4[3], 1.5f))
TEST_SUCCESS
}

View File

@@ -187,3 +187,18 @@ TEST_IMPL(GLM_PREFIX, ivec2_clamp) {
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, ivec2_abs) {
ivec2 v1 = {2, -3}, v2 = {-12, -31};
ivec2 v3, v4;
GLM(ivec2_abs)(v1, v3);
GLM(ivec2_abs)(v2, v4);
ASSERT(v3[0] == 2)
ASSERT(v3[1] == 3)
ASSERT(v4[0] == 12)
ASSERT(v4[1] == 31)
TEST_SUCCESS
}

View File

@@ -197,3 +197,20 @@ TEST_IMPL(GLM_PREFIX, ivec3_clamp) {
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, ivec3_abs) {
ivec3 v1 = {2, -3, 4}, v2 = {-12, -31, -42};
ivec3 v3, v4;
GLM(ivec3_abs)(v1, v3);
GLM(ivec3_abs)(v2, v4);
ASSERT(v3[0] == 2)
ASSERT(v3[1] == 3)
ASSERT(v3[2] == 4)
ASSERT(v4[0] == 12)
ASSERT(v4[1] == 31)
ASSERT(v4[2] == 42)
TEST_SUCCESS
}

View File

@@ -212,3 +212,22 @@ TEST_IMPL(GLM_PREFIX, ivec4_clamp) {
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, ivec4_abs) {
ivec4 v1 = {2, -3, 4, -5}, v2 = {-12, -31, -42, -50};
ivec4 v3, v4;
GLM(ivec4_abs)(v1, v3);
GLM(ivec4_abs)(v2, v4);
ASSERT(v3[0] == 2)
ASSERT(v3[1] == 3)
ASSERT(v3[2] == 4)
ASSERT(v3[3] == 5)
ASSERT(v4[0] == 12)
ASSERT(v4[1] == 31)
ASSERT(v4[2] == 42)
ASSERT(v4[3] == 50)
TEST_SUCCESS
}

View File

@@ -579,6 +579,20 @@ TEST_IMPL(GLM_PREFIX, vec2_clamp) {
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, vec2_abs) {
vec2 v1 = {2, -3}, v2 = {-12, -31};
vec2 v3, v4;
vec2 v5 = {2, 3}, v6 = {12, 31};
GLM(vec2_abs)(v1, v3);
GLM(vec2_abs)(v2, v4);
ASSERTIFY(test_assert_vec2_eq(v3, v5))
ASSERTIFY(test_assert_vec2_eq(v4, v6))
TEST_SUCCESS
}
TEST_IMPL(GLM_PREFIX, vec2_lerp) {
vec2 v1 = {-100.0f, -200.0f};
vec2 v2 = {100.0f, 200.0f};

View File

@@ -379,6 +379,7 @@ TEST_DECLARE(glm_vec2_distance)
TEST_DECLARE(glm_vec2_maxv)
TEST_DECLARE(glm_vec2_minv)
TEST_DECLARE(glm_vec2_clamp)
TEST_DECLARE(glm_vec2_abs)
TEST_DECLARE(glm_vec2_lerp)
TEST_DECLARE(glm_vec2_complex_mul)
TEST_DECLARE(glm_vec2_complex_div)
@@ -416,6 +417,7 @@ TEST_DECLARE(glmc_vec2_distance)
TEST_DECLARE(glmc_vec2_maxv)
TEST_DECLARE(glmc_vec2_minv)
TEST_DECLARE(glmc_vec2_clamp)
TEST_DECLARE(glmc_vec2_abs)
TEST_DECLARE(glmc_vec2_lerp)
TEST_DECLARE(glmc_vec2_complex_mul)
TEST_DECLARE(glmc_vec2_complex_div)
@@ -746,6 +748,7 @@ TEST_DECLARE(glm_ivec2_distance)
TEST_DECLARE(glm_ivec2_maxv)
TEST_DECLARE(glm_ivec2_minv)
TEST_DECLARE(glm_ivec2_clamp)
TEST_DECLARE(glm_ivec2_abs)
TEST_DECLARE(glmc_ivec2)
TEST_DECLARE(glmc_ivec2_copy)
@@ -762,6 +765,7 @@ TEST_DECLARE(glmc_ivec2_distance)
TEST_DECLARE(glmc_ivec2_maxv)
TEST_DECLARE(glmc_ivec2_minv)
TEST_DECLARE(glmc_ivec2_clamp)
TEST_DECLARE(glmc_ivec2_abs)
/* ivec3 */
TEST_DECLARE(glm_ivec3)
@@ -812,6 +816,7 @@ TEST_DECLARE(glm_ivec4_distance)
TEST_DECLARE(glm_ivec4_maxv)
TEST_DECLARE(glm_ivec4_minv)
TEST_DECLARE(glm_ivec4_clamp)
TEST_DECLARE(glm_ivec4_abs)
TEST_DECLARE(glmc_ivec4)
TEST_DECLARE(glmc_ivec4_copy)
@@ -828,6 +833,7 @@ TEST_DECLARE(glmc_ivec4_distance)
TEST_DECLARE(glmc_ivec4_maxv)
TEST_DECLARE(glmc_ivec4_minv)
TEST_DECLARE(glmc_ivec4_clamp)
TEST_DECLARE(glmc_ivec4_abs)
/* structs */
TEST_DECLARE(mat3s_identity_init)
@@ -1244,6 +1250,7 @@ TEST_LIST {
TEST_ENTRY(glmc_vec2_maxv)
TEST_ENTRY(glmc_vec2_minv)
TEST_ENTRY(glmc_vec2_clamp)
TEST_ENTRY(glmc_vec2_abs)
TEST_ENTRY(glmc_vec2_lerp)
TEST_ENTRY(glmc_vec2_complex_mul)
TEST_ENTRY(glmc_vec2_complex_div)
@@ -1573,6 +1580,7 @@ TEST_LIST {
TEST_ENTRY(glm_ivec2_maxv)
TEST_ENTRY(glm_ivec2_minv)
TEST_ENTRY(glm_ivec2_clamp)
TEST_ENTRY(glm_ivec2_abs)
TEST_ENTRY(glmc_ivec2)
TEST_ENTRY(glmc_ivec2_copy)
@@ -1589,6 +1597,7 @@ TEST_LIST {
TEST_ENTRY(glmc_ivec2_maxv)
TEST_ENTRY(glmc_ivec2_minv)
TEST_ENTRY(glmc_ivec2_clamp)
TEST_ENTRY(glmc_ivec2_abs)
/* ivec3 */
TEST_ENTRY(glm_ivec3)
@@ -1655,6 +1664,7 @@ TEST_LIST {
TEST_ENTRY(glmc_ivec4_maxv)
TEST_ENTRY(glmc_ivec4_minv)
TEST_ENTRY(glmc_ivec4_clamp)
TEST_ENTRY(glmc_ivec4_abs)
/* structs */
TEST_ENTRY(mat3s_identity_init)

View File

@@ -1,10 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64EC">
<Configuration>Debug</Configuration>
<Platform>ARM64EC</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64EC">
<Configuration>Release</Configuration>
<Platform>ARM64EC</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -86,6 +110,24 @@
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -93,6 +135,27 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -107,19 +170,55 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
@@ -144,6 +243,69 @@
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
@@ -180,6 +342,60 @@
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>

View File

@@ -9,24 +9,54 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglm-test", "cglm-test.vcxp
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|ARM64EC = Debug|ARM64EC
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|ARM64EC = Release|ARM64EC
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|ARM.ActiveCfg = Debug|ARM
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|ARM.Build.0 = Debug|ARM
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|ARM64.ActiveCfg = Debug|ARM64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|ARM64.Build.0 = Debug|ARM64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|x64.ActiveCfg = Debug|x64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|x64.Build.0 = Debug|x64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|x86.ActiveCfg = Debug|Win32
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Debug|x86.Build.0 = Debug|Win32
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|ARM.ActiveCfg = Release|ARM
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|ARM.Build.0 = Release|ARM
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|ARM64.ActiveCfg = Release|ARM64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|ARM64.Build.0 = Release|ARM64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|ARM64EC.Build.0 = Release|ARM64EC
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|x64.ActiveCfg = Release|x64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|x64.Build.0 = Release|x64
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|x86.ActiveCfg = Release|Win32
{CA8BCAF9-CD25-4133-8F62-3D1449B5D2FC}.Release|x86.Build.0 = Release|Win32
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|ARM.ActiveCfg = Debug|ARM
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|ARM.Build.0 = Debug|ARM
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|ARM64.ActiveCfg = Debug|ARM64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|ARM64.Build.0 = Debug|ARM64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|x64.ActiveCfg = Debug|x64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|x64.Build.0 = Debug|x64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|x86.ActiveCfg = Debug|Win32
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Debug|x86.Build.0 = Debug|Win32
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|ARM.ActiveCfg = Release|ARM
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|ARM.Build.0 = Release|ARM
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|ARM64.ActiveCfg = Release|ARM64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|ARM64.Build.0 = Release|ARM64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|ARM64EC.Build.0 = Release|ARM64EC
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|x64.ActiveCfg = Release|x64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|x64.Build.0 = Release|x64
{200E0DF1-7532-44E6-8273-84FB92C5557E}.Release|x86.ActiveCfg = Release|Win32

View File

@@ -1,10 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64EC">
<Configuration>Debug</Configuration>
<Platform>ARM64EC</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64EC">
<Configuration>Release</Configuration>
<Platform>ARM64EC</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -158,6 +182,8 @@
<ClInclude Include="..\include\cglm\simd\x86.h" />
<ClInclude Include="..\include\cglm\sphere.h" />
<ClInclude Include="..\include\cglm\struct.h" />
<ClInclude Include="..\include\cglm\struct\affine-post.h" />
<ClInclude Include="..\include\cglm\struct\affine-pre.h" />
<ClInclude Include="..\include\cglm\struct\affine.h" />
<ClInclude Include="..\include\cglm\struct\affine2d.h" />
<ClInclude Include="..\include\cglm\struct\box.h" />
@@ -233,6 +259,24 @@
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -240,6 +284,27 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -254,9 +319,27 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
@@ -267,6 +350,18 @@
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -277,6 +372,21 @@
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<LinkIncremental>false</LinkIncremental>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
<LinkIncremental>false</LinkIncremental>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<LinkIncremental>false</LinkIncremental>
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -312,6 +422,63 @@
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CGLM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<CompileAs>CompileAsC</CompileAs>
<DebugInformationFormat>None</DebugInformationFormat>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CGLM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<CompileAs>CompileAsC</CompileAs>
<DebugInformationFormat>None</DebugInformationFormat>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CGLM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<CompileAs>CompileAsC</CompileAs>
<DebugInformationFormat>None</DebugInformationFormat>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<EnablePREfast>true</EnablePREfast>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -352,6 +519,69 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CGLM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>None</DebugInformationFormat>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<CompileAs>CompileAsC</CompileAs>
<EnablePREfast>true</EnablePREfast>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CGLM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>None</DebugInformationFormat>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<CompileAs>CompileAsC</CompileAs>
<EnablePREfast>true</EnablePREfast>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CGLM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>None</DebugInformationFormat>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<CompileAs>CompileAsC</CompileAs>
<EnablePREfast>true</EnablePREfast>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@@ -597,5 +597,11 @@
<ClInclude Include="..\include\cglm\affine-pre.h">
<Filter>include\cglm</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\affine-post.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
<ClInclude Include="..\include\cglm\struct\affine-pre.h">
<Filter>include\cglm\struct</Filter>
</ClInclude>
</ItemGroup>
</Project>