|
@@ -28,15 +28,15 @@ namespace glm
|
|
|
this->value[1] = m.value[1];
|
|
this->value[1] = m.value[1];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(T scalar)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(T scalar)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(scalar, 0, 0);
|
|
this->value[0] = col_type(scalar, 0, 0);
|
|
|
this->value[1] = col_type(0, scalar, 0);
|
|
this->value[1] = col_type(0, scalar, 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
|
|
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat
|
|
|
(
|
|
(
|
|
|
T x0, T y0, T z0,
|
|
T x0, T y0, T z0,
|
|
|
T x1, T y1, T z1
|
|
T x1, T y1, T z1
|
|
@@ -46,7 +46,7 @@ namespace glm
|
|
|
this->value[1] = col_type(x1, y1, z1);
|
|
this->value[1] = col_type(x1, y1, z1);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(col_type const& v0, col_type const& v1)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(col_type const& v0, col_type const& v1)
|
|
|
{
|
|
{
|
|
|
this->value[0] = v0;
|
|
this->value[0] = v0;
|
|
@@ -59,7 +59,7 @@ namespace glm
|
|
|
template<
|
|
template<
|
|
|
typename X1, typename Y1, typename Z1,
|
|
typename X1, typename Y1, typename Z1,
|
|
|
typename X2, typename Y2, typename Z2>
|
|
typename X2, typename Y2, typename Z2>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat
|
|
|
|
|
|
|
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat
|
|
|
(
|
|
(
|
|
|
X1 x1, Y1 y1, Z1 z1,
|
|
X1 x1, Y1 y1, Z1 z1,
|
|
|
X2 x2, Y2 y2, Z2 z2
|
|
X2 x2, Y2 y2, Z2 z2
|
|
@@ -68,7 +68,7 @@ namespace glm
|
|
|
this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1));
|
|
this->value[0] = col_type(static_cast<T>(x1), value_type(y1), value_type(z1));
|
|
|
this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2));
|
|
this->value[1] = col_type(static_cast<T>(x2), value_type(y2), value_type(z2));
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
template<typename T, qualifier Q>
|
|
template<typename T, qualifier Q>
|
|
|
template<typename V1, typename V2>
|
|
template<typename V1, typename V2>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2)
|
|
@@ -87,56 +87,56 @@ namespace glm
|
|
|
this->value[1] = col_type(m[1]);
|
|
this->value[1] = col_type(m[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<2, 2, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<2, 2, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0);
|
|
this->value[0] = col_type(m[0], 0);
|
|
|
this->value[1] = col_type(m[1], 0);
|
|
this->value[1] = col_type(m[1], 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<3, 3, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<3, 3, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
this->value[1] = col_type(m[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<4, 4, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<4, 4, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
this->value[1] = col_type(m[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<2, 4, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<2, 4, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
this->value[1] = col_type(m[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<3, 2, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<3, 2, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0);
|
|
this->value[0] = col_type(m[0], 0);
|
|
|
this->value[1] = col_type(m[1], 0);
|
|
this->value[1] = col_type(m[1], 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<3, 4, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<3, 4, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
this->value[1] = col_type(m[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<4, 2, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<4, 2, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0);
|
|
this->value[0] = col_type(m[0], 0);
|
|
|
this->value[1] = col_type(m[1], 0);
|
|
this->value[1] = col_type(m[1], 0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<4, 3, T, Q> const& m)
|
|
GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<2, 3, T, Q>::mat(mat<4, 3, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = m[0];
|
|
this->value[0] = m[0];
|
|
@@ -163,7 +163,7 @@ namespace glm
|
|
|
|
|
|
|
|
# if !GLM_HAS_DEFAULTED_FUNCTIONS
|
|
# if !GLM_HAS_DEFAULTED_FUNCTIONS
|
|
|
template<typename T, qualifier Q>
|
|
template<typename T, qualifier Q>
|
|
|
- GLM_FUNC_QUALIFIER mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, T, Q> const& m)
|
|
|
|
|
|
|
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, T, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = m[0];
|
|
this->value[0] = m[0];
|
|
|
this->value[1] = m[1];
|
|
this->value[1] = m[1];
|
|
@@ -173,7 +173,7 @@ namespace glm
|
|
|
|
|
|
|
|
template<typename T, qualifier Q>
|
|
template<typename T, qualifier Q>
|
|
|
template<typename U>
|
|
template<typename U>
|
|
|
- GLM_FUNC_QUALIFIER mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, U, Q> const& m)
|
|
|
|
|
|
|
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, U, Q> const& m)
|
|
|
{
|
|
{
|
|
|
this->value[0] = m[0];
|
|
this->value[0] = m[0];
|
|
|
this->value[1] = m[1];
|
|
this->value[1] = m[1];
|
|
@@ -286,7 +286,7 @@ namespace glm
|
|
|
|
|
|
|
|
// -- Binary arithmetic operators --
|
|
// -- Binary arithmetic operators --
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar)
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar)
|
|
|
{
|
|
{
|
|
|
return mat<2, 3, T, Q>(
|
|
return mat<2, 3, T, Q>(
|
|
@@ -294,7 +294,7 @@ namespace glm
|
|
|
m[1] + scalar);
|
|
m[1] + scalar);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2)
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2)
|
|
|
{
|
|
{
|
|
|
return mat<2, 3, T, Q>(
|
|
return mat<2, 3, T, Q>(
|
|
@@ -302,7 +302,7 @@ namespace glm
|
|
|
m1[1] + m2[1]);
|
|
m1[1] + m2[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar)
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar)
|
|
|
{
|
|
{
|
|
|
return mat<2, 3, T, Q>(
|
|
return mat<2, 3, T, Q>(
|
|
@@ -310,7 +310,7 @@ namespace glm
|
|
|
m[1] - scalar);
|
|
m[1] - scalar);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2)
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2)
|
|
|
{
|
|
{
|
|
|
return mat<2, 3, T, Q>(
|
|
return mat<2, 3, T, Q>(
|
|
@@ -318,7 +318,7 @@ namespace glm
|
|
|
m1[1] - m2[1]);
|
|
m1[1] - m2[1]);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- template<typename T, qualifier Q>
|
|
|
|
|
|
|
+ template<typename T, qualifier Q>
|
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar)
|
|
GLM_FUNC_QUALIFIER mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar)
|
|
|
{
|
|
{
|
|
|
return mat<2, 3, T, Q>(
|
|
return mat<2, 3, T, Q>(
|