External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-04 17:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

use frustum namespace for frustum specific funcs

Browse Source
This commit is contained in:
Recep Aslantas
2017-12-30 18:05:11 +03:00
parent 400fc6cbee
commit 2d0a3ad828
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cglm/call/cam.h
View File

@@ -50,7 +50,11 @@ glmc_lookat(vec3 eye,
CGLM_EXPORT CGLM_EXPORT
void void
glmc_extract_planes(mat4 m, vec4 dest[6]); glmc_frustum_planes(mat4 m, vec4 dest[6]);
CGLM_EXPORT
void
glmc_frustum_corners(mat4 invMat, vec4 dest[8]);
#ifdef __cplusplus #ifdef __cplusplus
} }

5
include/cglm/cam.h
View File

@@ -50,7 +50,8 @@
float * __restrict farVal); float * __restrict farVal);
CGLM_INLINE void glm_persp_decomp_far(mat4 proj, float * __restrict farVal); CGLM_INLINE void glm_persp_decomp_far(mat4 proj, float * __restrict farVal);
CGLM_INLINE void glm_persp_decomp_near(mat4 proj, float *__restrict nearVal); CGLM_INLINE void glm_persp_decomp_near(mat4 proj, float *__restrict nearVal);
CGLM_INLINE void glm_extract_planes(mat4 m, vec4 dest[6]); CGLM_INLINE void glm_frustum_planes(mat4 m, vec4 dest[6]);
CGLM_INLINE void glm_frustum_corners(mat4 invMat, vec4 dest[8]);
*/ */
#ifndef cglm_vcam_h #ifndef cglm_vcam_h
@@ -444,7 +445,7 @@ glm_persp_decomp_near(mat4 proj, float * __restrict nearVal) {
*/ */
CGLM_INLINE CGLM_INLINE
void void
glm_extract_planes(mat4 m, vec4 dest[6]) { glm_frustum_planes(mat4 m, vec4 dest[6]) {
mat4 t; mat4 t;
glm_mat4_transpose_to(m, t); glm_mat4_transpose_to(m, t);

10
src/cam.c
View File

@@ -69,6 +69,12 @@ glmc_lookat(vec3 eye,
CGLM_EXPORT CGLM_EXPORT
void void
glmc_extract_planes(mat4 m, vec4 dest[6]) { glmc_frustum_planes(mat4 m, vec4 dest[6]) {
glm_extract_planes(m, dest); glm_frustum_planes(m, dest);
}
CGLM_EXPORT
void
glmc_frustum_corners(mat4 invMat, vec4 dest[8]) {
glm_frustum_corners(invMat, dest);
} }