mirror of
https://github.com/recp/cglm.git
synced 2026-02-17 03:39:05 +00:00
Compare commits
117 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87092e6849 | ||
|
|
89ced4166a | ||
|
|
6080099434 | ||
|
|
f3735c9036 | ||
|
|
2242e9a5e1 | ||
|
|
a12364d486 | ||
|
|
b133c2e3e3 | ||
|
|
0127d30fa8 | ||
|
|
9b13b2f872 | ||
|
|
40d903c2bc | ||
|
|
06016220c0 | ||
|
|
bb751d32ca | ||
|
|
6dc37f6cc9 | ||
|
|
5ff42799b2 | ||
|
|
2326e627b5 | ||
|
|
c18fe8098f | ||
|
|
a9ed8470b4 | ||
|
|
332087da61 | ||
|
|
56c43d7a74 | ||
|
|
649f390662 | ||
|
|
0818bbdf51 | ||
|
|
edd1517f85 | ||
|
|
d0c2e8233c | ||
|
|
87837aa074 | ||
|
|
62ab6c56c0 | ||
|
|
a2985aa444 | ||
|
|
7274cee153 | ||
|
|
79c44fdbfa | ||
|
|
c32e986497 | ||
|
|
b953fcf1bd | ||
|
|
c0a4c245f0 | ||
|
|
acc0885e52 | ||
|
|
f49e8f9991 | ||
|
|
d2e5a3cd5b | ||
|
|
a1485a14f6 | ||
|
|
271e3b15d6 | ||
|
|
74cf89a82f | ||
|
|
8698082411 | ||
|
|
799de548f4 | ||
|
|
671dae3e22 | ||
|
|
7e142132bf | ||
|
|
0ccd58da01 | ||
|
|
4211c230cc | ||
|
|
269bdb3dbd | ||
|
|
b032b803ca | ||
|
|
26a638e11d | ||
|
|
099522ada3 | ||
|
|
4903dd62ea | ||
|
|
95161f7776 | ||
|
|
f0942c13a1 | ||
|
|
8eddeb77d0 | ||
|
|
cbed29820b | ||
|
|
3ec6bad5b3 | ||
|
|
fefc3dc32d | ||
|
|
203d40208c | ||
|
|
c45445c613 | ||
|
|
73c6766806 | ||
|
|
65dff25ed5 | ||
|
|
c2584c0fe6 | ||
|
|
bd951f96be | ||
|
|
1200372ced | ||
|
|
75a5ca153d | ||
|
|
5a9593d9bc | ||
|
|
edf46aaf2b | ||
|
|
e2ba795603 | ||
|
|
5e6b566d6a | ||
|
|
c973768495 | ||
|
|
6d8e2cc92d | ||
|
|
010dda6a77 | ||
|
|
345c7307ef | ||
|
|
f485c928b1 | ||
|
|
e895fe884e | ||
|
|
18fe47d0c7 | ||
|
|
a84ebc4aaa | ||
|
|
5c35c4ef5d | ||
|
|
f79674f66a | ||
|
|
e40373a1fa | ||
|
|
47807b7955 | ||
|
|
38cb693834 | ||
|
|
7bcd7609eb | ||
|
|
90eb164a43 | ||
|
|
78b2e2d2cc | ||
|
|
e60e7b5750 | ||
|
|
c1331a1dd4 | ||
|
|
339adab783 | ||
|
|
7bf38a3062 | ||
|
|
99076be6bb | ||
|
|
eb332acd7e | ||
|
|
c67f7a14a1 | ||
|
|
83f6db1bf8 | ||
|
|
e493149a0a | ||
|
|
38019f0913 | ||
|
|
bc6b751429 | ||
|
|
be68d57499 | ||
|
|
1fb5f89eaa | ||
|
|
6470a91265 | ||
|
|
d4235b2431 | ||
|
|
0ef028244a | ||
|
|
a8543bc813 | ||
|
|
cf3888d734 | ||
|
|
b8e978862e | ||
|
|
dfba2072f7 | ||
|
|
2bf576c2cd | ||
|
|
3abf47f175 | ||
|
|
2fc51c67a3 | ||
|
|
34753546f2 | ||
|
|
1711db4fef | ||
|
|
373b8d216a | ||
|
|
7f9487fd62 | ||
|
|
686deb8eb1 | ||
|
|
a392ac3012 | ||
|
|
fabc655919 | ||
|
|
7eada03909 | ||
|
|
ad4a763d47 | ||
|
|
1f9765c5e5 | ||
|
|
b3a464bf89 | ||
|
|
69b5584f11 |
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
*.h linguist-language=C
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -72,3 +72,6 @@ cglm-test-ios*
|
|||||||
/cglm.pc
|
/cglm.pc
|
||||||
test-driver
|
test-driver
|
||||||
Default-568h@2x.png
|
Default-568h@2x.png
|
||||||
|
build/
|
||||||
|
conftest.dir/*
|
||||||
|
confdefs.h
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ os:
|
|||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
|
|
||||||
|
arch:
|
||||||
|
- amd64
|
||||||
|
- ppc64le
|
||||||
|
- s390x
|
||||||
|
- arm64
|
||||||
|
|
||||||
sudo: required
|
sudo: required
|
||||||
dist: trusty
|
dist: trusty
|
||||||
|
|
||||||
|
|||||||
4
.vscode/settings.json
vendored
Normal file
4
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
|
||||||
|
"restructuredtext.confPath": "${workspaceFolder}/docs/source"
|
||||||
|
}
|
||||||
116
CMakeLists.txt
Normal file
116
CMakeLists.txt
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.8.2)
|
||||||
|
project(cglm VERSION 0.7.7 LANGUAGES C)
|
||||||
|
|
||||||
|
set(CMAKE_C_STANDARD 11)
|
||||||
|
set(CMAKE_C_STANDARD_REQUIRED YES)
|
||||||
|
set(DEFAULT_BUILD_TYPE "Release")
|
||||||
|
|
||||||
|
set(CGLM_BUILD)
|
||||||
|
option(CGLM_SHARED "Shared build" ON)
|
||||||
|
option(CGLM_STATIC "Static build" OFF)
|
||||||
|
option(CGLM_USE_C99 "" OFF)
|
||||||
|
option(CGLM_USE_TEST "Enable Tests" OFF)
|
||||||
|
|
||||||
|
if(NOT CGLM_STATIC AND CGLM_SHARED)
|
||||||
|
set(CGLM_BUILD SHARED)
|
||||||
|
else(CGLM_STATIC)
|
||||||
|
set(CGLM_BUILD STATIC)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CGLM_USE_C99)
|
||||||
|
set(C_STANDARD 99)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MSVC)
|
||||||
|
add_definitions(-DNDEBUG -D_WINDOWS -D_USRDLL -DCGLM_EXPORTS -DCGLM_DLL)
|
||||||
|
add_compile_options(/W3 /Ox /Gy /Oi /TC)
|
||||||
|
|
||||||
|
# Ref: https://skia.googlesource.com/third_party/sdl/+/refs/heads/master/CMakeLists.txt#225
|
||||||
|
# Make sure /RTC1 is disabled, otherwise it will use functions from the CRT
|
||||||
|
foreach(flag_var
|
||||||
|
CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
||||||
|
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
||||||
|
string(REGEX REPLACE "/RTC(su|[1su])" "" ${flag_var} "${${flag_var}}")
|
||||||
|
endforeach(flag_var)
|
||||||
|
else()
|
||||||
|
add_compile_options(-Wall -Werror -O3)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(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
|
||||||
|
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
set(CPACK_PROJECT_NAME ${PROJECT_NAME})
|
||||||
|
set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
|
||||||
|
include(CPack)
|
||||||
|
|
||||||
|
# Target Start
|
||||||
|
add_library(${PROJECT_NAME}
|
||||||
|
${CGLM_BUILD}
|
||||||
|
src/euler.c
|
||||||
|
src/affine.c
|
||||||
|
src/io.c
|
||||||
|
src/quat.c
|
||||||
|
src/cam.c
|
||||||
|
src/vec2.c
|
||||||
|
src/vec3.c
|
||||||
|
src/vec4.c
|
||||||
|
src/mat2.c
|
||||||
|
src/mat3.c
|
||||||
|
src/mat4.c
|
||||||
|
src/plane.c
|
||||||
|
src/frustum.c
|
||||||
|
src/box.c
|
||||||
|
src/project.c
|
||||||
|
src/sphere.c
|
||||||
|
src/ease.c
|
||||||
|
src/curve.c
|
||||||
|
src/bezier.c
|
||||||
|
src/ray.c
|
||||||
|
src/affine2d.c
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||||
|
VERSION ${PROJECT_VERSION}
|
||||||
|
SOVERSION ${PROJECT_VERSION_MAJOR})
|
||||||
|
|
||||||
|
target_include_directories(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
$<INSTALL_INTERFACE:include>
|
||||||
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||||
|
PRIVATE
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test Configuration
|
||||||
|
if(CGLM_USE_TEST)
|
||||||
|
include(CTest)
|
||||||
|
enable_testing()
|
||||||
|
add_subdirectory(test)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Install
|
||||||
|
install(TARGETS ${PROJECT_NAME}
|
||||||
|
EXPORT ${PROJECT_NAME}
|
||||||
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
|
install(DIRECTORY include/${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||||
|
PATTERN ".*" EXCLUDE)
|
||||||
|
|
||||||
|
# Config
|
||||||
|
export(TARGETS ${PROJECT_NAME}
|
||||||
|
NAMESPACE ${PROJECT_NAME}::
|
||||||
|
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
||||||
|
)
|
||||||
|
|
||||||
|
install(EXPORT ${PROJECT_NAME}
|
||||||
|
NAMESPACE ${PROJECT_NAME}::
|
||||||
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake)
|
||||||
|
|
||||||
22
CREDITS
22
CREDITS
@@ -65,19 +65,9 @@ https://forums.khronos.org/showthread.php/10651-Animation-TCB-Spline-Interpolati
|
|||||||
12. vec2 cross product
|
12. vec2 cross product
|
||||||
http://allenchou.net/2013/07/cross-product-of-2d-vectors/
|
http://allenchou.net/2013/07/cross-product-of-2d-vectors/
|
||||||
|
|
||||||
13. Ken Shoemake's algorithm Implementation and Euler
|
13. Ray triangle intersect
|
||||||
Ken Shoemake's algorithm impl. is taken from this repo by permission:
|
Möller–Trumbore ray-triangle intersection algorithm, from "Fast, Minimum Storage Ray/Triangle Intersection"
|
||||||
https://github.com/erich666/GraphicsGems/blob/master/gemsiv/euler_angle
|
Authors:
|
||||||
|
Thomas Möller (tompa@clarus.se)
|
||||||
* -------------------------- GraphicsGems EULA ----------------------------- *
|
Ben Trumbore (wbt@graphics.cornell.edu)
|
||||||
| http://www.realtimerendering.com/resources/GraphicsGems/ |
|
Link to paper: http://webserver2.tecgraf.puc-rio.br/~mgattass/cg/trbRR/Fast%20MinimumStorage%20RayTriangle%20Intersection.pdf
|
||||||
| |
|
|
||||||
| EULA: The Graphics Gems code is copyright-protected. In other words, you |
|
|
||||||
| cannot claim the text of the code as your own and resell it. Using the |
|
|
||||||
| code is permitted in any program, product, or library, non-commercial or |
|
|
||||||
| commercial. Giving credit is not required, though is a nice gesture. |
|
|
||||||
| The code comes as-is, and if there are any flaws or problems with any Gems |
|
|
||||||
| code, nobody involved with Gems - authors, editors, publishers, or |
|
|
||||||
| webmasters - are to be held responsible. Basically, don't be a jerk, and |
|
|
||||||
| remember that anything free comes with no guarantee. |
|
|
||||||
* -------------------------------- END --------------------------------------*/
|
|
||||||
21
Makefile.am
21
Makefile.am
@@ -12,7 +12,6 @@ AM_CFLAGS = -Wall \
|
|||||||
-O3 \
|
-O3 \
|
||||||
-Wstrict-aliasing=2 \
|
-Wstrict-aliasing=2 \
|
||||||
-fstrict-aliasing \
|
-fstrict-aliasing \
|
||||||
-pedantic \
|
|
||||||
-Werror=strict-prototypes
|
-Werror=strict-prototypes
|
||||||
|
|
||||||
lib_LTLIBRARIES = libcglm.la
|
lib_LTLIBRARIES = libcglm.la
|
||||||
@@ -22,6 +21,9 @@ checkLDFLAGS = -L./.libs \
|
|||||||
-lm \
|
-lm \
|
||||||
-lcglm
|
-lcglm
|
||||||
checkCFLAGS = $(AM_CFLAGS) \
|
checkCFLAGS = $(AM_CFLAGS) \
|
||||||
|
-std=gnu11 \
|
||||||
|
-O3 \
|
||||||
|
-DCGLM_DEFINE_PRINTS \
|
||||||
-I./include
|
-I./include
|
||||||
|
|
||||||
check_PROGRAMS = test/tests
|
check_PROGRAMS = test/tests
|
||||||
@@ -63,7 +65,9 @@ cglm_HEADERS = include/cglm/version.h \
|
|||||||
include/cglm/ease.h \
|
include/cglm/ease.h \
|
||||||
include/cglm/curve.h \
|
include/cglm/curve.h \
|
||||||
include/cglm/bezier.h \
|
include/cglm/bezier.h \
|
||||||
include/cglm/applesimd.h
|
include/cglm/applesimd.h \
|
||||||
|
include/cglm/ray.h \
|
||||||
|
include/cglm/affine2d.h
|
||||||
|
|
||||||
cglm_calldir=$(includedir)/cglm/call
|
cglm_calldir=$(includedir)/cglm/call
|
||||||
cglm_call_HEADERS = include/cglm/call/mat4.h \
|
cglm_call_HEADERS = include/cglm/call/mat4.h \
|
||||||
@@ -84,7 +88,9 @@ cglm_call_HEADERS = include/cglm/call/mat4.h \
|
|||||||
include/cglm/call/sphere.h \
|
include/cglm/call/sphere.h \
|
||||||
include/cglm/call/ease.h \
|
include/cglm/call/ease.h \
|
||||||
include/cglm/call/curve.h \
|
include/cglm/call/curve.h \
|
||||||
include/cglm/call/bezier.h
|
include/cglm/call/bezier.h \
|
||||||
|
include/cglm/call/ray.h \
|
||||||
|
include/cglm/call/affine2d.h
|
||||||
|
|
||||||
cglm_simddir=$(includedir)/cglm/simd
|
cglm_simddir=$(includedir)/cglm/simd
|
||||||
cglm_simd_HEADERS = include/cglm/simd/intrin.h \
|
cglm_simd_HEADERS = include/cglm/simd/intrin.h \
|
||||||
@@ -95,6 +101,7 @@ cglm_simd_sse2dir=$(includedir)/cglm/simd/sse2
|
|||||||
cglm_simd_sse2_HEADERS = include/cglm/simd/sse2/affine.h \
|
cglm_simd_sse2_HEADERS = include/cglm/simd/sse2/affine.h \
|
||||||
include/cglm/simd/sse2/mat4.h \
|
include/cglm/simd/sse2/mat4.h \
|
||||||
include/cglm/simd/sse2/mat3.h \
|
include/cglm/simd/sse2/mat3.h \
|
||||||
|
include/cglm/simd/sse2/mat2.h \
|
||||||
include/cglm/simd/sse2/quat.h
|
include/cglm/simd/sse2/quat.h
|
||||||
|
|
||||||
cglm_simd_avxdir=$(includedir)/cglm/simd/avx
|
cglm_simd_avxdir=$(includedir)/cglm/simd/avx
|
||||||
@@ -107,6 +114,7 @@ cglm_simd_neon_HEADERS = include/cglm/simd/neon/mat4.h
|
|||||||
cglm_structdir=$(includedir)/cglm/struct
|
cglm_structdir=$(includedir)/cglm/struct
|
||||||
cglm_struct_HEADERS = include/cglm/struct/mat4.h \
|
cglm_struct_HEADERS = include/cglm/struct/mat4.h \
|
||||||
include/cglm/struct/mat3.h \
|
include/cglm/struct/mat3.h \
|
||||||
|
include/cglm/struct/mat2.h \
|
||||||
include/cglm/struct/vec2.h \
|
include/cglm/struct/vec2.h \
|
||||||
include/cglm/struct/vec2-ext.h \
|
include/cglm/struct/vec2-ext.h \
|
||||||
include/cglm/struct/vec3.h \
|
include/cglm/struct/vec3.h \
|
||||||
@@ -124,7 +132,8 @@ cglm_struct_HEADERS = include/cglm/struct/mat4.h \
|
|||||||
include/cglm/struct/project.h \
|
include/cglm/struct/project.h \
|
||||||
include/cglm/struct/sphere.h \
|
include/cglm/struct/sphere.h \
|
||||||
include/cglm/struct/color.h \
|
include/cglm/struct/color.h \
|
||||||
include/cglm/struct/curve.h
|
include/cglm/struct/curve.h \
|
||||||
|
include/cglm/struct/affine2d.h
|
||||||
|
|
||||||
libcglm_la_SOURCES=\
|
libcglm_la_SOURCES=\
|
||||||
src/euler.c \
|
src/euler.c \
|
||||||
@@ -145,7 +154,9 @@ libcglm_la_SOURCES=\
|
|||||||
src/sphere.c \
|
src/sphere.c \
|
||||||
src/ease.c \
|
src/ease.c \
|
||||||
src/curve.c \
|
src/curve.c \
|
||||||
src/bezier.c
|
src/bezier.c \
|
||||||
|
src/ray.c \
|
||||||
|
src/affine2d.c
|
||||||
|
|
||||||
test_tests_SOURCES=\
|
test_tests_SOURCES=\
|
||||||
test/runner.c \
|
test/runner.c \
|
||||||
|
|||||||
37
README.md
37
README.md
@@ -89,6 +89,7 @@ Currently *cglm* uses default clip space configuration (-1, 1) for camera functi
|
|||||||
- curves
|
- curves
|
||||||
- curve interpolation helpers (S*M*C, deCasteljau...)
|
- curve interpolation helpers (S*M*C, deCasteljau...)
|
||||||
- helpers to convert cglm types to Apple's simd library to pass cglm types to Metal GL without packing them on both sides
|
- helpers to convert cglm types to Apple's simd library to pass cglm types to Metal GL without packing them on both sides
|
||||||
|
- ray intersection helpers
|
||||||
- and others...
|
- and others...
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
@@ -148,6 +149,40 @@ The types used are actually unions that allow access to the same data multiple w
|
|||||||
|
|
||||||
## Build
|
## Build
|
||||||
|
|
||||||
|
### CMake (All platforms)
|
||||||
|
```bash
|
||||||
|
$ mkdir build
|
||||||
|
$ cd build
|
||||||
|
$ cmake .. # [Optional] -DCGLM_SHARED=ON
|
||||||
|
$ make
|
||||||
|
$ sudo make install # [Optional]
|
||||||
|
```
|
||||||
|
|
||||||
|
##### Cmake options with Defaults:
|
||||||
|
|
||||||
|
```CMake
|
||||||
|
option(CGLM_SHARED "Shared build" ON)
|
||||||
|
option(CGLM_STATIC "Static build" OFF)
|
||||||
|
option(CGLM_USE_C99 "" OFF) # C11
|
||||||
|
option(CGLM_USE_TEST "Enable Tests" OFF) # for make check - make test
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Use with your CMake project
|
||||||
|
* Example:
|
||||||
|
```cmake
|
||||||
|
cmake_minimum_required(VERSION 3.8.2)
|
||||||
|
|
||||||
|
project(<Your Project Name>)
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME} src/main.c)
|
||||||
|
target_link_libraries(${LIBRARY_NAME} PRIVATE
|
||||||
|
cglm)
|
||||||
|
|
||||||
|
add_subdirectory(external/cglm/)
|
||||||
|
|
||||||
|
# or you can use find_package to configure cglm
|
||||||
|
```
|
||||||
|
|
||||||
### Unix (Autotools)
|
### Unix (Autotools)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -291,7 +326,7 @@ You can pass matrices the same way to other APIs e.g. Vulkan, DX...
|
|||||||
## Contributors
|
## Contributors
|
||||||
|
|
||||||
This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
|
This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
|
||||||
<a href="graphs/contributors"><img src="https://opencollective.com/cglm/contributors.svg?width=890&button=false" /></a>
|
<a href="https://github.com/recp/cglm/graphs/contributors"><img src="https://opencollective.com/cglm/contributors.svg?width=890&button=false" /></a>
|
||||||
|
|
||||||
|
|
||||||
## Backers
|
## Backers
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
|
|||||||
|
|
||||||
# Description
|
# Description
|
||||||
s.name = "cglm"
|
s.name = "cglm"
|
||||||
s.version = "0.6.1"
|
s.version = "0.7.2"
|
||||||
s.summary = "📽 Optimized OpenGL/Graphics Math (glm) for C"
|
s.summary = "📽 Optimized OpenGL/Graphics Math (glm) for C"
|
||||||
s.description = <<-DESC
|
s.description = <<-DESC
|
||||||
cglm is math library for graphics programming for C. It is similar to original glm but it is written for C instead of C++ (you can use here too). See the documentation or README for all features.
|
cglm is math library for graphics programming for C. It is similar to original glm but it is written for C instead of C++ (you can use here too). See the documentation or README for all features.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
#*****************************************************************************
|
#*****************************************************************************
|
||||||
|
|
||||||
AC_PREREQ([2.69])
|
AC_PREREQ([2.69])
|
||||||
AC_INIT([cglm], [0.7.1], [info@recp.me])
|
AC_INIT([cglm], [0.7.7], [info@recp.me])
|
||||||
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects serial-tests])
|
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.
|
# Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.. default-domain:: C
|
.. default-domain:: C
|
||||||
|
|
||||||
affine transform matrix (specialized functions)
|
3D Affine Transform Matrix (specialized functions)
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
Header: cglm/affine-mat.h
|
Header: cglm/affine-mat.h
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
.. default-domain:: C
|
.. default-domain:: C
|
||||||
|
|
||||||
affine transforms
|
3D Affine Transforms
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
Header: cglm/affine.h
|
Header: cglm/affine.h
|
||||||
@@ -45,6 +45,8 @@ The implementation would be:
|
|||||||
glm_rotate(m, angle, axis);
|
glm_rotate(m, angle, axis);
|
||||||
glm_translate(m, pivotInv); /* pivotInv = -pivot */
|
glm_translate(m, pivotInv); /* pivotInv = -pivot */
|
||||||
|
|
||||||
|
.. _TransformsOrder:
|
||||||
|
|
||||||
Transforms Order
|
Transforms Order
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|||||||
140
docs/source/affine2d.rst
Normal file
140
docs/source/affine2d.rst
Normal file
@@ -0,0 +1,140 @@
|
|||||||
|
.. default-domain:: C
|
||||||
|
|
||||||
|
2D Affine Transforms
|
||||||
|
================================================================================
|
||||||
|
|
||||||
|
Header: cglm/affine2d.h
|
||||||
|
|
||||||
|
2D Transforms uses `2d` suffix for naming. If there is no 2D suffix it is 3D function.
|
||||||
|
|
||||||
|
Initialize Transform Matrices
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
Functions with **_make** prefix expect you don't have a matrix and they create
|
||||||
|
a matrix for you. You don't need to pass identity matrix.
|
||||||
|
|
||||||
|
But other functions expect you have a matrix and you want to transform them. If
|
||||||
|
you didn't have any existing matrix you have to initialize matrix to identity
|
||||||
|
before sending to transfrom functions.
|
||||||
|
|
||||||
|
Transforms Order
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
See :ref:`TransformsOrder` to read similar section.
|
||||||
|
|
||||||
|
|
||||||
|
Table of contents (click to go):
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Functions:
|
||||||
|
|
||||||
|
1. :c:func:`glm_translate2d`
|
||||||
|
#. :c:func:`glm_translate2d_to`
|
||||||
|
#. :c:func:`glm_translate2d_x`
|
||||||
|
#. :c:func:`glm_translate2d_y`
|
||||||
|
#. :c:func:`glm_translate2d_make`
|
||||||
|
#. :c:func:`glm_scale2d_to`
|
||||||
|
#. :c:func:`glm_scale2d_make`
|
||||||
|
#. :c:func:`glm_scale2d`
|
||||||
|
#. :c:func:`glm_scale2d_uni`
|
||||||
|
#. :c:func:`glm_rotate2d_make`
|
||||||
|
#. :c:func:`glm_rotate2d`
|
||||||
|
#. :c:func:`glm_rotate2d_to`
|
||||||
|
|
||||||
|
.. c:function:: void glm_translate2d(mat3 m, vec2 v)
|
||||||
|
|
||||||
|
translate existing 2d transform matrix by *v* vector and stores result in same matrix
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** 2d affine transfrom
|
||||||
|
| *[in]* **v** translate vector [x, y]
|
||||||
|
|
||||||
|
.. c:function:: void glm_translate2d_to(mat3 m, vec2 v, mat3 dest)
|
||||||
|
|
||||||
|
translate existing 2d transform matrix by *v* vector and store result in dest
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **m** 2d affine transfrom
|
||||||
|
| *[in]* **v** translate vector [x, y]
|
||||||
|
| *[out]* **dest** translated matrix
|
||||||
|
|
||||||
|
.. c:function:: void glm_translate2d_x(mat3 m, float x)
|
||||||
|
|
||||||
|
translate existing 2d transform matrix by x factor
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** 2d affine transfrom
|
||||||
|
| *[in]* **x** x factor
|
||||||
|
|
||||||
|
.. c:function:: void glm_translate2d_y(mat3 m, float y)
|
||||||
|
|
||||||
|
translate existing 2d transform matrix by y factor
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** 2d affine transfrom
|
||||||
|
| *[in]* **y** y factor
|
||||||
|
|
||||||
|
.. c:function:: void glm_translate2d_make(mat3 m, vec2 v)
|
||||||
|
|
||||||
|
creates NEW translate 2d transform matrix by *v* vector
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** affine transfrom
|
||||||
|
| *[in]* **v** translate vector [x, y]
|
||||||
|
|
||||||
|
.. c:function:: void glm_scale2d_to(mat3 m, vec2 v, mat3 dest)
|
||||||
|
|
||||||
|
scale existing 2d transform matrix by *v* vector and store result in dest
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **m** affine transfrom
|
||||||
|
| *[in]* **v** scale vector [x, y]
|
||||||
|
| *[out]* **dest** scaled matrix
|
||||||
|
|
||||||
|
.. c:function:: void glm_scale2d_make(mat3 m, vec2 v)
|
||||||
|
|
||||||
|
creates NEW 2d scale matrix by *v* vector
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** affine transfrom
|
||||||
|
| *[in]* **v** scale vector [x, y]
|
||||||
|
|
||||||
|
.. c:function:: void glm_scale2d(mat3 m, vec2 v)
|
||||||
|
|
||||||
|
scales existing 2d transform matrix by *v* vector and stores result in same matrix
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** affine transfrom
|
||||||
|
| *[in]* **v** translate vector [x, y]
|
||||||
|
|
||||||
|
.. c:function:: void glm_scale2d_uni(mat3 m, float s)
|
||||||
|
|
||||||
|
applies uniform scale to existing 2d transform matrix v = [s, s] and stores result in same matrix
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** affine transfrom
|
||||||
|
| *[in]* **s** scale factor
|
||||||
|
|
||||||
|
.. c:function:: void glm_rotate2d_make(mat3 m, float angle)
|
||||||
|
|
||||||
|
creates NEW rotation matrix by angle around *Z* axis
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** affine transfrom
|
||||||
|
| *[in]* **angle** angle (radians)
|
||||||
|
|
||||||
|
.. c:function:: void glm_rotate2d(mat3 m, float angle)
|
||||||
|
|
||||||
|
rotate existing 2d transform matrix around *Z* axis by angle and store result in same matrix
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in, out]* **m** affine transfrom
|
||||||
|
| *[in]* **angle** angle (radians)
|
||||||
|
|
||||||
|
.. c:function:: void glm_rotate2d_to(mat3 m, float angle, mat3 dest)
|
||||||
|
|
||||||
|
rotate existing 2d transform matrix around *Z* axis by angle and store result in dest
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **m** affine transfrom
|
||||||
|
| *[in]* **angle** angle (radians)
|
||||||
|
| *[out]* **dest** rotated matrix
|
||||||
@@ -28,6 +28,7 @@ Follow the :doc:`build` documentation for this
|
|||||||
|
|
||||||
affine
|
affine
|
||||||
affine-mat
|
affine-mat
|
||||||
|
affine2d
|
||||||
cam
|
cam
|
||||||
frustum
|
frustum
|
||||||
box
|
box
|
||||||
@@ -51,3 +52,5 @@ Follow the :doc:`build` documentation for this
|
|||||||
sphere
|
sphere
|
||||||
curve
|
curve
|
||||||
bezier
|
bezier
|
||||||
|
version
|
||||||
|
ray
|
||||||
|
|||||||
@@ -7,6 +7,46 @@ Build cglm
|
|||||||
If you only need to inline versions, you don't need to build **cglm**, you don't need to link it to your program.
|
If you only need to inline versions, you don't need to build **cglm**, you don't need to link it to your program.
|
||||||
Just import cglm to your project as dependency / external lib by copy-paste then use it as usual
|
Just import cglm to your project as dependency / external lib by copy-paste then use it as usual
|
||||||
|
|
||||||
|
CMake (All platforms):
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
.. code-block:: bash
|
||||||
|
:linenos:
|
||||||
|
|
||||||
|
$ mkdir build
|
||||||
|
$ cd build
|
||||||
|
$ cmake .. # [Optional] -DCGLM_SHARED=ON
|
||||||
|
$ make
|
||||||
|
$ sudo make install # [Optional]
|
||||||
|
|
||||||
|
**make** will build cglm to **build** folder.
|
||||||
|
If you don't want to install **cglm** to your system's folder you can get static and dynamic libs in this folder.
|
||||||
|
|
||||||
|
**CMake Options:**
|
||||||
|
|
||||||
|
.. code-block:: CMake
|
||||||
|
:linenos:
|
||||||
|
|
||||||
|
option(CGLM_SHARED "Shared build" ON)
|
||||||
|
option(CGLM_STATIC "Static build" OFF)
|
||||||
|
option(CGLM_USE_C99 "" OFF) # C11
|
||||||
|
option(CGLM_USE_TEST "Enable Tests" OFF) # for make check - make test
|
||||||
|
|
||||||
|
**Use with your CMake project example**
|
||||||
|
|
||||||
|
.. code-block:: CMake
|
||||||
|
:linenos:
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.8.2)
|
||||||
|
|
||||||
|
project(<Your Project Name>)
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME} src/main.c)
|
||||||
|
target_link_libraries(${LIBRARY_NAME} PRIVATE
|
||||||
|
cglm)
|
||||||
|
|
||||||
|
add_subdirectory(external/cglm/)
|
||||||
|
|
||||||
Unix (Autotools):
|
Unix (Autotools):
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ Functions documentation
|
|||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **eye** eye vector
|
| *[in]* **eye** eye vector
|
||||||
| *[in]* **center** direction vector
|
| *[in]* **dir** direction vector
|
||||||
| *[in]* **up** up vector
|
| *[in]* **up** up vector
|
||||||
| *[out]* **dest** result matrix
|
| *[out]* **dest** result matrix
|
||||||
|
|
||||||
@@ -212,7 +212,7 @@ Functions documentation
|
|||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **eye** eye vector
|
| *[in]* **eye** eye vector
|
||||||
| *[in]* **center** direction vector
|
| *[in]* **dir** direction vector
|
||||||
| *[out]* **dest** result matrix
|
| *[out]* **dest** result matrix
|
||||||
|
|
||||||
.. c:function:: void glm_persp_decomp(mat4 proj, float *nearVal, float *farVal, float *top, float *bottom, float *left, float *right)
|
.. c:function:: void glm_persp_decomp(mat4 proj, float *nearVal, float *farVal, float *top, float *bottom, float *left, float *right)
|
||||||
|
|||||||
@@ -62,9 +62,9 @@ author = u'Recep Aslantas'
|
|||||||
# built documents.
|
# built documents.
|
||||||
#
|
#
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = u'0.7.1'
|
version = u'0.7.7'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# The full version, including alpha/beta/rc tags.
|
||||||
release = u'0.7.1'
|
release = u'0.7.7'
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
Features
|
Features
|
||||||
================================================================================
|
================================================================================
|
||||||
|
|
||||||
|
* array api and struct api, you can use arrays or structs.
|
||||||
* general purpose matrix operations (mat4, mat3)
|
* general purpose matrix operations (mat4, mat3)
|
||||||
* chain matrix multiplication (square only)
|
* chain matrix multiplication (square only)
|
||||||
* general purpose vector operations (cross, dot, rotate, proj, angle...)
|
* general purpose vector operations (cross, dot, rotate, proj, angle...)
|
||||||
* affine transforms
|
* affine transformations
|
||||||
* matrix decomposition (extract rotation, scaling factor)
|
* matrix decomposition (extract rotation, scaling factor)
|
||||||
* optimized affine transform matrices (mul, rigid-body inverse)
|
* optimized affine transform matrices (mul, rigid-body inverse)
|
||||||
* camera (lookat)
|
* camera (lookat)
|
||||||
@@ -20,4 +21,6 @@ Features
|
|||||||
* easing functions
|
* easing functions
|
||||||
* curves
|
* curves
|
||||||
* curve interpolation helpers (SMC, deCasteljau...)
|
* curve interpolation helpers (SMC, deCasteljau...)
|
||||||
* and other...
|
* helpers to convert cglm types to Apple's simd library to pass cglm types to Metal GL without packing them on both sides
|
||||||
|
* ray intersection helpers
|
||||||
|
* and others...
|
||||||
|
|||||||
@@ -28,6 +28,23 @@ Example to print mat4 matrix:
|
|||||||
(you probably will in some cases), you can change it temporary.
|
(you probably will in some cases), you can change it temporary.
|
||||||
cglm may provide precision parameter in the future
|
cglm may provide precision parameter in the future
|
||||||
|
|
||||||
|
Changes since **v0.7.3**:
|
||||||
|
* Now mis-alignment of columns are fixed: larger numbers are printed via %g and others are printed via %f. Column withs are calculated before print.
|
||||||
|
* Now values are colorful ;)
|
||||||
|
* Some print improvements
|
||||||
|
* New options with default values:
|
||||||
|
|
||||||
|
.. code-block:: c
|
||||||
|
|
||||||
|
#define CGLM_PRINT_PRECISION 5
|
||||||
|
#define CGLM_PRINT_MAX_TO_SHORT 1e5
|
||||||
|
#define CGLM_PRINT_COLOR "\033[36m"
|
||||||
|
#define CGLM_PRINT_COLOR_RESET "\033[0m"
|
||||||
|
|
||||||
|
* Inline prints are only enabled in DEBUG mode and if **CGLM_DEFINE_PRINTS** is defined.
|
||||||
|
|
||||||
|
Check options page.
|
||||||
|
|
||||||
Table of contents (click to go):
|
Table of contents (click to go):
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|||||||
@@ -156,16 +156,22 @@ Functions documentation
|
|||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **m** mat4 (left)
|
| *[in]* **m** mat4 (left)
|
||||||
| *[in]* **v** vec4 (right, column vector)
|
| *[in]* **v** vec4 (right, column vector)
|
||||||
|
| *[in]* **last** 4th item to make it vec4
|
||||||
| *[out]* **dest** vec4 (result, column vector)
|
| *[out]* **dest** vec4 (result, column vector)
|
||||||
|
|
||||||
.. c:function:: void glm_mat4_mulv3(mat4 m, vec3 v, vec3 dest)
|
.. c:function:: void glm_mat4_mulv3(mat4 m, vec3 v, float last, vec3 dest)
|
||||||
|
|
||||||
multiply vector with mat4's mat3 part(rotation)
|
| multiply **vec3** with **mat4** and get **vec3** as result
|
||||||
|
|
|
||||||
|
| actually the result is **vec4**, after multiplication,
|
||||||
|
the last component is trimmed, if you need the result's last component
|
||||||
|
then don't use this function and consider to use **glm_mat4_mulv()**
|
||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **m** mat4 (left)
|
| *[in]* **m** mat4(affine transform)
|
||||||
| *[in]* **v** vec3 (right, column vector)
|
| *[in]* **v** vec3
|
||||||
| *[out]* **dest** vec3 (result, column vector)
|
| *[in]* **last** 4th item to make it vec4
|
||||||
|
| *[out]* **dest** result vector (vec3)
|
||||||
|
|
||||||
.. c:function:: void glm_mat4_trace(mat4 m)
|
.. c:function:: void glm_mat4_trace(mat4 m)
|
||||||
|
|
||||||
|
|||||||
@@ -50,3 +50,24 @@ You have to extra options for dot product: **CGLM_SSE4_DOT** and **CGLM_SSE3_DOT
|
|||||||
- If **SSE3** is enabled then you can define **CGLM_SSE3_DOT** to force cglm to use **_mm_hadd_ps** instructions.
|
- If **SSE3** is enabled then you can define **CGLM_SSE3_DOT** to force cglm to use **_mm_hadd_ps** instructions.
|
||||||
|
|
||||||
otherwise cglm will use custom cglm's hadd functions which are optimized too.
|
otherwise cglm will use custom cglm's hadd functions which are optimized too.
|
||||||
|
|
||||||
|
Print Options
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
1. **CGLM_DEFINE_PRINTS**
|
||||||
|
2. **CGLM_NO_PRINTS_NOOP**
|
||||||
|
|
||||||
|
Inline prints are only enabled in DEBUG mode and if **CGLM_DEFINE_PRINTS** is defined.
|
||||||
|
If DEBUG is not enabled then print function bodies will be emptied to eliminate print function calls.
|
||||||
|
You can disable this feature too by defining **CGLM_NO_PRINTS_NOOP** macro top of cglm headers.
|
||||||
|
|
||||||
|
3. **CGLM_PRINT_PRECISION** 5
|
||||||
|
|
||||||
|
precision.
|
||||||
|
|
||||||
|
4. **CGLM_PRINT_MAX_TO_SHORT** 1e5
|
||||||
|
|
||||||
|
if a number is greater than this value then %g will be used, since this is shorten print you won't be able to see high precision.
|
||||||
|
|
||||||
|
5. **CGLM_PRINT_COLOR** "\033[36m"
|
||||||
|
6. **CGLM_PRINT_COLOR_RESET** "\033[0m"
|
||||||
|
|||||||
31
docs/source/ray.rst
Normal file
31
docs/source/ray.rst
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
.. default-domain:: C
|
||||||
|
|
||||||
|
ray
|
||||||
|
====
|
||||||
|
|
||||||
|
Header: cglm/ray.h
|
||||||
|
|
||||||
|
This is for collision-checks used by ray-tracers and the like.
|
||||||
|
|
||||||
|
Table of contents (click to go):
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Functions:
|
||||||
|
|
||||||
|
1. :c:func:`glm_ray_triangle`
|
||||||
|
|
||||||
|
Functions documentation
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
.. c:function:: bool glm_ray_triangle(vec3 origin, vec3 direction, vec3 v0, vec3 v1, vec3 v2, float *d)
|
||||||
|
|
||||||
|
Möller–Trumbore ray-triangle intersection algorithm
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **origin** origin of ray
|
||||||
|
| *[in]* **direction** direction of ray
|
||||||
|
| *[in]* **v0** first vertex of triangle
|
||||||
|
| *[in]* **v1** second vertex of triangle
|
||||||
|
| *[in]* **v2** third vertex of triangle
|
||||||
|
| *[in, out]* **d** float pointer to save distance to intersection
|
||||||
|
| *[out]* **intersection** whether there is intersection
|
||||||
@@ -80,6 +80,19 @@ So be carefull, when your IDE (Xcode, Visual Studio ...) tried to autocomplete f
|
|||||||
|
|
||||||
**Also implementation may be wrong please let us know by creating an issue on Github.**
|
**Also implementation may be wrong please let us know by creating an issue on Github.**
|
||||||
|
|
||||||
|
BAD_ACCESS : Thread 1: EXC_BAD_ACCESS (code=EXC_I386_GPFLT) or Similar Errors/Crashes
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
This is similar issue with alignment. For instance if you compiled **cglm** with
|
||||||
|
AVX (**-mavx**, intentionally or not) and if you use **cglm** in an environment that doesn't
|
||||||
|
support AVX (or if AVX is disabled intentionally) e.g. environment that max support SSE2/3/4,
|
||||||
|
then you probably get **BAD ACCESS** or similar...
|
||||||
|
|
||||||
|
Because if you compile **cglm** with AVX it aligns **mat4** with 32 byte boundary,
|
||||||
|
and your project aligns that as 16 byte boundary...
|
||||||
|
|
||||||
|
Check alignment, supported vector extension or simd in **cglm** and linked projects...
|
||||||
|
|
||||||
Other Issues?
|
Other Issues?
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ Functions:
|
|||||||
#. :c:func:`glm_max`
|
#. :c:func:`glm_max`
|
||||||
#. :c:func:`glm_clamp`
|
#. :c:func:`glm_clamp`
|
||||||
#. :c:func:`glm_lerp`
|
#. :c:func:`glm_lerp`
|
||||||
|
#. :c:func:`glm_swapf`
|
||||||
|
|
||||||
Functions documentation
|
Functions documentation
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
@@ -146,7 +147,7 @@ Functions documentation
|
|||||||
| *[in]* **b** b
|
| *[in]* **b** b
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
true if a and b equals
|
true if a and b are equal
|
||||||
|
|
||||||
.. c:function:: float glm_percent(float from, float to, float current)
|
.. c:function:: float glm_percent(float from, float to, float current)
|
||||||
|
|
||||||
@@ -158,7 +159,7 @@ Functions documentation
|
|||||||
| *[in]* **current** value between from and to values
|
| *[in]* **current** value between from and to values
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
clamped normalized percent (0-100 in 0-1)
|
percentage of current value
|
||||||
|
|
||||||
.. c:function:: float glm_percentc(float from, float to, float current)
|
.. c:function:: float glm_percentc(float from, float to, float current)
|
||||||
|
|
||||||
@@ -171,3 +172,11 @@ Functions documentation
|
|||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
clamped normalized percent (0-100 in 0-1)
|
clamped normalized percent (0-100 in 0-1)
|
||||||
|
|
||||||
|
.. c:function:: void glm_swapf(float *a, float *b)
|
||||||
|
|
||||||
|
swap two float values
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
| *[in]* **a** float 1
|
||||||
|
| *[in]* **b** float 2
|
||||||
|
|||||||
@@ -392,7 +392,7 @@ Functions documentation
|
|||||||
Parameters:
|
Parameters:
|
||||||
| *[in, out]* **v** vector
|
| *[in, out]* **v** vector
|
||||||
| *[in]* **axis** axis vector (will be normalized)
|
| *[in]* **axis** axis vector (will be normalized)
|
||||||
| *[out]* **angle** angle (radians)
|
| *[in]* **angle** angle (radians)
|
||||||
|
|
||||||
.. c:function:: void glm_vec3_rotate_m4(mat4 m, vec3 v, vec3 dest)
|
.. c:function:: void glm_vec3_rotate_m4(mat4 m, vec3 v, vec3 dest)
|
||||||
|
|
||||||
@@ -435,8 +435,8 @@ Functions documentation
|
|||||||
squared distance between two vectors
|
squared distance between two vectors
|
||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **mat** vector1
|
| *[in]* **v1** vector1
|
||||||
| *[in]* **row1** vector2
|
| *[in]* **v2** vector2
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
| squared distance (distance * distance)
|
| squared distance (distance * distance)
|
||||||
@@ -446,8 +446,8 @@ Functions documentation
|
|||||||
distance between two vectors
|
distance between two vectors
|
||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **mat** vector1
|
| *[in]* **v1** vector1
|
||||||
| *[in]* **row1** vector2
|
| *[in]* **v2** vector2
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
| distance
|
| distance
|
||||||
@@ -475,7 +475,7 @@ Functions documentation
|
|||||||
possible orthogonal/perpendicular vector
|
possible orthogonal/perpendicular vector
|
||||||
|
|
||||||
Parameters:
|
Parameters:
|
||||||
| *[in]* **mat** vector
|
| *[in]* **v** vector
|
||||||
| *[out]* **dest** orthogonal/perpendicular vector
|
| *[out]* **dest** orthogonal/perpendicular vector
|
||||||
|
|
||||||
.. c:function:: void glm_vec3_clamp(vec3 v, float minVal, float maxVal)
|
.. c:function:: void glm_vec3_clamp(vec3 v, float minVal, float maxVal)
|
||||||
|
|||||||
15
docs/source/version.rst
Normal file
15
docs/source/version.rst
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
.. default-domain:: C
|
||||||
|
|
||||||
|
version
|
||||||
|
================================================================================
|
||||||
|
|
||||||
|
Header: cglm/version.h
|
||||||
|
|
||||||
|
**cglm** uses semantic versioning (http://semver.org) which is MAJOR.MINOR.PATCH
|
||||||
|
|
||||||
|
| **CGLM_VERSION_MAJOR** is major number of the version.
|
||||||
|
| **CGLM_VERSION_MINOR** is minor number of the version.
|
||||||
|
| **CGLM_VERSION_PATCH** is patch number of the version.
|
||||||
|
|
||||||
|
every release increases these numbers. You can check existing version by
|
||||||
|
including `cglm/version.h`
|
||||||
@@ -40,10 +40,6 @@
|
|||||||
#include "mat4.h"
|
#include "mat4.h"
|
||||||
#include "affine-mat.h"
|
#include "affine-mat.h"
|
||||||
|
|
||||||
CGLM_INLINE
|
|
||||||
void
|
|
||||||
glm_mat4_mul(mat4 m1, mat4 m2, mat4 dest);
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief translate existing transform matrix by v vector
|
* @brief translate existing transform matrix by v vector
|
||||||
* and stores result in same matrix
|
* and stores result in same matrix
|
||||||
|
|||||||
268
include/cglm/affine2d.h
Normal file
268
include/cglm/affine2d.h
Normal file
@@ -0,0 +1,268 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Functions:
|
||||||
|
CGLM_INLINE void glm_translate2d(mat3 m, vec2 v)
|
||||||
|
CGLM_INLINE void glm_translate2d_to(mat3 m, vec2 v, mat3 dest)
|
||||||
|
CGLM_INLINE void glm_translate2d_x(mat3 m, float x)
|
||||||
|
CGLM_INLINE void glm_translate2d_y(mat3 m, float y)
|
||||||
|
CGLM_INLINE void glm_translate2d_make(mat3 m, vec2 v)
|
||||||
|
CGLM_INLINE void glm_scale2d_to(mat3 m, vec2 v, mat3 dest)
|
||||||
|
CGLM_INLINE void glm_scale2d_make(mat3 m, vec2 v)
|
||||||
|
CGLM_INLINE void glm_scale2d(mat3 m, vec2 v)
|
||||||
|
CGLM_INLINE void glm_scale2d_uni(mat3 m, float s)
|
||||||
|
CGLM_INLINE void glm_rotate2d_make(mat3 m, float angle)
|
||||||
|
CGLM_INLINE void glm_rotate2d(mat3 m, float angle)
|
||||||
|
CGLM_INLINE void glm_rotate2d_to(mat3 m, float angle, mat3 dest)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cglm_affine2d_h
|
||||||
|
#define cglm_affine2d_h
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
#include "util.h"
|
||||||
|
#include "vec2.h"
|
||||||
|
#include "mat3.h"
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by v vector
|
||||||
|
* and stores result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in, out] m affine transfrom
|
||||||
|
* @param[in] v translate vector [x, y]
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_translate2d(mat3 m, vec2 v) {
|
||||||
|
m[2][0] = m[0][0] * v[0] + m[1][0] * v[1] + m[2][0];
|
||||||
|
m[2][1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1];
|
||||||
|
m[2][2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by v vector
|
||||||
|
* and store result in dest
|
||||||
|
*
|
||||||
|
* source matrix will remain same
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] v translate vector [x, y]
|
||||||
|
* @param[out] dest translated matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_translate2d_to(mat3 m, vec2 v, mat3 dest) {
|
||||||
|
glm_mat3_copy(m, dest);
|
||||||
|
glm_translate2d(dest, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by x factor
|
||||||
|
*
|
||||||
|
* @param[in, out] m affine transfrom
|
||||||
|
* @param[in] x x factor
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_translate2d_x(mat3 m, float x) {
|
||||||
|
m[2][0] = m[0][0] * x + m[2][0];
|
||||||
|
m[2][1] = m[0][1] * x + m[2][1];
|
||||||
|
m[2][2] = m[0][2] * x + m[2][2];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by y factor
|
||||||
|
*
|
||||||
|
* @param[in, out] m affine transfrom
|
||||||
|
* @param[in] y y factor
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_translate2d_y(mat3 m, float y) {
|
||||||
|
m[2][0] = m[1][0] * y + m[2][0];
|
||||||
|
m[2][1] = m[1][1] * y + m[2][1];
|
||||||
|
m[2][2] = m[1][2] * y + m[2][2];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief creates NEW translate 2d transform matrix by v vector
|
||||||
|
*
|
||||||
|
* @param[out] m affine transfrom
|
||||||
|
* @param[in] v translate vector [x, y]
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_translate2d_make(mat3 m, vec2 v) {
|
||||||
|
glm_mat3_identity(m);
|
||||||
|
m[2][0] = v[0];
|
||||||
|
m[2][1] = v[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief scale existing 2d transform matrix by v vector
|
||||||
|
* and store result in dest
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] v scale vector [x, y]
|
||||||
|
* @param[out] dest scaled matrix
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_scale2d_to(mat3 m, vec2 v, mat3 dest) {
|
||||||
|
dest[0][0] = m[0][0] * v[0];
|
||||||
|
dest[0][1] = m[0][1] * v[0];
|
||||||
|
dest[0][2] = m[0][2] * v[0];
|
||||||
|
|
||||||
|
dest[1][0] = m[1][0] * v[1];
|
||||||
|
dest[1][1] = m[1][1] * v[1];
|
||||||
|
dest[1][2] = m[1][2] * v[1];
|
||||||
|
|
||||||
|
dest[2][0] = m[2][0];
|
||||||
|
dest[2][1] = m[2][1];
|
||||||
|
dest[2][2] = m[2][2];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief creates NEW 2d scale matrix by v vector
|
||||||
|
*
|
||||||
|
* @param[out] m affine transfrom
|
||||||
|
* @param[in] v scale vector [x, y]
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_scale2d_make(mat3 m, vec2 v) {
|
||||||
|
glm_mat3_identity(m);
|
||||||
|
m[0][0] = v[0];
|
||||||
|
m[1][1] = v[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief scales existing 2d transform matrix by v vector
|
||||||
|
* and stores result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in, out] m affine transfrom
|
||||||
|
* @param[in] v scale vector [x, y]
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_scale2d(mat3 m, vec2 v) {
|
||||||
|
m[0][0] = m[0][0] * v[0];
|
||||||
|
m[0][1] = m[0][1] * v[0];
|
||||||
|
m[0][2] = m[0][2] * v[0];
|
||||||
|
|
||||||
|
m[1][0] = m[1][0] * v[1];
|
||||||
|
m[1][1] = m[1][1] * v[1];
|
||||||
|
m[1][2] = m[1][2] * v[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief applies uniform scale to existing 2d transform matrix v = [s, s]
|
||||||
|
* and stores result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in, out] m affine transfrom
|
||||||
|
* @param[in] s scale factor
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_scale2d_uni(mat3 m, float s) {
|
||||||
|
m[0][0] = m[0][0] * s;
|
||||||
|
m[0][1] = m[0][1] * s;
|
||||||
|
m[0][2] = m[0][2] * s;
|
||||||
|
|
||||||
|
m[1][0] = m[1][0] * s;
|
||||||
|
m[1][1] = m[1][1] * s;
|
||||||
|
m[1][2] = m[1][2] * s;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief creates NEW rotation matrix by angle around Z axis
|
||||||
|
*
|
||||||
|
* @param[out] m affine transfrom
|
||||||
|
* @param[in] angle angle (radians)
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_rotate2d_make(mat3 m, float angle) {
|
||||||
|
float c, s;
|
||||||
|
|
||||||
|
s = sinf(angle);
|
||||||
|
c = cosf(angle);
|
||||||
|
|
||||||
|
m[0][0] = c;
|
||||||
|
m[0][1] = s;
|
||||||
|
m[0][2] = 0;
|
||||||
|
|
||||||
|
m[1][0] = -s;
|
||||||
|
m[1][1] = c;
|
||||||
|
m[1][2] = 0;
|
||||||
|
|
||||||
|
m[2][0] = 0.0f;
|
||||||
|
m[2][1] = 0.0f;
|
||||||
|
m[2][2] = 1.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief rotate existing 2d transform matrix around Z axis by angle
|
||||||
|
* and store result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in, out] m affine transfrom
|
||||||
|
* @param[in] angle angle (radians)
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_rotate2d(mat3 m, float angle) {
|
||||||
|
float m00 = m[0][0], m10 = m[1][0],
|
||||||
|
m01 = m[0][1], m11 = m[1][1],
|
||||||
|
m02 = m[0][2], m12 = m[1][2];
|
||||||
|
float c, s;
|
||||||
|
|
||||||
|
s = sinf(angle);
|
||||||
|
c = cosf(angle);
|
||||||
|
|
||||||
|
m[0][0] = m00 * c + m10 * s;
|
||||||
|
m[0][1] = m01 * c + m11 * s;
|
||||||
|
m[0][2] = m02 * c + m12 * s;
|
||||||
|
|
||||||
|
m[1][0] = m00 * -s + m10 * c;
|
||||||
|
m[1][1] = m01 * -s + m11 * c;
|
||||||
|
m[1][2] = m02 * -s + m12 * c;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief rotate existing 2d transform matrix around Z axis by angle
|
||||||
|
* and store result in dest
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] angle angle (radians)
|
||||||
|
* @param[out] dest destination
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
void
|
||||||
|
glm_rotate2d_to(mat3 m, float angle, mat3 dest) {
|
||||||
|
float m00 = m[0][0], m10 = m[1][0],
|
||||||
|
m01 = m[0][1], m11 = m[1][1],
|
||||||
|
m02 = m[0][2], m12 = m[1][2];
|
||||||
|
float c, s;
|
||||||
|
|
||||||
|
s = sinf(angle);
|
||||||
|
c = cosf(angle);
|
||||||
|
|
||||||
|
dest[0][0] = m00 * c + m10 * s;
|
||||||
|
dest[0][1] = m01 * c + m11 * s;
|
||||||
|
dest[0][2] = m02 * c + m12 * s;
|
||||||
|
|
||||||
|
dest[1][0] = m00 * -s + m10 * c;
|
||||||
|
dest[1][1] = m01 * -s + m11 * c;
|
||||||
|
dest[1][2] = m02 * -s + m12 * c;
|
||||||
|
|
||||||
|
dest[2][0] = m[2][0];
|
||||||
|
dest[2][1] = m[2][1];
|
||||||
|
dest[2][2] = m[2][2];
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* cglm_affine2d_h */
|
||||||
@@ -31,6 +31,8 @@ extern "C" {
|
|||||||
#include "call/ease.h"
|
#include "call/ease.h"
|
||||||
#include "call/curve.h"
|
#include "call/curve.h"
|
||||||
#include "call/bezier.h"
|
#include "call/bezier.h"
|
||||||
|
#include "call/ray.h"
|
||||||
|
#include "call/affine2d.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
67
include/cglm/call/affine2d.h
Normal file
67
include/cglm/call/affine2d.h
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cglmc_affine2d_h
|
||||||
|
#define cglmc_affine2d_h
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "../cglm.h"
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_make(mat3 m, vec2 v);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_to(mat3 m, vec2 v, mat3 dest);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d(mat3 m, vec2 v);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_x(mat3 m, float to);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_y(mat3 m, float to);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d_to(mat3 m, vec2 v, mat3 dest);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d_make(mat3 m, vec2 v);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d(mat3 m, vec2 v);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d_uni(mat3 m, float s);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_rotate2d_make(mat3 m, float angle);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_rotate2d(mat3 m, float angle);
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_rotate2d_to(mat3 m, float angle, mat3 dest);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* cglmc_affine2d_h */
|
||||||
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
#ifndef cglmc_io_h
|
#ifndef cglmc_io_h
|
||||||
#define cglmc_io_h
|
#define cglmc_io_h
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
27
include/cglm/call/ray.h
Normal file
27
include/cglm/call/ray.h
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cglmc_ray_h
|
||||||
|
#define cglmc_ray_h
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
#include "../cglm.h"
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
bool
|
||||||
|
glmc_ray_triangle(vec3 origin,
|
||||||
|
vec3 direction,
|
||||||
|
vec3 v0,
|
||||||
|
vec3 v1,
|
||||||
|
vec3 v2,
|
||||||
|
float *d);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif /* cglmc_ray_h */
|
||||||
@@ -30,5 +30,7 @@
|
|||||||
#include "ease.h"
|
#include "ease.h"
|
||||||
#include "curve.h"
|
#include "curve.h"
|
||||||
#include "bezier.h"
|
#include "bezier.h"
|
||||||
|
#include "ray.h"
|
||||||
|
#include "affine2d.h"
|
||||||
|
|
||||||
#endif /* cglm_h */
|
#endif /* cglm_h */
|
||||||
|
|||||||
@@ -8,7 +8,13 @@
|
|||||||
#ifndef cglm_common_h
|
#ifndef cglm_common_h
|
||||||
#define cglm_common_h
|
#define cglm_common_h
|
||||||
|
|
||||||
|
#ifndef _USE_MATH_DEFINES
|
||||||
# define _USE_MATH_DEFINES /* for windows */
|
# define _USE_MATH_DEFINES /* for windows */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _CRT_SECURE_NO_WARNINGS
|
||||||
|
# define _CRT_SECURE_NO_WARNINGS /* for windows */
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
@@ -34,4 +40,12 @@
|
|||||||
#include "types.h"
|
#include "types.h"
|
||||||
#include "simd/intrin.h"
|
#include "simd/intrin.h"
|
||||||
|
|
||||||
|
#ifndef CGLM_USE_DEFAULT_EPSILON
|
||||||
|
# ifndef GLM_FLT_EPSILON
|
||||||
|
# define GLM_FLT_EPSILON 1e-6
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# define GLM_FLT_EPSILON FLT_EPSILON
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* cglm_common_h */
|
#endif /* cglm_common_h */
|
||||||
|
|||||||
@@ -18,160 +18,24 @@
|
|||||||
enum glm_euler_seq
|
enum glm_euler_seq
|
||||||
|
|
||||||
Functions:
|
Functions:
|
||||||
CGLM_INLINE glm_eul_mat4(vec3 ea, int order, mat4 dest)
|
CGLM_INLINE glm_euler_seq glm_euler_order(int newOrder[3]);
|
||||||
|
CGLM_INLINE void glm_euler_angles(mat4 m, vec3 dest);
|
||||||
|
CGLM_INLINE void glm_euler(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_xyz(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_zyx(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_zxy(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_xzy(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_yzx(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_yxz(vec3 angles, mat4 dest);
|
||||||
|
CGLM_INLINE void glm_euler_by_order(vec3 angles,
|
||||||
|
glm_euler_seq ord,
|
||||||
|
mat4 dest);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef cglm_euler_h
|
#ifndef cglm_euler_h
|
||||||
#define cglm_euler_h
|
#define cglm_euler_h
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "util.h"
|
|
||||||
|
|
||||||
/* ---------- Notice for Ken Shoemake's algorithm Implementation -------------*
|
|
||||||
| Ken Shoemake's algorithm impl. is taken from this repo by permission: |
|
|
||||||
| https://github.com/erich666/GraphicsGems/blob/master/gemsiv/euler_angle |
|
|
||||||
| |
|
|
||||||
| cglm doesn't claim the ownership of GraphicsGems source codes |
|
|
||||||
| and the algorithm itself. But cglm may change variable names or some piece |
|
|
||||||
| of codes in order to apply optimizations or to make it usable in cglm. |
|
|
||||||
| |
|
|
||||||
| Related issue: https://github.com/recp/cglm/issues/30 |
|
|
||||||
| |
|
|
||||||
* -------------------------- GraphicsGems EULA ----------------------------- *
|
|
||||||
| Related EULA for GraphicsGems can be found at below, plus in CREDITS: |
|
|
||||||
| http://www.realtimerendering.com/resources/GraphicsGems/ |
|
|
||||||
| |
|
|
||||||
| EULA: The Graphics Gems code is copyright-protected. In other words, you |
|
|
||||||
| cannot claim the text of the code as your own and resell it. Using the |
|
|
||||||
| code is permitted in any program, product, or library, non-commercial or |
|
|
||||||
| commercial. Giving credit is not required, though is a nice gesture. |
|
|
||||||
| The code comes as-is, and if there are any flaws or problems with any Gems |
|
|
||||||
| code, nobody involved with Gems - authors, editors, publishers, or |
|
|
||||||
| webmasters - are to be held responsible. Basically, don't be a jerk, and |
|
|
||||||
| remember that anything free comes with no guarantee. |
|
|
||||||
* -------------------------------- END --------------------------------------*/
|
|
||||||
|
|
||||||
/* Order type constants, constructors, extractors
|
|
||||||
* There are 24 possible conventions, designated by:
|
|
||||||
* o EulAxI = axis used initially
|
|
||||||
* o EulPar = parity of axis permutation
|
|
||||||
* o EulRep = repetition of initial axis as last
|
|
||||||
* o EulFrm = frame from which axes are taken
|
|
||||||
* Axes I,J,K will be a permutation of X,Y,Z.
|
|
||||||
* Axis H will be either I or K, depending on EulRep.
|
|
||||||
* Frame S takes axes from initial static frame.
|
|
||||||
* If ord = (AxI=X, Par=Even, Rep=No, Frm=S), then
|
|
||||||
* {a,b,c,ord} means Rz(c)Ry(b)Rx(a), where Rz(c)v
|
|
||||||
* rotates v around Z by c radians.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define EulRep(ord) (((unsigned)(ord)>>1)&1)
|
|
||||||
#define EulFrm(ord) ((unsigned)(ord)&1)
|
|
||||||
#define EulPar(ord) (((unsigned)(ord)>>2)&1)
|
|
||||||
|
|
||||||
/*! this code is merely a quick (and legal!) way to set arrays,
|
|
||||||
EulSafe being 0,1,2,0 */
|
|
||||||
#define EulSafe "\000\001\002\000"
|
|
||||||
#define EulNext "\001\002\000\001"
|
|
||||||
#define EulAxI(ord) ((int)(EulSafe[(((unsigned)(ord)>>3)&3)]))
|
|
||||||
#define EulAxJ(ord) ((int)(EulNext[EulAxI(ord)+(EulPar(ord)==EulParOdd)]))
|
|
||||||
#define EulAxK(ord) ((int)(EulNext[EulAxI(ord)+(EulPar(ord)!=EulParOdd)]))
|
|
||||||
#define EulAxH(ord) ((EulRep(ord)==EulRepNo)?EulAxK(ord):EulAxI(ord))
|
|
||||||
|
|
||||||
/*! EulGetOrd unpacks all useful information about order simultaneously. */
|
|
||||||
#define EulGetOrd(ord,i,j,k,h,n,s,f) \
|
|
||||||
{unsigned o=(unsigned)ord;f=o&1;o>>=1;s=o&1;o>>=1;\
|
|
||||||
n=o&1;o>>=1;i=EulSafe[o&3];j=EulNext[i+n];k=EulNext[i+1-n];h=s?k:i;}
|
|
||||||
|
|
||||||
typedef enum glm_eul_order {
|
|
||||||
/*! Static axes */
|
|
||||||
GLM_EUL_XYZs = 0,
|
|
||||||
GLM_EUL_XYXs = 2,
|
|
||||||
GLM_EUL_XZYs = 4,
|
|
||||||
GLM_EUL_XZXs = 6,
|
|
||||||
GLM_EUL_YZXs = 8,
|
|
||||||
GLM_EUL_YZYs = 10,
|
|
||||||
GLM_EUL_YXZs = 12,
|
|
||||||
GLM_EUL_YXYs = 14,
|
|
||||||
GLM_EUL_ZXYs = 16,
|
|
||||||
GLM_EUL_ZXZs = 18,
|
|
||||||
GLM_EUL_ZYXs = 20,
|
|
||||||
GLM_EUL_ZYZs = 22,
|
|
||||||
|
|
||||||
/*! Rotating axes */
|
|
||||||
GLM_EUL_ZYXr = 1,
|
|
||||||
GLM_EUL_XYXr = 3,
|
|
||||||
GLM_EUL_YZXr = 5,
|
|
||||||
GLM_EUL_XZXr = 7,
|
|
||||||
GLM_EUL_XZYr = 9,
|
|
||||||
GLM_EUL_YZYr = 11,
|
|
||||||
GLM_EUL_ZXYr = 13,
|
|
||||||
GLM_EUL_YXYr = 15,
|
|
||||||
GLM_EUL_YXZr = 17,
|
|
||||||
GLM_EUL_ZXZr = 19,
|
|
||||||
GLM_EUL_XYZr = 21,
|
|
||||||
GLM_EUL_ZYZr = 23
|
|
||||||
} glm_eul_order;
|
|
||||||
|
|
||||||
/*!
|
|
||||||
* @brief build matrix from euler angles
|
|
||||||
*
|
|
||||||
* @param[in] ea [Xangle, Yangle, Zangle]
|
|
||||||
* @param[out] dest rotation matrix
|
|
||||||
*/
|
|
||||||
CGLM_INLINE
|
|
||||||
void
|
|
||||||
glm_eul_mat4(vec3 ea, glm_eul_order order, mat4 dest) {
|
|
||||||
float ti, tj, th, ci, cj, ch, si, sj, sh, cc, cs, sc, ss;
|
|
||||||
int i, j, k, h, parOdd, repYes, frmR;
|
|
||||||
|
|
||||||
EulGetOrd(order, i, j, k, h, parOdd, repYes, frmR);
|
|
||||||
|
|
||||||
if (frmR == 1)
|
|
||||||
glm_swapf(&ea[0], &ea[2]);
|
|
||||||
|
|
||||||
if (parOdd == 1)
|
|
||||||
glm_vec3_negate(ea);
|
|
||||||
|
|
||||||
ti = ea[0]; tj = ea[1]; th = ea[2];
|
|
||||||
|
|
||||||
ci = cosf(ti); cj = cosf(tj);
|
|
||||||
ch = cosf(th); si = sinf(ti);
|
|
||||||
sj = sinf(tj); sh = sinf(th);
|
|
||||||
|
|
||||||
cc = ci * ch; cs = ci * sh;
|
|
||||||
sc = si * ch; ss = si * sh;
|
|
||||||
|
|
||||||
if (repYes == 1) {
|
|
||||||
dest[i][i] = cj;
|
|
||||||
dest[i][j] = sj * si;
|
|
||||||
dest[i][k] = sj * ci;
|
|
||||||
dest[j][i] = sj * sh;
|
|
||||||
dest[j][j] = -cj * ss + cc;
|
|
||||||
dest[j][k] = -cj * cs - sc;
|
|
||||||
dest[k][i] = -sj * ch;
|
|
||||||
dest[k][j] = cj * sc + cs;
|
|
||||||
dest[k][k] = cj * cc - ss;
|
|
||||||
} else {
|
|
||||||
dest[i][i] = cj * ch;
|
|
||||||
dest[i][j] = sj * sc - cs;
|
|
||||||
dest[i][k] = sj * cc + ss;
|
|
||||||
dest[j][i] = cj * sh;
|
|
||||||
dest[j][j] = sj * ss + cc;
|
|
||||||
dest[j][k] = sj * cs - sc;
|
|
||||||
dest[k][i] = -sj;
|
|
||||||
dest[k][j] = cj * si;
|
|
||||||
dest[k][k] = cj * ci;
|
|
||||||
}
|
|
||||||
|
|
||||||
dest[3][0] = 0.f;
|
|
||||||
dest[3][1] = 0.f;
|
|
||||||
dest[3][2] = 0.f;
|
|
||||||
dest[0][3] = 0.f;
|
|
||||||
dest[1][3] = 0.f;
|
|
||||||
dest[2][3] = 0.f;
|
|
||||||
dest[3][3] = 1.f;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* if you have axis order like vec3 orderVec = [0, 1, 2] or [0, 2, 1]...
|
* if you have axis order like vec3 orderVec = [0, 1, 2] or [0, 2, 1]...
|
||||||
@@ -191,8 +55,6 @@ typedef enum glm_euler_seq {
|
|||||||
GLM_EULER_ZYX = 2 << 0 | 1 << 2 | 0 << 4
|
GLM_EULER_ZYX = 2 << 0 | 1 << 2 | 0 << 4
|
||||||
} glm_euler_seq;
|
} glm_euler_seq;
|
||||||
|
|
||||||
typedef glm_euler_seq glm_euler_sq;
|
|
||||||
|
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
glm_euler_seq
|
glm_euler_seq
|
||||||
glm_euler_order(int ord[3]) {
|
glm_euler_order(int ord[3]) {
|
||||||
|
|||||||
@@ -17,67 +17,99 @@
|
|||||||
|
|
||||||
#ifndef cglm_io_h
|
#ifndef cglm_io_h
|
||||||
#define cglm_io_h
|
#define cglm_io_h
|
||||||
|
#if defined(DEBUG) || defined(_DEBUG) \
|
||||||
|
|| defined(CGLM_DEFINE_PRINTS) || defined(CGLM_LIB_SRC)
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#define CGLM_PRINT_PRECISION 5
|
||||||
|
#define CGLM_PRINT_MAX_TO_SHORT 1e5
|
||||||
|
#define CGLM_PRINT_COLOR "\033[36m"
|
||||||
|
#define CGLM_PRINT_COLOR_RESET "\033[0m"
|
||||||
|
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_mat4_print(mat4 matrix,
|
glm_mat4_print(mat4 matrix,
|
||||||
FILE * __restrict ostream) {
|
FILE * __restrict ostream) {
|
||||||
int i;
|
char buff[16];
|
||||||
int j;
|
int i, j, cw[4], cwi;
|
||||||
|
|
||||||
#define m 4
|
#define m 4
|
||||||
#define n 4
|
#define n 4
|
||||||
|
|
||||||
fprintf(ostream, "Matrix (float%dx%d):\n", m, n);
|
fprintf(ostream, "Matrix (float%dx%d): " CGLM_PRINT_COLOR "\n" , m, n);
|
||||||
|
|
||||||
|
cw[0] = cw[1] = cw[2] = cw[3] = 0;
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "\t|");
|
|
||||||
for (j = 0; j < n; j++) {
|
for (j = 0; j < n; j++) {
|
||||||
fprintf(ostream, "%0.4f", matrix[j][i]);;
|
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
|
||||||
if (j != n - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
cwi = sprintf(buff, "% g", matrix[i][j]);
|
||||||
|
cw[i] = GLM_MAX(cw[i], cwi);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < m; i++) {
|
||||||
|
fprintf(ostream, " |");
|
||||||
|
|
||||||
|
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]);
|
||||||
|
else
|
||||||
|
fprintf(ostream, " % *g", cw[j], matrix[j][i]);
|
||||||
|
|
||||||
fprintf(ostream, " |\n");
|
fprintf(ostream, " |\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "\n");
|
fprintf(ostream, CGLM_PRINT_COLOR_RESET "\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
#undef n
|
#undef n
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_mat3_print(mat3 matrix,
|
glm_mat3_print(mat3 matrix,
|
||||||
FILE * __restrict ostream) {
|
FILE * __restrict ostream) {
|
||||||
int i;
|
char buff[16];
|
||||||
int j;
|
int i, j, cw[4], cwi;
|
||||||
|
|
||||||
#define m 3
|
#define m 3
|
||||||
#define n 3
|
#define n 3
|
||||||
|
|
||||||
fprintf(ostream, "Matrix (float%dx%d):\n", m, n);
|
fprintf(ostream, "Matrix (float%dx%d): " CGLM_PRINT_COLOR "\n", m, n);
|
||||||
|
|
||||||
|
cw[0] = cw[1] = cw[2] = 0;
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "\t|");
|
|
||||||
for (j = 0; j < n; j++) {
|
for (j = 0; j < n; j++) {
|
||||||
fprintf(ostream, "%0.4f", matrix[j][i]);;
|
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
|
||||||
if (j != n - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
cwi = sprintf(buff, "% g", matrix[i][j]);
|
||||||
|
cw[i] = GLM_MAX(cw[i], cwi);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < m; i++) {
|
||||||
|
fprintf(ostream, " |");
|
||||||
|
|
||||||
|
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]);
|
||||||
|
else
|
||||||
|
fprintf(ostream, " % *g", cw[j], matrix[j][i]);
|
||||||
|
|
||||||
fprintf(ostream, " |\n");
|
fprintf(ostream, " |\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "\n");
|
fprintf(ostream, CGLM_PRINT_COLOR_RESET "\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
#undef n
|
#undef n
|
||||||
@@ -87,27 +119,39 @@ CGLM_INLINE
|
|||||||
void
|
void
|
||||||
glm_mat2_print(mat2 matrix,
|
glm_mat2_print(mat2 matrix,
|
||||||
FILE * __restrict ostream) {
|
FILE * __restrict ostream) {
|
||||||
int i;
|
char buff[16];
|
||||||
int j;
|
int i, j, cw[4], cwi;
|
||||||
|
|
||||||
#define m 2
|
#define m 2
|
||||||
#define n 2
|
#define n 2
|
||||||
|
|
||||||
fprintf(ostream, "Matrix (float%dx%d):\n", m, n);
|
fprintf(ostream, "Matrix (float%dx%d): " CGLM_PRINT_COLOR "\n", m, n);
|
||||||
|
|
||||||
|
cw[0] = cw[1] = 0;
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "\t|");
|
|
||||||
for (j = 0; j < n; j++) {
|
for (j = 0; j < n; j++) {
|
||||||
fprintf(ostream, "%0.4f", matrix[j][i]);;
|
if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
|
||||||
if (j != n - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
cwi = sprintf(buff, "% g", matrix[i][j]);
|
||||||
|
cw[i] = GLM_MAX(cw[i], cwi);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < m; i++) {
|
||||||
|
fprintf(ostream, " |");
|
||||||
|
|
||||||
|
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]);
|
||||||
|
else
|
||||||
|
fprintf(ostream, " % *g", cw[j], matrix[j][i]);
|
||||||
|
|
||||||
fprintf(ostream, " |\n");
|
fprintf(ostream, " |\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "\n");
|
fprintf(ostream, CGLM_PRINT_COLOR_RESET "\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
#undef n
|
#undef n
|
||||||
@@ -121,16 +165,16 @@ glm_vec4_print(vec4 vec,
|
|||||||
|
|
||||||
#define m 4
|
#define m 4
|
||||||
|
|
||||||
fprintf(ostream, "Vector (float%d):\n\t|", m);
|
fprintf(ostream, "Vector (float%d): " CGLM_PRINT_COLOR "\n (", m);
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "%0.4f", vec[i]);
|
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
|
||||||
if (i != m - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
fprintf(ostream, " % g", vec[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "|\n\n");
|
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
}
|
}
|
||||||
@@ -143,16 +187,16 @@ glm_vec3_print(vec3 vec,
|
|||||||
|
|
||||||
#define m 3
|
#define m 3
|
||||||
|
|
||||||
fprintf(ostream, "Vector (float%d):\n\t|", m);
|
fprintf(ostream, "Vector (float%d): " CGLM_PRINT_COLOR "\n (", m);
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "%0.4f", vec[i]);
|
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
|
||||||
if (i != m - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
fprintf(ostream, " % g", vec[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "|\n\n");
|
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
}
|
}
|
||||||
@@ -165,16 +209,12 @@ glm_ivec3_print(ivec3 vec,
|
|||||||
|
|
||||||
#define m 3
|
#define m 3
|
||||||
|
|
||||||
fprintf(ostream, "Vector (int%d):\n\t|", m);
|
fprintf(ostream, "Vector (int%d): " CGLM_PRINT_COLOR "\n (", m);
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++)
|
||||||
fprintf(ostream, " % d", vec[i]);
|
fprintf(ostream, " % d", vec[i]);
|
||||||
|
|
||||||
if (i != m - 1)
|
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
|
||||||
fprintf(ostream, "\t");
|
|
||||||
}
|
|
||||||
|
|
||||||
fprintf(ostream, "|\n\n");
|
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
}
|
}
|
||||||
@@ -187,16 +227,16 @@ glm_vec2_print(vec2 vec,
|
|||||||
|
|
||||||
#define m 2
|
#define m 2
|
||||||
|
|
||||||
fprintf(ostream, "Vector (float%d):\n\t|", m);
|
fprintf(ostream, "Vector (float%d): " CGLM_PRINT_COLOR "\n (", m);
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "%0.4f", vec[i]);
|
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
|
||||||
if (i != m - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
fprintf(ostream, " % g", vec[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "|\n\n");
|
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
}
|
}
|
||||||
@@ -209,16 +249,17 @@ glm_versor_print(versor vec,
|
|||||||
|
|
||||||
#define m 4
|
#define m 4
|
||||||
|
|
||||||
fprintf(ostream, "Versor (float%d):\n\t|", m);
|
fprintf(ostream, "Quaternion (float%d): " CGLM_PRINT_COLOR "\n (", m);
|
||||||
|
|
||||||
for (i = 0; i < m; i++) {
|
for (i = 0; i < m; i++) {
|
||||||
fprintf(ostream, "%0.4f", vec[i]);
|
if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
|
||||||
if (i != m - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
fprintf(ostream, " % g", vec[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "|\n\n");
|
|
||||||
|
fprintf(ostream, " )" CGLM_PRINT_COLOR_RESET "\n\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
}
|
}
|
||||||
@@ -232,24 +273,43 @@ glm_aabb_print(vec3 bbox[2],
|
|||||||
|
|
||||||
#define m 3
|
#define m 3
|
||||||
|
|
||||||
fprintf(ostream, "AABB (%s):\n", tag ? tag: "float");
|
fprintf(ostream, "AABB (%s): " CGLM_PRINT_COLOR "\n", tag ? tag: "float");
|
||||||
|
|
||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
fprintf(ostream, "\t|");
|
fprintf(ostream, " (");
|
||||||
|
|
||||||
for (j = 0; j < m; j++) {
|
for (j = 0; j < m; j++) {
|
||||||
fprintf(ostream, "%0.4f", bbox[i][j]);
|
if (bbox[i][j] < CGLM_PRINT_MAX_TO_SHORT)
|
||||||
|
fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, bbox[i][j]);
|
||||||
if (j != m - 1)
|
else
|
||||||
fprintf(ostream, "\t");
|
fprintf(ostream, " % g", bbox[i][j]);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "|\n");
|
fprintf(ostream, " )\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(ostream, "\n");
|
fprintf(ostream, CGLM_PRINT_COLOR_RESET "\n");
|
||||||
|
|
||||||
#undef m
|
#undef m
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#elif !defined(CGLM_NO_PRINTS_NOOP)
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
/* NOOP: Remove print from DEBUG */
|
||||||
|
#define glm_mat4_print(...)
|
||||||
|
#define glm_mat3_print(...)
|
||||||
|
#define glm_mat2_print(...)
|
||||||
|
#define glm_vec4_print(...)
|
||||||
|
#define glm_vec3_print(...)
|
||||||
|
#define glm_ivec3_print(...)
|
||||||
|
#define glm_vec2_print(...)
|
||||||
|
#define glm_versor_print(...)
|
||||||
|
#define glm_aabb_print(...)
|
||||||
|
|
||||||
|
#endif
|
||||||
#endif /* cglm_io_h */
|
#endif /* cglm_io_h */
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_mat2_copy(mat2 mat, mat2 dest) {
|
glm_mat2_copy(mat2 mat, mat2 dest) {
|
||||||
glm_vec4_copy(mat[0], dest[0]);
|
glm_vec4_ucopy(mat[0], dest[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -216,7 +216,16 @@ glm_mat2_trace(mat2 m) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_mat2_scale(mat2 m, float s) {
|
glm_mat2_scale(mat2 m, float s) {
|
||||||
glm_vec4_scale(m[0], s, m[0]);
|
#if defined( __SSE__ ) || defined( __SSE2__ )
|
||||||
|
glmm_store(m[0], _mm_mul_ps(_mm_loadu_ps(m[0]), _mm_set1_ps(s)));
|
||||||
|
#elif defined(CGLM_NEON_FP)
|
||||||
|
vst1q_f32(m[0], vmulq_f32(vld1q_f32(m[0]), vdupq_n_f32(s)));
|
||||||
|
#else
|
||||||
|
m[0][0] = m[0][0] * s;
|
||||||
|
m[0][1] = m[0][1] * s;
|
||||||
|
m[1][0] = m[1][0] * s;
|
||||||
|
m[1][1] = m[1][1] * s;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -228,9 +228,11 @@ glm_mat3_transpose(mat3 m) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_mat3_mulv(mat3 m, vec3 v, vec3 dest) {
|
glm_mat3_mulv(mat3 m, vec3 v, vec3 dest) {
|
||||||
dest[0] = m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2];
|
vec3 res;
|
||||||
dest[1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2];
|
res[0] = m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2];
|
||||||
dest[2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2];
|
res[1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2];
|
||||||
|
res[2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2];
|
||||||
|
glm_vec3_copy(res, dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -63,10 +63,6 @@
|
|||||||
# include "simd/sse2/quat.h"
|
# include "simd/sse2/quat.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CGLM_INLINE
|
|
||||||
void
|
|
||||||
glm_mat4_identity(mat4 mat);
|
|
||||||
|
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
void
|
void
|
||||||
glm_mat4_mulv(mat4 m, vec4 v, vec4 dest);
|
glm_mat4_mulv(mat4 m, vec4 v, vec4 dest);
|
||||||
|
|||||||
77
include/cglm/ray.h
Normal file
77
include/cglm/ray.h
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Functions:
|
||||||
|
CGLM_INLINE bool glm_line_triangle_intersect(vec3 origin,
|
||||||
|
vec3 direction,
|
||||||
|
vec3 v0,
|
||||||
|
vec3 v1,
|
||||||
|
vec3 v2,
|
||||||
|
float *d);
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cglm_ray_h
|
||||||
|
#define cglm_ray_h
|
||||||
|
|
||||||
|
#include "vec3.h"
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief Möller–Trumbore ray-triangle intersection algorithm
|
||||||
|
*
|
||||||
|
* @param[in] origin origin of ray
|
||||||
|
* @param[in] direction direction of ray
|
||||||
|
* @param[in] v0 first vertex of triangle
|
||||||
|
* @param[in] v1 second vertex of triangle
|
||||||
|
* @param[in] v2 third vertex of triangle
|
||||||
|
* @param[in, out] d distance to intersection
|
||||||
|
* @return whether there is intersection
|
||||||
|
*/
|
||||||
|
|
||||||
|
CGLM_INLINE
|
||||||
|
bool
|
||||||
|
glm_ray_triangle(vec3 origin,
|
||||||
|
vec3 direction,
|
||||||
|
vec3 v0,
|
||||||
|
vec3 v1,
|
||||||
|
vec3 v2,
|
||||||
|
float *d) {
|
||||||
|
vec3 edge1, edge2, p, t, q;
|
||||||
|
float det, inv_det, u, v, dist;
|
||||||
|
const float epsilon = 0.000001f;
|
||||||
|
|
||||||
|
glm_vec3_sub(v1, v0, edge1);
|
||||||
|
glm_vec3_sub(v2, v0, edge2);
|
||||||
|
glm_vec3_cross(direction, edge2, p);
|
||||||
|
|
||||||
|
det = glm_vec3_dot(edge1, p);
|
||||||
|
if (det > -epsilon && det < epsilon)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
inv_det = 1.0f / det;
|
||||||
|
|
||||||
|
glm_vec3_sub(origin, v0, t);
|
||||||
|
|
||||||
|
u = inv_det * glm_vec3_dot(t, p);
|
||||||
|
if (u < 0.0f || u > 1.0f)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
glm_vec3_cross(t, edge1, q);
|
||||||
|
|
||||||
|
v = inv_det * glm_vec3_dot(direction, q);
|
||||||
|
if (v < 0.0f || u + v > 1.0f)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
dist = inv_det * glm_vec3_dot(edge2, q);
|
||||||
|
|
||||||
|
if (d)
|
||||||
|
*d = dist;
|
||||||
|
|
||||||
|
return dist > epsilon;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -31,6 +31,7 @@ extern "C" {
|
|||||||
#include "struct/project.h"
|
#include "struct/project.h"
|
||||||
#include "struct/sphere.h"
|
#include "struct/sphere.h"
|
||||||
#include "struct/curve.h"
|
#include "struct/curve.h"
|
||||||
|
#include "struct/affine2d.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,10 +39,6 @@
|
|||||||
#include "vec4.h"
|
#include "vec4.h"
|
||||||
#include "mat4.h"
|
#include "mat4.h"
|
||||||
|
|
||||||
CGLM_INLINE
|
|
||||||
mat4s
|
|
||||||
glms_mat4_mul(mat4s m1, mat4s m2);
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief translate existing transform matrix by v vector
|
* @brief translate existing transform matrix by v vector
|
||||||
* and stores result in same matrix
|
* and stores result in same matrix
|
||||||
|
|||||||
177
include/cglm/struct/affine2d.h
Normal file
177
include/cglm/struct/affine2d.h
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Functions:
|
||||||
|
CGLM_INLINE mat3s glms_translate2d(mat3 m, vec2 v)
|
||||||
|
CGLM_INLINE mat3s glms_translate2d_x(mat3s m, float x)
|
||||||
|
CGLM_INLINE mat3s glms_translate2d_y(mat3s m, float y)
|
||||||
|
CGLM_INLINE mat3s glms_translate2d_make(vec2s v)
|
||||||
|
CGLM_INLINE mat3s glms_scale2d_make(vec2s v)
|
||||||
|
CGLM_INLINE mat3s glms_scale2d(mat3s m, vec2s v)
|
||||||
|
CGLM_INLINE mat3s glms_scale2d_uni(mat3s m, float s)
|
||||||
|
CGLM_INLINE mat3s glms_rotate2d_make(float angle)
|
||||||
|
CGLM_INLINE mat3s glms_rotate2d(mat3s m, float angle)
|
||||||
|
CGLM_INLINE mat3s glms_rotate2d_to(mat3s m, float angle)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cglms_affine2ds_h
|
||||||
|
#define cglms_affine2ds_h
|
||||||
|
|
||||||
|
#include "../common.h"
|
||||||
|
#include "../types-struct.h"
|
||||||
|
#include "../affine2d.h"
|
||||||
|
#include "vec3.h"
|
||||||
|
#include "mat3.h"
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by v vector
|
||||||
|
* and stores result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] v translate vector [x, y]
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_translate2d(mat3s m, vec2s v) {
|
||||||
|
glm_translate2d(m.raw, v.raw);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by x factor
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] x x factor
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_translate2d_x(mat3s m, float x) {
|
||||||
|
glm_translate2d_x(m.raw, x);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief translate existing 2d transform matrix by y factor
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] y y factor
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_translate2d_y(mat3s m, float y) {
|
||||||
|
glm_translate2d_y(m.raw, y);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief creates NEW translate 2d transform matrix by v vector
|
||||||
|
*
|
||||||
|
* @param[in] v translate vector [x, y]
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_translate2d_make(vec2s v) {
|
||||||
|
mat3s m;
|
||||||
|
glm_translate2d_make(m.raw, v.raw);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief creates NEW 2d scale matrix by v vector
|
||||||
|
*
|
||||||
|
* @param[in] v scale vector [x, y]
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_scale2d_make(vec2s v) {
|
||||||
|
mat3s m;
|
||||||
|
glm_scale2d_make(m.raw, v.raw);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief scales existing 2d transform matrix by v vector
|
||||||
|
* and stores result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] v scale vector [x, y, z]
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_scale2d(mat3s m, vec2s v) {
|
||||||
|
mat3s r;
|
||||||
|
glm_scale2d_to(m.raw, v.raw, r.raw);
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief applies uniform scale to existing 2d transform matrix v = [s, s, s]
|
||||||
|
* and stores result in same matrix
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] s scale factor
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_scale2d_uni(mat3s m, float s) {
|
||||||
|
glm_scale2d_uni(m.raw, s);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief creates NEW 2d rotation matrix by angle and axis
|
||||||
|
*
|
||||||
|
* axis will be normalized so you don't need to normalize it
|
||||||
|
*
|
||||||
|
* @param[in] angle angle (radians)
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_rotate2d_make(float angle) {
|
||||||
|
mat3s m;
|
||||||
|
glm_rotate2d_make(m.raw, angle);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief rotate existing 2d transform matrix around given axis by angle
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] angle angle (radians)
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_rotate2d(mat3s m, float angle) {
|
||||||
|
glm_rotate2d(m.raw, angle);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* @brief rotate existing 2d transform matrix around given axis by angle
|
||||||
|
*
|
||||||
|
* @param[in] m affine transfrom
|
||||||
|
* @param[in] angle angle (radians)
|
||||||
|
* @returns affine transfrom
|
||||||
|
*/
|
||||||
|
CGLM_INLINE
|
||||||
|
mat3s
|
||||||
|
glms_rotate2d_to(mat3s m, float angle) {
|
||||||
|
glm_rotate2d(m.raw, angle);
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* cglms_affine2ds_h */
|
||||||
@@ -36,8 +36,8 @@
|
|||||||
#include "../types-struct.h"
|
#include "../types-struct.h"
|
||||||
#include "../mat2.h"
|
#include "../mat2.h"
|
||||||
|
|
||||||
#define GLMS_MAT2_IDENTITY_INIT {1.0f, 0.0f, 0.0f, 1.0f}
|
#define GLMS_MAT2_IDENTITY_INIT {GLM_MAT2_IDENTITY_INIT}
|
||||||
#define GLMS_MAT2_ZERO_INIT {0.0f, 0.0f, 0.0f, 0.0f}
|
#define GLMS_MAT2_ZERO_INIT {GLM_MAT2_ZERO_INIT}
|
||||||
|
|
||||||
/* for C only */
|
/* for C only */
|
||||||
#define GLMS_MAT2_IDENTITY ((mat3s)GLMS_MAT2_IDENTITY_INIT)
|
#define GLMS_MAT2_IDENTITY ((mat3s)GLMS_MAT2_IDENTITY_INIT)
|
||||||
|
|||||||
@@ -42,9 +42,9 @@ glms_sphere_radii(vec4s s) {
|
|||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
vec4s
|
vec4s
|
||||||
glms_sphere_transform(vec4s s, mat4 m) {
|
glms_sphere_transform(vec4s s, mat4s m) {
|
||||||
vec4s r;
|
vec4s r;
|
||||||
glm_sphere_transform(s.raw, m, r.raw);
|
glm_sphere_transform(s.raw, m.raw, r.raw);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
/*!
|
/*!
|
||||||
* @brief init vec2 using vec2
|
* @brief init vec2 using vec2
|
||||||
*
|
*
|
||||||
* @param[in] v4 vector3
|
* @param[in] v3 vector3
|
||||||
* @returns destination
|
* @returns destination
|
||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
@@ -455,18 +455,18 @@ glms_vec2_normalize(vec2s v) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* @brief rotate vec2 around axis by angle using Rodrigues' rotation formula
|
* @brief rotate vec2 by angle using Rodrigues' rotation formula
|
||||||
*
|
*
|
||||||
* @param[in] v vector
|
* @param[in] v vector
|
||||||
* @param[in] axis axis vector (must be unit vector)
|
|
||||||
* @param[in] angle angle by radians
|
* @param[in] angle angle by radians
|
||||||
* @returns rotated vector
|
* @returns rotated vector
|
||||||
*/
|
*/
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
vec2s
|
vec2s
|
||||||
glms_vec2_rotate(vec2s v, float angle, vec2s axis) {
|
glms_vec2_rotate(vec2s v, float angle) {
|
||||||
glm_vec2_rotate(v.raw, angle, axis.raw);
|
vec2s r;
|
||||||
return v;
|
glm_vec2_rotate(v.raw, angle, r.raw);
|
||||||
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -289,7 +289,7 @@ glm_smoothinterpc(float from, float to, float t) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_eq(float a, float b) {
|
glm_eq(float a, float b) {
|
||||||
return fabsf(a - b) <= FLT_EPSILON;
|
return fabsf(a - b) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -322,7 +322,7 @@ glm_percent(float from, float to, float current) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
float
|
float
|
||||||
glm_percentc(float from, float to, float current) {
|
glm_percentc(float from, float to, float current) {
|
||||||
return glm_clamp(glm_percent(from, to, current), 0.0f, 1.0f);
|
return glm_clamp_zo(glm_percent(from, to, current));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -61,8 +61,8 @@ glm_vec2_eq(vec2 v, float val) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec2_eq_eps(vec2 v, float val) {
|
glm_vec2_eq_eps(vec2 v, float val) {
|
||||||
return fabsf(v[0] - val) <= FLT_EPSILON
|
return fabsf(v[0] - val) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(v[1] - val) <= FLT_EPSILON;
|
&& fabsf(v[1] - val) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -73,7 +73,7 @@ glm_vec2_eq_eps(vec2 v, float val) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec2_eq_all(vec2 v) {
|
glm_vec2_eq_all(vec2 v) {
|
||||||
return v[0] == v[1];
|
return glm_vec2_eq_eps(v, v[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -97,8 +97,8 @@ glm_vec2_eqv(vec2 a, vec2 b) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec2_eqv_eps(vec2 a, vec2 b) {
|
glm_vec2_eqv_eps(vec2 a, vec2 b) {
|
||||||
return fabsf(a[0] - b[0]) <= FLT_EPSILON
|
return fabsf(a[0] - b[0]) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(a[1] - b[1]) <= FLT_EPSILON;
|
&& fabsf(a[1] - b[1]) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -81,9 +81,9 @@ glm_vec3_eq(vec3 v, float val) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec3_eq_eps(vec3 v, float val) {
|
glm_vec3_eq_eps(vec3 v, float val) {
|
||||||
return fabsf(v[0] - val) <= FLT_EPSILON
|
return fabsf(v[0] - val) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(v[1] - val) <= FLT_EPSILON
|
&& fabsf(v[1] - val) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(v[2] - val) <= FLT_EPSILON;
|
&& fabsf(v[2] - val) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -94,7 +94,7 @@ glm_vec3_eq_eps(vec3 v, float val) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec3_eq_all(vec3 v) {
|
glm_vec3_eq_all(vec3 v) {
|
||||||
return v[0] == v[1] && v[0] == v[2];
|
return glm_vec3_eq_eps(v, v[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -120,9 +120,9 @@ glm_vec3_eqv(vec3 a, vec3 b) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec3_eqv_eps(vec3 a, vec3 b) {
|
glm_vec3_eqv_eps(vec3 a, vec3 b) {
|
||||||
return fabsf(a[0] - b[0]) <= FLT_EPSILON
|
return fabsf(a[0] - b[0]) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(a[1] - b[1]) <= FLT_EPSILON
|
&& fabsf(a[1] - b[1]) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(a[2] - b[2]) <= FLT_EPSILON;
|
&& fabsf(a[2] - b[2]) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -92,10 +92,10 @@ glm_vec4_eq(vec4 v, float val) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec4_eq_eps(vec4 v, float val) {
|
glm_vec4_eq_eps(vec4 v, float val) {
|
||||||
return fabsf(v[0] - val) <= FLT_EPSILON
|
return fabsf(v[0] - val) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(v[1] - val) <= FLT_EPSILON
|
&& fabsf(v[1] - val) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(v[2] - val) <= FLT_EPSILON
|
&& fabsf(v[2] - val) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(v[3] - val) <= FLT_EPSILON;
|
&& fabsf(v[3] - val) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -106,9 +106,7 @@ glm_vec4_eq_eps(vec4 v, float val) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec4_eq_all(vec4 v) {
|
glm_vec4_eq_all(vec4 v) {
|
||||||
return v[0] == v[1]
|
return glm_vec4_eq_eps(v, v[0]);
|
||||||
&& v[0] == v[2]
|
|
||||||
&& v[0] == v[3];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@@ -135,10 +133,10 @@ glm_vec4_eqv(vec4 a, vec4 b) {
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
glm_vec4_eqv_eps(vec4 a, vec4 b) {
|
glm_vec4_eqv_eps(vec4 a, vec4 b) {
|
||||||
return fabsf(a[0] - b[0]) <= FLT_EPSILON
|
return fabsf(a[0] - b[0]) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(a[1] - b[1]) <= FLT_EPSILON
|
&& fabsf(a[1] - b[1]) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(a[2] - b[2]) <= FLT_EPSILON
|
&& fabsf(a[2] - b[2]) <= GLM_FLT_EPSILON
|
||||||
&& fabsf(a[3] - b[3]) <= FLT_EPSILON;
|
&& fabsf(a[3] - b[3]) <= GLM_FLT_EPSILON;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -602,7 +602,7 @@ glm_vec4_muladds(vec4 a, float s, vec4 dest) {
|
|||||||
_mm_set1_ps(s))));
|
_mm_set1_ps(s))));
|
||||||
#elif defined(CGLM_NEON_FP)
|
#elif defined(CGLM_NEON_FP)
|
||||||
vst1q_f32(dest, vaddq_f32(vld1q_f32(dest),
|
vst1q_f32(dest, vaddq_f32(vld1q_f32(dest),
|
||||||
vsubq_f32(vld1q_f32(a),
|
vmulq_f32(vld1q_f32(a),
|
||||||
vdupq_n_f32(s))));
|
vdupq_n_f32(s))));
|
||||||
#else
|
#else
|
||||||
dest[0] += a[0] * s;
|
dest[0] += a[0] * s;
|
||||||
@@ -680,7 +680,7 @@ glm_vec4_negate_to(vec4 v, vec4 dest) {
|
|||||||
#if defined( __SSE__ ) || defined( __SSE2__ )
|
#if defined( __SSE__ ) || defined( __SSE2__ )
|
||||||
glmm_store(dest, _mm_xor_ps(glmm_load(v), _mm_set1_ps(-0.0f)));
|
glmm_store(dest, _mm_xor_ps(glmm_load(v), _mm_set1_ps(-0.0f)));
|
||||||
#elif defined(CGLM_NEON_FP)
|
#elif defined(CGLM_NEON_FP)
|
||||||
vst1q_f32(dest, veorq_s32(vld1q_f32(v), vdupq_n_f32(-0.0f)));
|
vst1q_f32(dest, vnegq_f32(vld1q_f32(v)));
|
||||||
#else
|
#else
|
||||||
dest[0] = -v[0];
|
dest[0] = -v[0];
|
||||||
dest[1] = -v[1];
|
dest[1] = -v[1];
|
||||||
|
|||||||
@@ -10,6 +10,6 @@
|
|||||||
|
|
||||||
#define CGLM_VERSION_MAJOR 0
|
#define CGLM_VERSION_MAJOR 0
|
||||||
#define CGLM_VERSION_MINOR 7
|
#define CGLM_VERSION_MINOR 7
|
||||||
#define CGLM_VERSION_PATCH 1
|
#define CGLM_VERSION_PATCH 7
|
||||||
|
|
||||||
#endif /* cglm_version_h */
|
#endif /* cglm_version_h */
|
||||||
|
|||||||
81
src/affine2d.c
Normal file
81
src/affine2d.c
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../include/cglm/cglm.h"
|
||||||
|
#include "../include/cglm/call.h"
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_make(mat3 m, vec2 v) {
|
||||||
|
glm_translate2d_make(m, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_to(mat3 m, vec2 v, mat3 dest) {
|
||||||
|
glm_translate2d_to(m, v, dest);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d(mat3 m, vec2 v) {
|
||||||
|
glm_translate2d(m, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_x(mat3 m, float to) {
|
||||||
|
glm_translate2d_x(m, to);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_translate2d_y(mat3 m, float to) {
|
||||||
|
glm_translate2d_y(m, to);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d_to(mat3 m, vec2 v, mat3 dest) {
|
||||||
|
glm_scale2d_to(m, v, dest);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d_make(mat3 m, vec2 v) {
|
||||||
|
glm_scale2d_make(m, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d(mat3 m, vec2 v) {
|
||||||
|
glm_scale2d(m, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_scale2d_uni(mat3 m, float s) {
|
||||||
|
glm_scale2d_uni(m, s);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_rotate2d_make(mat3 m, float angle) {
|
||||||
|
glm_rotate2d_make(m, angle);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_rotate2d(mat3 m, float angle) {
|
||||||
|
glm_rotate2d(m, angle);
|
||||||
|
}
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
void
|
||||||
|
glmc_rotate2d_to(mat3 m, float angle, mat3 dest) {
|
||||||
|
glm_rotate2d_to(m, angle, dest);
|
||||||
|
}
|
||||||
2
src/io.c
2
src/io.c
@@ -5,6 +5,8 @@
|
|||||||
* Full license can be found in the LICENSE file
|
* Full license can be found in the LICENSE file
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define CGLM_LIB_SRC
|
||||||
|
|
||||||
#include "../include/cglm/cglm.h"
|
#include "../include/cglm/cglm.h"
|
||||||
#include "../include/cglm/call.h"
|
#include "../include/cglm/call.h"
|
||||||
|
|
||||||
|
|||||||
13
src/ray.c
Normal file
13
src/ray.c
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
#include "../include/cglm/cglm.h"
|
||||||
|
#include "../include/cglm/call.h"
|
||||||
|
|
||||||
|
CGLM_EXPORT
|
||||||
|
bool
|
||||||
|
glmc_ray_triangle(vec3 origin,
|
||||||
|
vec3 direction,
|
||||||
|
vec3 v0,
|
||||||
|
vec3 v1,
|
||||||
|
vec3 v2,
|
||||||
|
float *d) {
|
||||||
|
return glm_ray_triangle(origin, direction, v0, v1, v2, d);
|
||||||
|
}
|
||||||
40
test/CMakeLists.txt
Normal file
40
test/CMakeLists.txt
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.8.2)
|
||||||
|
|
||||||
|
# List all files containing tests. (Change as needed)
|
||||||
|
set(TESTFILES
|
||||||
|
runner.c
|
||||||
|
src/test_euler.c
|
||||||
|
src/test_bezier.c
|
||||||
|
src/test_cam.c
|
||||||
|
src/test_struct.c
|
||||||
|
src/test_clamp.c
|
||||||
|
src/test_common.c
|
||||||
|
src/tests.c
|
||||||
|
)
|
||||||
|
|
||||||
|
set(TEST_MAIN tests)
|
||||||
|
set(TEST_RUNNER_PARAMS "")
|
||||||
|
|
||||||
|
add_executable(${TEST_MAIN} ${TESTFILES})
|
||||||
|
target_compile_definitions(${TEST_MAIN} PRIVATE CGLM_DEFINE_PRINTS=1)
|
||||||
|
|
||||||
|
target_link_libraries(${TEST_MAIN} PRIVATE cglm m)
|
||||||
|
target_include_directories(${TEST_MAIN} PRIVATE
|
||||||
|
${CMAKE_CURRENT_LIST_DIR}/include
|
||||||
|
${CMAKE_CURRENT_LIST_DIR}/src
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(${TEST_MAIN} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
|
||||||
|
|
||||||
|
if(LDFLAGS)
|
||||||
|
target_compile_options(${TEST_MAIN} PRIVATE ${LDFLAGS})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_test(
|
||||||
|
NAME cglm.${TEST_MAIN}
|
||||||
|
COMMAND ${TEST_MAIN} ${TEST_RUNNER_PARAMS})
|
||||||
|
|
||||||
|
add_custom_target(check
|
||||||
|
make
|
||||||
|
COMMAND ${CMAKE_CTEST_COMMAND} -V
|
||||||
|
DEPENDS cglm)
|
||||||
@@ -8,6 +8,14 @@
|
|||||||
#ifndef tests_common_h
|
#ifndef tests_common_h
|
||||||
#define tests_common_h
|
#define tests_common_h
|
||||||
|
|
||||||
|
#ifndef _USE_MATH_DEFINES
|
||||||
|
# define _USE_MATH_DEFINES /* for windows */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _CRT_SECURE_NO_WARNINGS
|
||||||
|
# define _CRT_SECURE_NO_WARNINGS /* for windows */
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@@ -30,6 +38,8 @@ typedef struct test_entry_t {
|
|||||||
int show_output;
|
int show_output;
|
||||||
} test_entry_t;
|
} test_entry_t;
|
||||||
|
|
||||||
|
#ifndef GLM_TESTS_NO_COLORFUL_OUTPUT
|
||||||
|
|
||||||
#define RESET "\033[0m"
|
#define RESET "\033[0m"
|
||||||
#define BLACK "\033[30m" /* Black */
|
#define BLACK "\033[30m" /* Black */
|
||||||
#define RED "\033[31m" /* Red */
|
#define RED "\033[31m" /* Red */
|
||||||
@@ -48,6 +58,28 @@ typedef struct test_entry_t {
|
|||||||
#define BOLDCYAN "\033[1m\033[36m" /* Bold Cyan */
|
#define BOLDCYAN "\033[1m\033[36m" /* Bold Cyan */
|
||||||
#define BOLDWHITE "\033[1m\033[37m" /* Bold White */
|
#define BOLDWHITE "\033[1m\033[37m" /* Bold White */
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#define RESET
|
||||||
|
#define BLACK
|
||||||
|
#define RED
|
||||||
|
#define GREEN
|
||||||
|
#define YELLOW
|
||||||
|
#define BLUE
|
||||||
|
#define MAGENTA
|
||||||
|
#define CYAN
|
||||||
|
#define WHITE
|
||||||
|
#define BOLDBLACK
|
||||||
|
#define BOLDRED
|
||||||
|
#define BOLDGREEN
|
||||||
|
#define BOLDYELLOW
|
||||||
|
#define BOLDBLUE
|
||||||
|
#define BOLDMAGENTA
|
||||||
|
#define BOLDCYAN
|
||||||
|
#define BOLDWHITE
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
#define TEST_DECLARE(FUN) test_status_t test_ ## FUN(void);
|
#define TEST_DECLARE(FUN) test_status_t test_ ## FUN(void);
|
||||||
#define TEST_ENTRY(FUN) { #FUN, test_ ## FUN, 0, 0 },
|
#define TEST_ENTRY(FUN) { #FUN, test_ ## FUN, 0, 0 },
|
||||||
#define TEST_LIST static test_entry_t tests[] =
|
#define TEST_LIST static test_entry_t tests[] =
|
||||||
|
|||||||
310
test/src/test_affine2d.h
Normal file
310
test/src/test_affine2d.h
Normal file
@@ -0,0 +1,310 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "test_common.h"
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, translate2d) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d)(m1, (vec2){13.0f, 11.0f});
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 15.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 14.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d)(m1, (vec2){1.0f, -1.0f});
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 16.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 13.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, translate2d_to) {
|
||||||
|
mat3 m1, m2;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_to)(m1, (vec2){13.0f, 11.0f}, m2);
|
||||||
|
glm_mat3_mulv(m2, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 15.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 14.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_to)(m1, (vec2){1.0f, -1.0f}, m2);
|
||||||
|
glm_mat3_mulv(m2, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 16.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 13.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, translate2d_x) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_x)(m1, 13.0f);
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 15.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 3.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_x)(m1, -1.0f);
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 14.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 3.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, translate2d_y) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_y)(m1, 11.0f);
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 2.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 14.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_y)(m1, -1.0f);
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 2.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 13.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, translate2d_make) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_make)(m1, (vec2){13.0f, 11.0f});
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 15.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 14.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(translate2d_make)(m1, (vec2){-1.0f, -5.0f});
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 14.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 9.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, scale2d_to) {
|
||||||
|
mat3 m1, m2;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(scale2d_to)(m1, (vec2){13.0f, 11.0f}, m2);
|
||||||
|
glm_mat3_mulv(m2, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 33.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(scale2d_to)(m1, (vec2){-1.0f, -5.0f}, m2);
|
||||||
|
glm_mat3_mulv(m2, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], -26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], -165.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, scale2d_make) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
GLM(scale2d_make)(m1, (vec2){13.0f, 11.0f});
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 33.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
GLM(scale2d_make)(m1, (vec3){-1.0f, -5.0f});
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], -26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], -165.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, scale2d) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(scale2d)(m1, (vec2){13.0f, 11.0f});
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 33.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(scale2d)(m1, (vec2){-1.0f, -5.0f});
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], -26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], -165.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, scale2d_uni) {
|
||||||
|
mat3 m1;
|
||||||
|
vec3 v1 = {2.0f, 3.0f, 1.0f}, v2;
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(scale2d_uni)(m1, 13.0f);
|
||||||
|
glm_mat3_mulv(m1, v1, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], 26.0f))
|
||||||
|
ASSERT(test_eq(v2[1], 39.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
glm_mat3_identity(m1);
|
||||||
|
GLM(scale2d_uni)(m1, -5.0f);
|
||||||
|
glm_mat3_mulv(m1, v2, v2);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v2[0], -130.0f))
|
||||||
|
ASSERT(test_eq(v2[1], -195.0f))
|
||||||
|
ASSERT(test_eq(v2[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, rotate2d_make) {
|
||||||
|
mat3 m1 = GLM_MAT3_IDENTITY_INIT;
|
||||||
|
vec3 v1 = {0.0f, 1.0f, 1.0f}, v2 = {0.0f, 1.0f, 1.0f};
|
||||||
|
|
||||||
|
GLM(rotate2d_make)(m1, GLM_PI_2f);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], -1.0f))
|
||||||
|
ASSERT(test_eq(v1[1], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
glm_vec3_copy(v2, v1);
|
||||||
|
|
||||||
|
GLM(rotate2d_make)(m1, -GLM_PI_2f);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], 1.0f))
|
||||||
|
ASSERT(test_eq(v1[1], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
glm_vec3_copy(v2, v1);
|
||||||
|
|
||||||
|
GLM(rotate2d_make)(m1, GLM_PIf);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[1], -1.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, rotate2d) {
|
||||||
|
mat3 m1 = GLM_MAT3_IDENTITY_INIT;
|
||||||
|
vec3 v1 = {0.0f, 1.0f, 1.0f}, v2 = {0.0f, 1.0f, 1.0f};
|
||||||
|
|
||||||
|
GLM(rotate2d)(m1, GLM_PI_2f);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], -1.0f))
|
||||||
|
ASSERT(test_eq(v1[1], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
glm_vec3_copy(v2, v1);
|
||||||
|
|
||||||
|
GLM(rotate2d)(m1, GLM_PI_2f);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[1], -1.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
glm_vec3_copy(v2, v1);
|
||||||
|
|
||||||
|
GLM(rotate2d)(m1, GLM_PI_2f);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], 1.0f))
|
||||||
|
ASSERT(test_eq(v1[1], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, rotate2d_to) {
|
||||||
|
mat3 m1 = GLM_MAT3_IDENTITY_INIT, m2;
|
||||||
|
vec3 v1 = {0.0f, 1.0f, 1.0f}, v2 = {0.0f, 1.0f, 1.0f};
|
||||||
|
|
||||||
|
GLM(rotate2d_to)(m1, GLM_PI_2f, m1);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], -1.0f))
|
||||||
|
ASSERT(test_eq(v1[1], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
glm_vec3_copy(v2, v1);
|
||||||
|
|
||||||
|
GLM(rotate2d_to)(m1, GLM_PI_2f, m2);
|
||||||
|
glm_mat3_mulv(m2, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[1], -1.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
glm_vec3_copy(v2, v1);
|
||||||
|
|
||||||
|
GLM(rotate2d_to)(m2, GLM_PI_2f, m1);
|
||||||
|
glm_mat3_mulv(m1, v1, v1);
|
||||||
|
|
||||||
|
ASSERT(test_eq(v1[0], 1.0f))
|
||||||
|
ASSERT(test_eq(v1[1], 0.0f))
|
||||||
|
ASSERT(test_eq(v1[2], 1.0f))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
@@ -35,9 +35,9 @@ TEST_IMPL(camera_decomp) {
|
|||||||
farVal = 100.0f;
|
farVal = 100.0f;
|
||||||
|
|
||||||
glm_perspective(fovy, aspect, nearVal, farVal, proj);
|
glm_perspective(fovy, aspect, nearVal, farVal, proj);
|
||||||
ASSERT(fabsf(aspect - glm_persp_aspect(proj)) < FLT_EPSILON)
|
ASSERT(fabsf(aspect - glm_persp_aspect(proj)) < GLM_FLT_EPSILON)
|
||||||
ASSERT(fabsf(fovy - glm_persp_fovy(proj)) < FLT_EPSILON)
|
ASSERT(fabsf(fovy - glm_persp_fovy(proj)) < GLM_FLT_EPSILON)
|
||||||
ASSERT(fabsf(49.984f - glm_deg(glm_persp_fovy(proj))) < FLT_EPSILON)
|
ASSERT(fabsf(49.984f - glm_deg(glm_persp_fovy(proj))) < GLM_FLT_EPSILON)
|
||||||
|
|
||||||
glm_persp_sizes(proj, fovy, sizes);
|
glm_persp_sizes(proj, fovy, sizes);
|
||||||
|
|
||||||
|
|||||||
68
test/src/test_camera.h
Normal file
68
test/src/test_camera.h
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "test_common.h"
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, frustum) {
|
||||||
|
mat4 proj;
|
||||||
|
vec4 vp = {0.0f, 0.0f, 800.0f, 600.0f};
|
||||||
|
float left, right, top, bottom, znear, zfar;
|
||||||
|
|
||||||
|
znear = 0.1f;
|
||||||
|
zfar = 100.0f;
|
||||||
|
left = -100.0f;
|
||||||
|
right = 100.0f;
|
||||||
|
bottom = -100.0f;
|
||||||
|
top = 100.0f;
|
||||||
|
|
||||||
|
GLM(frustum)(left, right, bottom, top, znear, zfar, proj);
|
||||||
|
|
||||||
|
ASSERT(test_eq(proj[0][1], 0.0f))
|
||||||
|
ASSERT(test_eq(proj[0][2], 0.0f))
|
||||||
|
ASSERT(test_eq(proj[0][3], 0.0f))
|
||||||
|
|
||||||
|
ASSERT(test_eq(proj[1][0], 0.0f))
|
||||||
|
ASSERT(test_eq(proj[1][2], 0.0f))
|
||||||
|
ASSERT(test_eq(proj[1][3], 0.0f))
|
||||||
|
|
||||||
|
ASSERT(test_eq(proj[2][3], -1.0f))
|
||||||
|
|
||||||
|
ASSERT(test_eq(proj[3][0], 0.0f))
|
||||||
|
ASSERT(test_eq(proj[3][1], 0.0f))
|
||||||
|
ASSERT(test_eq(proj[3][3], 0.0f))
|
||||||
|
|
||||||
|
vec4 v1 = {1.0f, 20.0f, znear};
|
||||||
|
vec4 v2 = {1.0f, 20.0f, zfar};
|
||||||
|
vec4 v3, v4;
|
||||||
|
|
||||||
|
/* perspective test */
|
||||||
|
GLM(mat4_mulv)(proj, v1, v3);
|
||||||
|
GLM(project)(v3, proj, vp, v3);
|
||||||
|
|
||||||
|
ASSERT(v3[0] > v1[0])
|
||||||
|
ASSERT(v3[1] > v1[1])
|
||||||
|
|
||||||
|
GLM(mat4_mulv)(proj, v2, v4);
|
||||||
|
GLM(project)(v4, proj, vp, v4);
|
||||||
|
|
||||||
|
ASSERT(v4[0] < v3[0])
|
||||||
|
ASSERT(v4[1] < v3[1])
|
||||||
|
|
||||||
|
/* not infinity */
|
||||||
|
ASSERT(!GLM(vec4_isinf)(proj[0]))
|
||||||
|
ASSERT(!GLM(vec4_isinf)(proj[1]))
|
||||||
|
ASSERT(!GLM(vec4_isinf)(proj[2]))
|
||||||
|
ASSERT(!GLM(vec4_isinf)(proj[3]))
|
||||||
|
|
||||||
|
/* not NaN */
|
||||||
|
ASSERT(!GLM(vec4_isnan)(proj[0]))
|
||||||
|
ASSERT(!GLM(vec4_isnan)(proj[1]))
|
||||||
|
ASSERT(!GLM(vec4_isnan)(proj[2]))
|
||||||
|
ASSERT(!GLM(vec4_isnan)(proj[3]))
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
@@ -106,7 +106,7 @@ test_rand_quat(versor q);
|
|||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
bool
|
bool
|
||||||
test_eq(float a, float b) {
|
test_eq(float a, float b) {
|
||||||
return fabsf(a - b) <= 1e-6;
|
return fabsf(a - b) <= GLM_FLT_EPSILON * 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
CGLM_INLINE
|
CGLM_INLINE
|
||||||
|
|||||||
34
test/src/test_ray.h
Normal file
34
test/src/test_ray.h
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c), Recep Aslantas.
|
||||||
|
*
|
||||||
|
* MIT License (MIT), http://opensource.org/licenses/MIT
|
||||||
|
* Full license can be found in the LICENSE file
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "test_common.h"
|
||||||
|
|
||||||
|
TEST_IMPL(GLM_PREFIX, ray_triangle) {
|
||||||
|
/* Check whether a simple hit is recognized with the right distance */
|
||||||
|
vec3 origin = { 0.0f, 0.0f, 0.0f};
|
||||||
|
vec3 direction = { 1.0f, 0.0f, 0.0f};
|
||||||
|
vec3 opposite = {-1.0f, 0.0f, 0.0f};
|
||||||
|
vec3 v0 = { 5.0f, -1.0f, 1.0f};
|
||||||
|
vec3 v1 = { 5.0f, -1.0f, -1.0f};
|
||||||
|
vec3 v2 = { 5.0f, 1.0f, 0.0f};
|
||||||
|
float d;
|
||||||
|
bool hit;
|
||||||
|
|
||||||
|
hit = GLM(ray_triangle)(origin, direction, v0, v1, v2, &d);
|
||||||
|
ASSERT(hit);
|
||||||
|
ASSERT(fabsf(d - 5.0f) <= 0.0000009);
|
||||||
|
|
||||||
|
/* Check whether a simple miss works */
|
||||||
|
hit = GLM(ray_triangle)(origin, opposite, v0, v1, v2, &d);
|
||||||
|
ASSERT(!hit);
|
||||||
|
|
||||||
|
/* Check that we can disregard distance and pass NULL pointer instead */
|
||||||
|
hit = GLM(ray_triangle)(origin, direction, v0, v1, v2, NULL);
|
||||||
|
ASSERT(hit);
|
||||||
|
|
||||||
|
TEST_SUCCESS
|
||||||
|
}
|
||||||
@@ -22,7 +22,10 @@
|
|||||||
#include "test_project.h"
|
#include "test_project.h"
|
||||||
#include "test_plane.h"
|
#include "test_plane.h"
|
||||||
#include "test_affine.h"
|
#include "test_affine.h"
|
||||||
|
#include "test_affine2d.h"
|
||||||
#include "test_affine_mat.h"
|
#include "test_affine_mat.h"
|
||||||
|
#include "test_ray.h"
|
||||||
|
#include "test_camera.h"
|
||||||
|
|
||||||
#undef GLM
|
#undef GLM
|
||||||
#undef GLM_PREFIX
|
#undef GLM_PREFIX
|
||||||
@@ -43,7 +46,10 @@
|
|||||||
#include "test_project.h"
|
#include "test_project.h"
|
||||||
#include "test_plane.h"
|
#include "test_plane.h"
|
||||||
#include "test_affine.h"
|
#include "test_affine.h"
|
||||||
|
#include "test_affine2d.h"
|
||||||
#include "test_affine_mat.h"
|
#include "test_affine_mat.h"
|
||||||
|
#include "test_ray.h"
|
||||||
|
#include "test_camera.h"
|
||||||
|
|
||||||
#undef GLM
|
#undef GLM
|
||||||
#undef GLM_PREFIX
|
#undef GLM_PREFIX
|
||||||
|
|||||||
73
test/tests.h
73
test/tests.h
@@ -70,6 +70,33 @@ TEST_DECLARE(glmc_uniscaled)
|
|||||||
TEST_DECLARE(glmc_decompose_rs)
|
TEST_DECLARE(glmc_decompose_rs)
|
||||||
TEST_DECLARE(glmc_decompose)
|
TEST_DECLARE(glmc_decompose)
|
||||||
|
|
||||||
|
/* affine 2d */
|
||||||
|
TEST_DECLARE(glm_translate2d)
|
||||||
|
TEST_DECLARE(glm_translate2d_to)
|
||||||
|
TEST_DECLARE(glm_translate2d_x)
|
||||||
|
TEST_DECLARE(glm_translate2d_y)
|
||||||
|
TEST_DECLARE(glm_translate2d_make)
|
||||||
|
TEST_DECLARE(glm_scale2d_to)
|
||||||
|
TEST_DECLARE(glm_scale2d_make)
|
||||||
|
TEST_DECLARE(glm_scale2d)
|
||||||
|
TEST_DECLARE(glm_scale2d_uni)
|
||||||
|
TEST_DECLARE(glm_rotate2d_make)
|
||||||
|
TEST_DECLARE(glm_rotate2d)
|
||||||
|
TEST_DECLARE(glm_rotate2d_to)
|
||||||
|
|
||||||
|
TEST_DECLARE(glmc_translate2d)
|
||||||
|
TEST_DECLARE(glmc_translate2d_to)
|
||||||
|
TEST_DECLARE(glmc_translate2d_x)
|
||||||
|
TEST_DECLARE(glmc_translate2d_y)
|
||||||
|
TEST_DECLARE(glmc_translate2d_make)
|
||||||
|
TEST_DECLARE(glmc_scale2d_to)
|
||||||
|
TEST_DECLARE(glmc_scale2d_make)
|
||||||
|
TEST_DECLARE(glmc_scale2d)
|
||||||
|
TEST_DECLARE(glmc_scale2d_uni)
|
||||||
|
TEST_DECLARE(glmc_rotate2d_make)
|
||||||
|
TEST_DECLARE(glmc_rotate2d)
|
||||||
|
TEST_DECLARE(glmc_rotate2d_to)
|
||||||
|
|
||||||
/* mat4 */
|
/* mat4 */
|
||||||
TEST_DECLARE(glm_mat4_ucopy)
|
TEST_DECLARE(glm_mat4_ucopy)
|
||||||
TEST_DECLARE(glm_mat4_copy)
|
TEST_DECLARE(glm_mat4_copy)
|
||||||
@@ -199,6 +226,10 @@ TEST_DECLARE(glmc_mat2_rmc)
|
|||||||
TEST_DECLARE(camera_lookat)
|
TEST_DECLARE(camera_lookat)
|
||||||
TEST_DECLARE(camera_decomp)
|
TEST_DECLARE(camera_decomp)
|
||||||
|
|
||||||
|
TEST_DECLARE(glm_frustum)
|
||||||
|
|
||||||
|
TEST_DECLARE(glmc_frustum)
|
||||||
|
|
||||||
/* project */
|
/* project */
|
||||||
TEST_DECLARE(glm_unprojecti)
|
TEST_DECLARE(glm_unprojecti)
|
||||||
TEST_DECLARE(glm_unproject)
|
TEST_DECLARE(glm_unproject)
|
||||||
@@ -218,6 +249,10 @@ TEST_DECLARE(clamp)
|
|||||||
/* euler */
|
/* euler */
|
||||||
TEST_DECLARE(euler)
|
TEST_DECLARE(euler)
|
||||||
|
|
||||||
|
/* ray */
|
||||||
|
TEST_DECLARE(glm_ray_triangle)
|
||||||
|
TEST_DECLARE(glmc_ray_triangle)
|
||||||
|
|
||||||
/* quat */
|
/* quat */
|
||||||
TEST_DECLARE(MACRO_GLM_QUAT_IDENTITY_INIT)
|
TEST_DECLARE(MACRO_GLM_QUAT_IDENTITY_INIT)
|
||||||
TEST_DECLARE(MACRO_GLM_QUAT_IDENTITY)
|
TEST_DECLARE(MACRO_GLM_QUAT_IDENTITY)
|
||||||
@@ -757,6 +792,33 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_decompose_rs)
|
TEST_ENTRY(glmc_decompose_rs)
|
||||||
TEST_ENTRY(glmc_decompose)
|
TEST_ENTRY(glmc_decompose)
|
||||||
|
|
||||||
|
/* affine 2d */
|
||||||
|
TEST_ENTRY(glm_translate2d)
|
||||||
|
TEST_ENTRY(glm_translate2d_to)
|
||||||
|
TEST_ENTRY(glm_translate2d_x)
|
||||||
|
TEST_ENTRY(glm_translate2d_y)
|
||||||
|
TEST_ENTRY(glm_translate2d_make)
|
||||||
|
TEST_ENTRY(glm_scale2d_to)
|
||||||
|
TEST_ENTRY(glm_scale2d_make)
|
||||||
|
TEST_ENTRY(glm_scale2d)
|
||||||
|
TEST_ENTRY(glm_scale2d_uni)
|
||||||
|
TEST_ENTRY(glm_rotate2d_make)
|
||||||
|
TEST_ENTRY(glm_rotate2d)
|
||||||
|
TEST_ENTRY(glm_rotate2d_to)
|
||||||
|
|
||||||
|
TEST_ENTRY(glmc_translate2d)
|
||||||
|
TEST_ENTRY(glmc_translate2d_to)
|
||||||
|
TEST_ENTRY(glmc_translate2d_x)
|
||||||
|
TEST_ENTRY(glmc_translate2d_y)
|
||||||
|
TEST_ENTRY(glmc_translate2d_make)
|
||||||
|
TEST_ENTRY(glmc_scale2d_to)
|
||||||
|
TEST_ENTRY(glmc_scale2d_make)
|
||||||
|
TEST_ENTRY(glmc_scale2d)
|
||||||
|
TEST_ENTRY(glmc_scale2d_uni)
|
||||||
|
TEST_ENTRY(glmc_rotate2d_make)
|
||||||
|
TEST_ENTRY(glmc_rotate2d)
|
||||||
|
TEST_ENTRY(glmc_rotate2d_to)
|
||||||
|
|
||||||
/* mat4 */
|
/* mat4 */
|
||||||
TEST_ENTRY(glm_mat4_ucopy)
|
TEST_ENTRY(glm_mat4_ucopy)
|
||||||
TEST_ENTRY(glm_mat4_copy)
|
TEST_ENTRY(glm_mat4_copy)
|
||||||
@@ -886,6 +948,10 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(camera_lookat)
|
TEST_ENTRY(camera_lookat)
|
||||||
TEST_ENTRY(camera_decomp)
|
TEST_ENTRY(camera_decomp)
|
||||||
|
|
||||||
|
TEST_ENTRY(glm_frustum)
|
||||||
|
|
||||||
|
TEST_ENTRY(glmc_frustum)
|
||||||
|
|
||||||
/* project */
|
/* project */
|
||||||
TEST_ENTRY(glm_unprojecti)
|
TEST_ENTRY(glm_unprojecti)
|
||||||
TEST_ENTRY(glm_unproject)
|
TEST_ENTRY(glm_unproject)
|
||||||
@@ -905,6 +971,10 @@ TEST_LIST {
|
|||||||
/* euler */
|
/* euler */
|
||||||
TEST_ENTRY(euler)
|
TEST_ENTRY(euler)
|
||||||
|
|
||||||
|
/* ray */
|
||||||
|
TEST_ENTRY(glm_ray_triangle)
|
||||||
|
TEST_ENTRY(glmc_ray_triangle)
|
||||||
|
|
||||||
/* quat */
|
/* quat */
|
||||||
TEST_ENTRY(MACRO_GLM_QUAT_IDENTITY_INIT)
|
TEST_ENTRY(MACRO_GLM_QUAT_IDENTITY_INIT)
|
||||||
TEST_ENTRY(MACRO_GLM_QUAT_IDENTITY)
|
TEST_ENTRY(MACRO_GLM_QUAT_IDENTITY)
|
||||||
@@ -984,6 +1054,7 @@ TEST_LIST {
|
|||||||
/* bezier */
|
/* bezier */
|
||||||
TEST_ENTRY(bezier)
|
TEST_ENTRY(bezier)
|
||||||
|
|
||||||
|
/* vec2 */
|
||||||
/* Macros */
|
/* Macros */
|
||||||
|
|
||||||
TEST_ENTRY(MACRO_GLM_VEC2_ONE_INIT)
|
TEST_ENTRY(MACRO_GLM_VEC2_ONE_INIT)
|
||||||
@@ -1062,7 +1133,6 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_vec2_lerp)
|
TEST_ENTRY(glmc_vec2_lerp)
|
||||||
|
|
||||||
/* vec3 */
|
/* vec3 */
|
||||||
|
|
||||||
/* Macros */
|
/* Macros */
|
||||||
|
|
||||||
TEST_ENTRY(MACRO_GLM_VEC3_ONE_INIT)
|
TEST_ENTRY(MACRO_GLM_VEC3_ONE_INIT)
|
||||||
@@ -1228,6 +1298,7 @@ TEST_LIST {
|
|||||||
TEST_ENTRY(glmc_vec3_sqrt)
|
TEST_ENTRY(glmc_vec3_sqrt)
|
||||||
|
|
||||||
/* vec4 */
|
/* vec4 */
|
||||||
|
/* Macros */
|
||||||
|
|
||||||
TEST_ENTRY(MACRO_GLM_VEC4_ONE_INIT)
|
TEST_ENTRY(MACRO_GLM_VEC4_ONE_INIT)
|
||||||
TEST_ENTRY(MACRO_GLM_VEC4_ZERO_INIT)
|
TEST_ENTRY(MACRO_GLM_VEC4_ZERO_INIT)
|
||||||
|
|||||||
@@ -31,7 +31,9 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\test\include\common.h" />
|
<ClInclude Include="..\test\include\common.h" />
|
||||||
<ClInclude Include="..\test\src\test_affine.h" />
|
<ClInclude Include="..\test\src\test_affine.h" />
|
||||||
|
<ClInclude Include="..\test\src\test_affine2d.h" />
|
||||||
<ClInclude Include="..\test\src\test_affine_mat.h" />
|
<ClInclude Include="..\test\src\test_affine_mat.h" />
|
||||||
|
<ClInclude Include="..\test\src\test_camera.h" />
|
||||||
<ClInclude Include="..\test\src\test_common.h" />
|
<ClInclude Include="..\test\src\test_common.h" />
|
||||||
<ClInclude Include="..\test\src\test_mat2.h" />
|
<ClInclude Include="..\test\src\test_mat2.h" />
|
||||||
<ClInclude Include="..\test\src\test_mat3.h" />
|
<ClInclude Include="..\test\src\test_mat3.h" />
|
||||||
@@ -42,6 +44,7 @@
|
|||||||
<ClInclude Include="..\test\src\test_vec2.h" />
|
<ClInclude Include="..\test\src\test_vec2.h" />
|
||||||
<ClInclude Include="..\test\src\test_vec3.h" />
|
<ClInclude Include="..\test\src\test_vec3.h" />
|
||||||
<ClInclude Include="..\test\src\test_vec4.h" />
|
<ClInclude Include="..\test\src\test_vec4.h" />
|
||||||
|
<ClInclude Include="..\test\src\test_ray.h" />
|
||||||
<ClInclude Include="..\test\tests.h" />
|
<ClInclude Include="..\test\tests.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -144,6 +147,7 @@
|
|||||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
@@ -161,6 +165,7 @@
|
|||||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<ConformanceMode>true</ConformanceMode>
|
<ConformanceMode>true</ConformanceMode>
|
||||||
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
|
|||||||
@@ -79,5 +79,14 @@
|
|||||||
<ClInclude Include="..\test\src\test_vec2.h">
|
<ClInclude Include="..\test\src\test_vec2.h">
|
||||||
<Filter>src</Filter>
|
<Filter>src</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\test\src\test_ray.h">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\test\src\test_affine2d.h">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\test\src\test_camera.h">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -20,6 +20,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\src\affine.c" />
|
<ClCompile Include="..\src\affine.c" />
|
||||||
|
<ClCompile Include="..\src\affine2d.c" />
|
||||||
<ClCompile Include="..\src\bezier.c" />
|
<ClCompile Include="..\src\bezier.c" />
|
||||||
<ClCompile Include="..\src\box.c" />
|
<ClCompile Include="..\src\box.c" />
|
||||||
<ClCompile Include="..\src\cam.c" />
|
<ClCompile Include="..\src\cam.c" />
|
||||||
@@ -34,6 +35,7 @@
|
|||||||
<ClCompile Include="..\src\plane.c" />
|
<ClCompile Include="..\src\plane.c" />
|
||||||
<ClCompile Include="..\src\project.c" />
|
<ClCompile Include="..\src\project.c" />
|
||||||
<ClCompile Include="..\src\quat.c" />
|
<ClCompile Include="..\src\quat.c" />
|
||||||
|
<ClCompile Include="..\src\ray.c" />
|
||||||
<ClCompile Include="..\src\sphere.c" />
|
<ClCompile Include="..\src\sphere.c" />
|
||||||
<ClCompile Include="..\src\vec2.c" />
|
<ClCompile Include="..\src\vec2.c" />
|
||||||
<ClCompile Include="..\src\vec3.c" />
|
<ClCompile Include="..\src\vec3.c" />
|
||||||
@@ -42,11 +44,13 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\include\cglm\affine-mat.h" />
|
<ClInclude Include="..\include\cglm\affine-mat.h" />
|
||||||
<ClInclude Include="..\include\cglm\affine.h" />
|
<ClInclude Include="..\include\cglm\affine.h" />
|
||||||
|
<ClInclude Include="..\include\cglm\affine2d.h" />
|
||||||
<ClInclude Include="..\include\cglm\applesimd.h" />
|
<ClInclude Include="..\include\cglm\applesimd.h" />
|
||||||
<ClInclude Include="..\include\cglm\bezier.h" />
|
<ClInclude Include="..\include\cglm\bezier.h" />
|
||||||
<ClInclude Include="..\include\cglm\box.h" />
|
<ClInclude Include="..\include\cglm\box.h" />
|
||||||
<ClInclude Include="..\include\cglm\call.h" />
|
<ClInclude Include="..\include\cglm\call.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\affine.h" />
|
<ClInclude Include="..\include\cglm\call\affine.h" />
|
||||||
|
<ClInclude Include="..\include\cglm\call\affine2d.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\bezier.h" />
|
<ClInclude Include="..\include\cglm\call\bezier.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\box.h" />
|
<ClInclude Include="..\include\cglm\call\box.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\cam.h" />
|
<ClInclude Include="..\include\cglm\call\cam.h" />
|
||||||
@@ -61,6 +65,7 @@
|
|||||||
<ClInclude Include="..\include\cglm\call\plane.h" />
|
<ClInclude Include="..\include\cglm\call\plane.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\project.h" />
|
<ClInclude Include="..\include\cglm\call\project.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\quat.h" />
|
<ClInclude Include="..\include\cglm\call\quat.h" />
|
||||||
|
<ClInclude Include="..\include\cglm\call\ray.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\sphere.h" />
|
<ClInclude Include="..\include\cglm\call\sphere.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\vec2.h" />
|
<ClInclude Include="..\include\cglm\call\vec2.h" />
|
||||||
<ClInclude Include="..\include\cglm\call\vec3.h" />
|
<ClInclude Include="..\include\cglm\call\vec3.h" />
|
||||||
@@ -80,12 +85,14 @@
|
|||||||
<ClInclude Include="..\include\cglm\plane.h" />
|
<ClInclude Include="..\include\cglm\plane.h" />
|
||||||
<ClInclude Include="..\include\cglm\project.h" />
|
<ClInclude Include="..\include\cglm\project.h" />
|
||||||
<ClInclude Include="..\include\cglm\quat.h" />
|
<ClInclude Include="..\include\cglm\quat.h" />
|
||||||
|
<ClInclude Include="..\include\cglm\ray.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\arm.h" />
|
<ClInclude Include="..\include\cglm\simd\arm.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\avx\affine.h" />
|
<ClInclude Include="..\include\cglm\simd\avx\affine.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\avx\mat4.h" />
|
<ClInclude Include="..\include\cglm\simd\avx\mat4.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\intrin.h" />
|
<ClInclude Include="..\include\cglm\simd\intrin.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\neon\mat4.h" />
|
<ClInclude Include="..\include\cglm\simd\neon\mat4.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\sse2\affine.h" />
|
<ClInclude Include="..\include\cglm\simd\sse2\affine.h" />
|
||||||
|
<ClInclude Include="..\include\cglm\simd\sse2\mat2.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\sse2\mat3.h" />
|
<ClInclude Include="..\include\cglm\simd\sse2\mat3.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\sse2\mat4.h" />
|
<ClInclude Include="..\include\cglm\simd\sse2\mat4.h" />
|
||||||
<ClInclude Include="..\include\cglm\simd\sse2\quat.h" />
|
<ClInclude Include="..\include\cglm\simd\sse2\quat.h" />
|
||||||
@@ -93,6 +100,7 @@
|
|||||||
<ClInclude Include="..\include\cglm\sphere.h" />
|
<ClInclude Include="..\include\cglm\sphere.h" />
|
||||||
<ClInclude Include="..\include\cglm\struct.h" />
|
<ClInclude Include="..\include\cglm\struct.h" />
|
||||||
<ClInclude Include="..\include\cglm\struct\affine.h" />
|
<ClInclude Include="..\include\cglm\struct\affine.h" />
|
||||||
|
<ClInclude Include="..\include\cglm\struct\affine2d.h" />
|
||||||
<ClInclude Include="..\include\cglm\struct\box.h" />
|
<ClInclude Include="..\include\cglm\struct\box.h" />
|
||||||
<ClInclude Include="..\include\cglm\struct\cam.h" />
|
<ClInclude Include="..\include\cglm\struct\cam.h" />
|
||||||
<ClInclude Include="..\include\cglm\struct\color.h" />
|
<ClInclude Include="..\include\cglm\struct\color.h" />
|
||||||
@@ -243,6 +251,7 @@
|
|||||||
<PrecompiledHeaderFile />
|
<PrecompiledHeaderFile />
|
||||||
<CompileAs>CompileAsC</CompileAs>
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
<EnablePREfast>true</EnablePREfast>
|
<EnablePREfast>true</EnablePREfast>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
@@ -262,6 +271,7 @@
|
|||||||
<PrecompiledHeaderFile />
|
<PrecompiledHeaderFile />
|
||||||
<CompileAs>CompileAsC</CompileAs>
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
<EnablePREfast>true</EnablePREfast>
|
<EnablePREfast>true</EnablePREfast>
|
||||||
|
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
|
|||||||
@@ -92,6 +92,12 @@
|
|||||||
<ClCompile Include="..\src\vec2.c">
|
<ClCompile Include="..\src\vec2.c">
|
||||||
<Filter>src</Filter>
|
<Filter>src</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\ray.c">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\src\affine2d.c">
|
||||||
|
<Filter>src</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\src\config.h">
|
<ClInclude Include="..\src\config.h">
|
||||||
@@ -124,6 +130,9 @@
|
|||||||
<ClInclude Include="..\include\cglm\call\vec4.h">
|
<ClInclude Include="..\include\cglm\call\vec4.h">
|
||||||
<Filter>include\cglm\call</Filter>
|
<Filter>include\cglm\call</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\include\cglm\call\ray.h">
|
||||||
|
<Filter>include\cglm\call</Filter>
|
||||||
|
</ClInclude>
|
||||||
<ClInclude Include="..\include\cglm\simd\avx\affine.h">
|
<ClInclude Include="..\include\cglm\simd\avx\affine.h">
|
||||||
<Filter>include\cglm\simd\avx</Filter>
|
<Filter>include\cglm\simd\avx</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
@@ -241,6 +250,9 @@
|
|||||||
<ClInclude Include="..\include\cglm\ease.h">
|
<ClInclude Include="..\include\cglm\ease.h">
|
||||||
<Filter>include\cglm</Filter>
|
<Filter>include\cglm</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\include\cglm\ray.h">
|
||||||
|
<Filter>include\cglm</Filter>
|
||||||
|
</ClInclude>
|
||||||
<ClInclude Include="..\include\cglm\simd\arm.h">
|
<ClInclude Include="..\include\cglm\simd\arm.h">
|
||||||
<Filter>include\cglm\simd</Filter>
|
<Filter>include\cglm\simd</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
@@ -346,5 +358,17 @@
|
|||||||
<ClInclude Include="..\include\cglm\struct\vec2-ext.h">
|
<ClInclude Include="..\include\cglm\struct\vec2-ext.h">
|
||||||
<Filter>include\cglm\struct</Filter>
|
<Filter>include\cglm\struct</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\include\cglm\simd\sse2\mat2.h">
|
||||||
|
<Filter>include\cglm\simd\sse2</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\include\cglm\call\affine2d.h">
|
||||||
|
<Filter>include\cglm\call</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\include\cglm\affine2d.h">
|
||||||
|
<Filter>include\cglm</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\include\cglm\struct\affine2d.h">
|
||||||
|
<Filter>include\cglm\struct</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Reference in New Issue
Block a user