This commit is contained in:
Recep Aslantas
2017-02-27 16:51:01 +03:00
parent ec371099bc
commit ba0973054e

View File

@@ -93,7 +93,7 @@ glm_ortho(float left,
CGLM_INLINE CGLM_INLINE
void void
glm_ortho_default(float aspect, glm_ortho_default(float aspect,
mat4 dest) { mat4 dest) {
if (aspect >= 1.0f) { if (aspect >= 1.0f) {
glm_ortho(-1.0f * aspect, glm_ortho(-1.0f * aspect,
1.0f * aspect, 1.0f * aspect,
@@ -106,12 +106,12 @@ glm_ortho_default(float aspect,
} }
glm_ortho(-1.0f, glm_ortho(-1.0f,
1.0f, 1.0f,
-1.0f / aspect, -1.0f / aspect,
1.0f / aspect, 1.0f / aspect,
-100.0f, -100.0f,
100.0f, 100.0f,
dest); dest);
} }
/*! /*!
@@ -124,8 +124,8 @@ glm_ortho_default(float aspect,
CGLM_INLINE CGLM_INLINE
void void
glm_ortho_default_s(float aspect, glm_ortho_default_s(float aspect,
float size, float size,
mat4 dest) { mat4 dest) {
if (aspect >= 1.0f) { if (aspect >= 1.0f) {
glm_ortho(-size * aspect, glm_ortho(-size * aspect,
size * aspect, size * aspect,
@@ -138,12 +138,12 @@ glm_ortho_default_s(float aspect,
} }
glm_ortho(-size, glm_ortho(-size,
size, size,
-size / aspect, -size / aspect,
size / aspect, size / aspect,
-size - 100.0f, -size - 100.0f,
size + 100.0f, size + 100.0f,
dest); dest);
} }
/*! /*!
@@ -186,7 +186,7 @@ glm_perspective(float fovy,
CGLM_INLINE CGLM_INLINE
void void
glm_perspective_default(float aspect, glm_perspective_default(float aspect,
mat4 dest) { mat4 dest) {
glm_perspective((float)CGLM_PI_4, glm_perspective((float)CGLM_PI_4,
aspect, aspect,
0.01f, 0.01f,
@@ -205,7 +205,7 @@ glm_perspective_default(float aspect,
CGLM_INLINE CGLM_INLINE
void void
glm_perspective_resize(float aspect, glm_perspective_resize(float aspect,
mat4 proj) { mat4 proj) {
if (proj[0][0] == 0) if (proj[0][0] == 0)
return; return;