mirror of
https://github.com/g-truc/glm.git
synced 2024-11-26 02:04:35 +00:00
Merge pull request #1094 from gottfriedleibniz/fix/mat2x3
fix mat2 constructors #1094
This commit is contained in:
commit
89d0eb1f06
@ -22,7 +22,7 @@ namespace glm
|
|||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<2, 2, T, P> const& m)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<2, 2, T, P> const& m)
|
||||||
# if GLM_HAS_INITIALIZER_LISTS
|
# if GLM_HAS_INITIALIZER_LISTS
|
||||||
: value{m[0], m[1]}
|
: value{col_type(m[0]), col_type(m[1])}
|
||||||
# endif
|
# endif
|
||||||
{
|
{
|
||||||
# if !GLM_HAS_INITIALIZER_LISTS
|
# if !GLM_HAS_INITIALIZER_LISTS
|
||||||
|
@ -20,7 +20,7 @@ namespace glm
|
|||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<2, 3, T, P> const& m)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<2, 3, T, P> const& m)
|
||||||
# if GLM_HAS_INITIALIZER_LISTS
|
# if GLM_HAS_INITIALIZER_LISTS
|
||||||
: value{m.value[0], m.value[1]}
|
: value{col_type(m[0]), col_type(m[1])}
|
||||||
# endif
|
# endif
|
||||||
{
|
{
|
||||||
# if !GLM_HAS_INITIALIZER_LISTS
|
# if !GLM_HAS_INITIALIZER_LISTS
|
||||||
|
@ -20,7 +20,7 @@ namespace glm
|
|||||||
template<qualifier P>
|
template<qualifier P>
|
||||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<2, 4, T, P> const& m)
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<2, 4, T, P> const& m)
|
||||||
# if GLM_HAS_INITIALIZER_LISTS
|
# if GLM_HAS_INITIALIZER_LISTS
|
||||||
: value{m[0], m[1]}
|
: value{col_type(m[0]), col_type(m[1])}
|
||||||
# endif
|
# endif
|
||||||
{
|
{
|
||||||
# if !GLM_HAS_INITIALIZER_LISTS
|
# if !GLM_HAS_INITIALIZER_LISTS
|
||||||
|
Loading…
Reference in New Issue
Block a user