|
|
@@ -36,7 +36,7 @@ namespace glm
|
|
|
|
|
|
# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4()
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4()
|
|
|
{
|
|
|
# ifndef GLM_FORCE_NO_CTOR_INIT
|
|
|
this->value[0] = col_type(1, 0, 0, 0);
|
|
|
@@ -48,7 +48,7 @@ namespace glm
|
|
|
|
|
|
# if !GLM_HAS_DEFAULTED_FUNCTIONS
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat3x4<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x4<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = m.value[0];
|
|
|
this->value[1] = m.value[1];
|
|
|
@@ -58,7 +58,7 @@ namespace glm
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
template <precision Q>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat3x4<T, Q> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x4<T, Q> const & m)
|
|
|
{
|
|
|
this->value[0] = m.value[0];
|
|
|
this->value[1] = m.value[1];
|
|
|
@@ -70,7 +70,7 @@ namespace glm
|
|
|
{}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(T scalar)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(T scalar)
|
|
|
{
|
|
|
this->value[0] = col_type(scalar, 0, 0, 0);
|
|
|
this->value[1] = col_type(0, scalar, 0, 0);
|
|
|
@@ -78,7 +78,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
|
|
|
(
|
|
|
T x0, T y0, T z0, T w0,
|
|
|
T x1, T y1, T z1, T w1,
|
|
|
@@ -91,7 +91,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
|
|
|
(
|
|
|
col_type const & v0,
|
|
|
col_type const & v1,
|
|
|
@@ -110,7 +110,7 @@ namespace glm
|
|
|
typename X1, typename Y1, typename Z1, typename W1,
|
|
|
typename X2, typename Y2, typename Z2, typename W2,
|
|
|
typename X3, typename Y3, typename Z3, typename W3>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
|
|
|
(
|
|
|
X1 x1, Y1 y1, Z1 z1, W1 w1,
|
|
|
X2 x2, Y2 y2, Z2 z2, W2 w2,
|
|
|
@@ -124,7 +124,7 @@ namespace glm
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
template <typename V1, typename V2, typename V3>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4
|
|
|
(
|
|
|
tvec4<V1, P> const & v1,
|
|
|
tvec4<V2, P> const & v2,
|
|
|
@@ -140,7 +140,7 @@ namespace glm
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
template <typename U, precision Q>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat3x4<U, Q> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x4<U, Q> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
|
@@ -148,7 +148,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat2x2<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat2x2<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0, 0);
|
|
|
this->value[1] = col_type(m[1], 0, 0);
|
|
|
@@ -156,7 +156,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat3x3<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x3<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0);
|
|
|
this->value[1] = col_type(m[1], 0);
|
|
|
@@ -164,7 +164,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat4x4<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat4x4<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
|
@@ -172,7 +172,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat2x3<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat2x3<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0);
|
|
|
this->value[1] = col_type(m[1], 0);
|
|
|
@@ -180,7 +180,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat3x2<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat3x2<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0, 0);
|
|
|
this->value[1] = col_type(m[1], 0, 0);
|
|
|
@@ -188,7 +188,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat2x4<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat2x4<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0]);
|
|
|
this->value[1] = col_type(m[1]);
|
|
|
@@ -196,7 +196,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat4x2<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat4x2<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0, 0);
|
|
|
this->value[1] = col_type(m[1], 0, 0);
|
|
|
@@ -204,7 +204,7 @@ namespace glm
|
|
|
}
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4<T, P>::tmat3x4(tmat4x3<T, P> const & m)
|
|
|
+ GLM_FUNC_QUALIFIER tmat3x4<T, P>::tmat3x4(tmat4x3<T, P> const & m)
|
|
|
{
|
|
|
this->value[0] = col_type(m[0], 0);
|
|
|
this->value[1] = col_type(m[1], 0);
|