From cc80d7674bd4084d6762650b14c830ea817d93bb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 5 Nov 2018 20:03:55 +0100 Subject: [PATCH] Fixed in mat4x3 conversion #829 --- glm/detail/setup.hpp | 6 +++--- glm/detail/type_mat4x3.inl | 4 ++-- readme.md | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 04430ea6..393b5144 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -6,9 +6,9 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 9 -#define GLM_VERSION_REVISION 3 -#define GLM_VERSION 993 -#define GLM_VERSION_MESSAGE "GLM: version 0.9.9.3" +#define GLM_VERSION_REVISION 4 +#define GLM_VERSION 994 +#define GLM_VERSION_MESSAGE "GLM: version 0.9.9.4" #define GLM_SETUP_INCLUDED GLM_VERSION diff --git a/glm/detail/type_mat4x3.inl b/glm/detail/type_mat4x3.inl index 702025dd..11b1ee35 100644 --- a/glm/detail/type_mat4x3.inl +++ b/glm/detail/type_mat4x3.inl @@ -171,7 +171,7 @@ namespace glm template GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0)} + : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif { # if !GLM_HAS_INITIALIZER_LISTS @@ -227,7 +227,7 @@ namespace glm template GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 1), col_type(0)} + : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 1), col_type(m[3], 0)} # endif { # if !GLM_HAS_INITIALIZER_LISTS diff --git a/readme.md b/readme.md index c9e64a52..b106bad5 100644 --- a/readme.md +++ b/readme.md @@ -52,6 +52,10 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) ## Release notes +### [GLM 0.9.9.4](https://github.com/g-truc/glm/tree/master) - 2018-1X-XX +#### Fixes: +- Fixed in mat4x3 conversion #829 + ### [GLM 0.9.9.3](https://github.com/g-truc/glm/releases/tag/0.9.9.3) - 2018-10-31 #### Features: - Added equal and notEqual overload with max ULPs parameters for scalar numbers #121