From 2b1126a2fc4d0f5bf347e88ebef543efce7e7f61 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Mon, 3 Jun 2019 09:47:52 +0300 Subject: [PATCH] code style --- include/cglm/cam.h | 70 ++++++++++++++------------------------- include/cglm/struct/cam.h | 34 ++++++------------- 2 files changed, 35 insertions(+), 69 deletions(-) diff --git a/include/cglm/cam.h b/include/cglm/cam.h index e77b989..ad971fe 100644 --- a/include/cglm/cam.h +++ b/include/cglm/cam.h @@ -7,48 +7,37 @@ /* Functions: - CGLM_INLINE void glm_frustum(float left, - float right, - float bottom, - float top, - float nearVal, - float farVal, + CGLM_INLINE void glm_frustum(float left, float right, + float bottom, float top, + float nearVal, float farVal, mat4 dest) - CGLM_INLINE void glm_ortho(float left, - float right, - float bottom, - float top, - float nearVal, - float farVal, + CGLM_INLINE void glm_ortho(float left, float right, + float bottom, float top, + float nearVal, float farVal, mat4 dest) CGLM_INLINE void glm_ortho_aabb(vec3 box[2], mat4 dest) - CGLM_INLINE void glm_ortho_aabb_p(vec3 box[2], float padding, mat4 dest) + CGLM_INLINE void glm_ortho_aabb_p(vec3 box[2], float padding, mat4 dest) CGLM_INLINE void glm_ortho_aabb_pz(vec3 box[2], float padding, mat4 dest) CGLM_INLINE void glm_ortho_default(float aspect, mat4 dest) - CGLM_INLINE void glm_ortho_default_s(float aspect, float size, mat4 dest) + CGLM_INLINE void glm_ortho_default_s(float aspect, float size, mat4 dest) CGLM_INLINE void glm_perspective(float fovy, float aspect, float nearVal, float farVal, mat4 dest) - CGLM_INLINE void glm_perspective_default(float aspect, mat4 dest) - CGLM_INLINE void glm_perspective_resize(float aspect, mat4 proj) + CGLM_INLINE void glm_perspective_default(float aspect, mat4 dest) + CGLM_INLINE void glm_perspective_resize(float aspect, mat4 proj) CGLM_INLINE void glm_lookat(vec3 eye, vec3 center, vec3 up, mat4 dest) CGLM_INLINE void glm_look(vec3 eye, vec3 dir, vec3 up, mat4 dest) CGLM_INLINE void glm_look_anyup(vec3 eye, vec3 dir, mat4 dest) CGLM_INLINE void glm_persp_decomp(mat4 proj, - float *nearVal, - float *farVal, - float *top, - float *bottom, - float *left, - float *right) + float *nearVal, float *farVal, + float *top, float *bottom, + float *left, float *right) CGLM_INLINE void glm_persp_decompv(mat4 proj, float dest[6]) CGLM_INLINE void glm_persp_decomp_x(mat4 proj, float *left, float *right) CGLM_INLINE void glm_persp_decomp_y(mat4 proj, float *top, float *bottom) - CGLM_INLINE void glm_persp_decomp_z(mat4 proj, - float *nearVal, - float *farVal) + CGLM_INLINE void glm_persp_decomp_z(mat4 proj, float *nearv, float *farv) CGLM_INLINE void glm_persp_decomp_far(mat4 proj, float *farVal) CGLM_INLINE void glm_persp_decomp_near(mat4 proj, float *nearVal) CGLM_INLINE float glm_persp_fovy(mat4 proj) @@ -75,12 +64,9 @@ */ CGLM_INLINE void -glm_frustum(float left, - float right, - float bottom, - float top, - float nearVal, - float farVal, +glm_frustum(float left, float right, + float bottom, float top, + float nearVal, float farVal, mat4 dest) { float rl, tb, fn, nv; @@ -113,12 +99,9 @@ glm_frustum(float left, */ CGLM_INLINE void -glm_ortho(float left, - float right, - float bottom, - float top, - float nearVal, - float farVal, +glm_ortho(float left, float right, + float bottom, float top, + float nearVal, float farVal, mat4 dest) { float rl, tb, fn; @@ -218,9 +201,7 @@ glm_ortho_default(float aspect, mat4 dest) { */ CGLM_INLINE void -glm_ortho_default_s(float aspect, - float size, - mat4 dest) { +glm_ortho_default_s(float aspect, float size, mat4 dest) { if (aspect >= 1.0f) { glm_ortho(-size * aspect, size * aspect, @@ -420,12 +401,9 @@ glm_look_anyup(vec3 eye, vec3 dir, mat4 dest) { CGLM_INLINE void glm_persp_decomp(mat4 proj, - float * __restrict nearVal, - float * __restrict farVal, - float * __restrict top, - float * __restrict bottom, - float * __restrict left, - float * __restrict right) { + float * __restrict nearVal, float * __restrict farVal, + float * __restrict top, float * __restrict bottom, + float * __restrict left, float * __restrict right) { float m00, m11, m20, m21, m22, m32, n, f; float n_m11, n_m00; diff --git a/include/cglm/struct/cam.h b/include/cglm/struct/cam.h index 0446bf0..dc2427f 100644 --- a/include/cglm/struct/cam.h +++ b/include/cglm/struct/cam.h @@ -14,7 +14,7 @@ float bottom, float top, float nearVal, float farVal) CGLM_INLINE mat4s glms_ortho_aabb(vec3s box[2]); - CGLM_INLINE mat4s glms_ortho_aabb_p(vec3s box[2], float padding); + CGLM_INLINE mat4s glms_ortho_aabb_p(vec3s box[2], float padding); CGLM_INLINE mat4s glms_ortho_aabb_pz(vec3s box[2], float padding); CGLM_INLINE mat4s glms_ortho_default(float aspect) CGLM_INLINE mat4s glms_ortho_default_s(float aspect, float size) @@ -29,22 +29,13 @@ CGLM_INLINE mat4s glms_look(vec3s eye, vec3s dir, vec3s up) CGLM_INLINE mat4s glms_look_anyup(vec3s eye, vec3s dir) CGLM_INLINE void glms_persp_decomp(mat4s proj, - float *nearVal, - float *farVal, - float *top, - float *bottom, - float *left, - float *right) - CGLM_INLINE void glms_persp_decompv(mat4s proj, float dest[6]) - CGLM_INLINE void glms_persp_decomp_x(mat4s proj, - float *left, - float *right) - CGLM_INLINE void glms_persp_decomp_y(mat4s proj, - float *top, - float *bottom) - CGLM_INLINE void glms_persp_decomp_z(mat4s proj, - float *nearVal, - float *farVal) + float *nearv, float *farv, + float *top, float *bottom, + float *left, float *right) + CGLM_INLINE void glms_persp_decompv(mat4s proj, float dest[6]) + CGLM_INLINE void glms_persp_decomp_x(mat4s proj, float *left, float *right) + CGLM_INLINE void glms_persp_decomp_y(mat4s proj, float *top, float *bottom) + CGLM_INLINE void glms_persp_decomp_z(mat4s proj, float *nearv, float *farv) CGLM_INLINE void glms_persp_decomp_far(mat4s proj, float *farVal) CGLM_INLINE void glms_persp_decomp_near(mat4s proj, float *nearVal) CGLM_INLINE float glms_persp_fovy(mat4s proj) @@ -326,12 +317,9 @@ glms_look_anyup(vec3s eye, vec3s dir) { CGLM_INLINE void glms_persp_decomp(mat4s proj, - float * __restrict nearVal, - float * __restrict farVal, - float * __restrict top, - float * __restrict bottom, - float * __restrict left, - float * __restrict right) { + float * __restrict nearVal, float * __restrict farVal, + float * __restrict top, float * __restrict bottom, + float * __restrict left, float * __restrict right) { glm_persp_decomp(proj.raw, nearVal, farVal, top, bottom, left, right); }