mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Fixed in mat4x3 conversion #829
This commit is contained in:
parent
9749727c2d
commit
cc80d7674b
@ -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
|
||||
|
||||
|
@ -171,7 +171,7 @@ namespace glm
|
||||
template<typename T, qualifier Q>
|
||||
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<typename T, qualifier Q>
|
||||
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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user