From af6f1d7b8f975a9a642f211fb2dbc1ece201bb6d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 5 Jan 2020 15:26:50 +0100 Subject: [PATCH] Fixed EXT_matrix_clip_space perspectiveFov --- glm/ext/matrix_clip_space.inl | 6 +++--- readme.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/glm/ext/matrix_clip_space.inl b/glm/ext/matrix_clip_space.inl index 1b4c7708..7e4df330 100644 --- a/glm/ext/matrix_clip_space.inl +++ b/glm/ext/matrix_clip_space.inl @@ -473,11 +473,11 @@ namespace glm { # if GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_LH_ZO return perspectiveFovLH_ZO(fov, width, height, zNear, zFar); - elif GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_LH_NO +# elif GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_LH_NO return perspectiveFovLH_NO(fov, width, height, zNear, zFar); - elif GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_RH_ZO +# elif GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_RH_ZO return perspectiveFovRH_ZO(fov, width, height, zNear, zFar); - elif GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_RH_NO +# elif GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_RH_NO return perspectiveFovRH_NO(fov, width, height, zNear, zFar); # endif } diff --git a/readme.md b/readme.md index 3486af0c..5397a4c1 100644 --- a/readme.md +++ b/readme.md @@ -66,6 +66,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) - Fixed ARM 64bit detection #949 - Fixed GLM_EXT_matrix_clip_space warnings #980 - Fixed Wimplicit-int-float-conversion warnings with clang 10+ #986 +- Fixed EXT_matrix_clip_space perspectiveFov ### [GLM 0.9.9.6](https://github.com/g-truc/glm/releases/tag/0.9.9.6) - 2019-09-08 #### Features: