From 170e2e9fccc5e0bb77ec79da7cbb4c51b3176053 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Sat, 14 Jan 2017 12:22:23 +0200 Subject: [PATCH] convert PI to float to suppress warnings --- include/cglm-cam.h | 2 +- include/cglm-euler.h | 6 +++--- include/cglm-types.h | 4 ++++ include/cglm-util.h | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/cglm-cam.h b/include/cglm-cam.h index 6d55637..171d826 100644 --- a/include/cglm-cam.h +++ b/include/cglm-cam.h @@ -146,7 +146,7 @@ glm_perspective_default(mat4 dest) { int32_t rect[4]; glm_platfom_get_viewport_rect(rect); - glm_perspective((float)M_PI_4, + glm_perspective((float)CGLM_PI_4, (float)rect[2]/rect[3], 0.01f, 100.0f, diff --git a/include/cglm-euler.h b/include/cglm-euler.h index 117516f..637c850 100644 --- a/include/cglm-euler.h +++ b/include/cglm-euler.h @@ -50,7 +50,7 @@ glm_euler_angles(mat4 m, vec3 dest) { int path; a[0][1] = asinf(-m[0][2]); - a[1][1] = M_PI - a[0][1]; + a[1][1] = CGLM_PI - a[0][1]; cy1 = cosf(a[0][1]); cy2 = cosf(a[1][1]); @@ -67,12 +67,12 @@ glm_euler_angles(mat4 m, vec3 dest) { glm_vec_dup(a[path], dest); } else { dest[0] = atan2f(m[1][0], m[2][0]); - dest[1] = M_PI_2; + dest[1] = CGLM_PI_2; dest[2] = 0.0f; } } else { dest[0] = atan2f(-m[1][0], -m[2][0]); - dest[1] =-M_PI_2; + dest[1] =-CGLM_PI_2; dest[2] = 0.0f; } } diff --git a/include/cglm-types.h b/include/cglm-types.h index f60984e..85a19cd 100644 --- a/include/cglm-types.h +++ b/include/cglm-types.h @@ -23,4 +23,8 @@ typedef vec4 mat4[4]; typedef vec4 versor; +#define CGLM_PI (float)M_PI +#define CGLM_PI_2 (float)M_PI_2 +#define CGLM_PI_4 (float)M_PI_4 + #endif /* cglm_types_h */ diff --git a/include/cglm-util.h b/include/cglm-util.h index 8e8c535..b2f28a6 100644 --- a/include/cglm-util.h +++ b/include/cglm-util.h @@ -24,25 +24,25 @@ glm_sign(int val) { CGLM_INLINE float glm_rad(float deg) { - return deg * M_PI / 180.0f; + return deg * CGLM_PI / 180.0f; } CGLM_INLINE float glm_deg(float rad) { - return rad * 180.0f / M_PI; + return rad * 180.0f / CGLM_PI; } CGLM_INLINE void glm_make_rad(float *deg) { - *deg = *deg * M_PI / 180.0f; + *deg = *deg * CGLM_PI / 180.0f; } CGLM_INLINE void glm_make_deg(float *rad) { - *rad = *rad * 180.0f / M_PI; + *rad = *rad * 180.0f / CGLM_PI; } #endif /* cglm_util_h */