External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-01-22 09:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename mat4 functions

Browse Source
This commit is contained in:
Recep Aslantas
2016-09-17 12:30:33 +03:00
parent ab58ae76eb
commit 4d171c8758
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cglm-affine.h
View File

@@ -159,7 +159,7 @@ glm_rotate_x(mat4 m, float rad, mat4 dest) {
t[2][1] = -sinVal; t[2][1] = -sinVal;
t[2][2] = cosVal; t[2][2] = cosVal;
glm_mat_mul4(t, m, dest); glm_mat4_mul(t, m, dest);
} }
CGLM_INLINE CGLM_INLINE
@@ -177,7 +177,7 @@ glm_rotate_y(mat4 m, float rad, mat4 dest) {
t[2][0] = sinVal; t[2][0] = sinVal;
t[2][2] = cosVal; t[2][2] = cosVal;
glm_mat_mul4(t, m, dest); glm_mat4_mul(t, m, dest);
} }
CGLM_INLINE CGLM_INLINE
@@ -195,7 +195,7 @@ glm_rotate_z(mat4 m, float rad, mat4 dest) {
t[1][0] = -sinVal; t[1][0] = -sinVal;
t[1][1] = cosVal; t[1][1] = cosVal;
glm_mat_mul4(t, m, dest); glm_mat4_mul(t, m, dest);
} }
#endif /* cglm_affine_h */ #endif /* cglm_affine_h */

14
include/cglm-mat.h
View File

@@ -17,7 +17,7 @@
0.0f, 0.0f, 1.0f, 0.0f, \ 0.0f, 0.0f, 1.0f, 0.0f, \
0.0f, 0.0f, 0.0f, 1.0f} 0.0f, 0.0f, 0.0f, 1.0f}
#define glm_mat_mul4_impl(l, r, d) \ #define glm_mat4_mul_impl(l, r, d) \
do { \ do { \
d[0] = l[0] * r[0] + l[1] * r[4] + l[2] * r[8] + l[3] * r[12]; \ d[0] = l[0] * r[0] + l[1] * r[4] + l[2] * r[8] + l[3] * r[12]; \
d[1] = l[0] * r[1] + l[1] * r[5] + l[2] * r[9] + l[3] * r[13]; \ d[1] = l[0] * r[1] + l[1] * r[5] + l[2] * r[9] + l[3] * r[13]; \
@@ -39,7 +39,7 @@
CGLM_INLINE CGLM_INLINE
void void
glm_mat_mul4(mat4 m1, mat4 m2, mat4 dest) { glm_mat4_mul(mat4 m1, mat4 m2, mat4 dest) {
float * __restrict d; float * __restrict d;
float * __restrict l; float * __restrict l;
@@ -67,24 +67,24 @@ glm_mat_mul4(mat4 m1, mat4 m2, mat4 dest) {
CGLM_INLINE CGLM_INLINE
void void
glm_mat_mul4N(mat4 * __restrict matrices[], int len, mat4 dest) { glm_mat4_mulN(mat4 * __restrict matrices[], int len, mat4 dest) {
int i; int i;
assert(len > 1 && "there must be least 2 matrices to go!"); assert(len > 1 && "there must be least 2 matrices to go!");
glm_mat_mul4(*matrices[0], glm_mat4_mul(*matrices[0],
*matrices[1], *matrices[1],
dest); dest);
for (i = 2; i < len; i++) for (i = 2; i < len; i++)
glm_mat_mul4(dest, glm_mat4_mul(dest,
*matrices[i], *matrices[i],
dest); dest);
} }
CGLM_INLINE CGLM_INLINE
void void
glm_mat_transpose(mat4 m, mat4 dest) { glm_mat4_transpose(mat4 m, mat4 dest) {
#if defined( __SSE__ ) || defined( __SSE2__ ) #if defined( __SSE__ ) || defined( __SSE2__ )
CGLM_MAT_TRANSP_SSE_4x4f(m, dest); CGLM_MAT_TRANSP_SSE_4x4f(m, dest);
#else #else
@@ -112,7 +112,7 @@ glm_mat_transpose(mat4 m, mat4 dest) {
CGLM_INLINE CGLM_INLINE
void void
glm_mat_transpose_self(mat4 m) { glm_mat4_transpose_self(mat4 m) {
#if defined( __SSE__ ) || defined( __SSE2__ ) #if defined( __SSE__ ) || defined( __SSE2__ )
CGLM_MAT_TRANSP_SSE_4x4f(m, m); CGLM_MAT_TRANSP_SSE_4x4f(m, m);
#else #else