summaryrefslogtreecommitdiffstats
path: root/external/include/glm/detail/type_mat4x4.inl
diff options
context:
space:
mode:
Diffstat (limited to 'external/include/glm/detail/type_mat4x4.inl')
-rw-r--r--external/include/glm/detail/type_mat4x4.inl381
1 files changed, 187 insertions, 194 deletions
diff --git a/external/include/glm/detail/type_mat4x4.inl b/external/include/glm/detail/type_mat4x4.inl
index 4b75d94..26157c6 100644
--- a/external/include/glm/detail/type_mat4x4.inl
+++ b/external/include/glm/detail/type_mat4x4.inl
@@ -1,17 +1,17 @@
/// @ref core
/// @file glm/detail/type_mat4x4.inl
-#include "func_matrix.hpp"
+#include "../matrix.hpp"
namespace glm
{
// -- Constructors --
-# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4()
+# if !GLM_HAS_DEFAULTED_FUNCTIONS || defined(GLM_FORCE_CTOR_INIT)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat()
{
-# ifndef GLM_FORCE_NO_CTOR_INIT
+# ifdef GLM_FORCE_CTOR_INIT
this->value[0] = col_type(1, 0, 0, 0);
this->value[1] = col_type(0, 1, 0, 0);
this->value[2] = col_type(0, 0, 1, 0);
@@ -21,8 +21,8 @@ namespace glm
# endif
# if !GLM_HAS_DEFAULTED_FUNCTIONS
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<4, 4, T, Q> const& m)
{
this->value[0] = m[0];
this->value[1] = m[1];
@@ -31,9 +31,9 @@ namespace glm
}
# endif//!GLM_HAS_DEFAULTED_FUNCTIONS
- template <typename T, precision P>
- template <precision Q>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x4<T, Q> const & m)
+ template<typename T, qualifier Q>
+ template<qualifier P>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<4, 4, T, P> const& m)
{
this->value[0] = m[0];
this->value[1] = m[1];
@@ -41,12 +41,8 @@ namespace glm
this->value[3] = m[3];
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(ctor)
- {}
-
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(T const & s)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(T const& s)
{
this->value[0] = col_type(s, 0, 0, 0);
this->value[1] = col_type(0, s, 0, 0);
@@ -54,13 +50,13 @@ namespace glm
this->value[3] = col_type(0, 0, 0, s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat
(
- T const & x0, T const & y0, T const & z0, T const & w0,
- T const & x1, T const & y1, T const & z1, T const & w1,
- T const & x2, T const & y2, T const & z2, T const & w2,
- T const & x3, T const & y3, T const & z3, T const & w3
+ T const& x0, T const& y0, T const& z0, T const& w0,
+ T const& x1, T const& y1, T const& z1, T const& w1,
+ T const& x2, T const& y2, T const& z2, T const& w2,
+ T const& x3, T const& y3, T const& z3, T const& w3
)
{
this->value[0] = col_type(x0, y0, z0, w0);
@@ -69,13 +65,13 @@ namespace glm
this->value[3] = col_type(x3, y3, z3, w3);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat
(
- col_type const & v0,
- col_type const & v1,
- col_type const & v2,
- col_type const & v3
+ col_type const& v0,
+ col_type const& v1,
+ col_type const& v2,
+ col_type const& v3
)
{
this->value[0] = v0;
@@ -84,12 +80,9 @@ namespace glm
this->value[3] = v3;
}
- template <typename T, precision P>
- template <typename U, precision Q>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
- (
- tmat4x4<U, Q> const & m
- )
+ template<typename T, qualifier Q>
+ template<typename U, qualifier P>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<4, 4, U, P> const& m)
{
this->value[0] = col_type(m[0]);
this->value[1] = col_type(m[1]);
@@ -99,18 +92,18 @@ namespace glm
// -- Conversions --
- template <typename T, precision P>
- template <
+ template<typename T, qualifier Q>
+ template<
typename X1, typename Y1, typename Z1, typename W1,
typename X2, typename Y2, typename Z2, typename W2,
typename X3, typename Y3, typename Z3, typename W3,
typename X4, typename Y4, typename Z4, typename W4>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat
(
- X1 const & x1, Y1 const & y1, Z1 const & z1, W1 const & w1,
- X2 const & x2, Y2 const & y2, Z2 const & z2, W2 const & w2,
- X3 const & x3, Y3 const & y3, Z3 const & z3, W3 const & w3,
- X4 const & x4, Y4 const & y4, Z4 const & z4, W4 const & w4
+ X1 const& x1, Y1 const& y1, Z1 const& z1, W1 const& w1,
+ X2 const& x2, Y2 const& y2, Z2 const& z2, W2 const& w2,
+ X3 const& x3, Y3 const& y3, Z3 const& z3, W3 const& w3,
+ X4 const& x4, Y4 const& y4, Z4 const& z4, W4 const& w4
)
{
GLM_STATIC_ASSERT(std::numeric_limits<X1>::is_iec559 || std::numeric_limits<X1>::is_integer || GLM_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid.");
@@ -138,16 +131,16 @@ namespace glm
this->value[2] = col_type(static_cast<T>(x3), value_type(y3), value_type(z3), value_type(w3));
this->value[3] = col_type(static_cast<T>(x4), value_type(y4), value_type(z4), value_type(w4));
}
-
- template <typename T, precision P>
- template <typename V1, typename V2, typename V3, typename V4>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4
+
+ template<typename T, qualifier Q>
+ template<typename V1, typename V2, typename V3, typename V4>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat
(
- tvec4<V1, P> const & v1,
- tvec4<V2, P> const & v2,
- tvec4<V3, P> const & v3,
- tvec4<V4, P> const & v4
- )
+ vec<4, V1, Q> const& v1,
+ vec<4, V2, Q> const& v2,
+ vec<4, V3, Q> const& v3,
+ vec<4, V4, Q> const& v4
+ )
{
GLM_STATIC_ASSERT(std::numeric_limits<V1>::is_iec559 || std::numeric_limits<V1>::is_integer || GLM_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid.");
GLM_STATIC_ASSERT(std::numeric_limits<V2>::is_iec559 || std::numeric_limits<V2>::is_integer || GLM_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid.");
@@ -162,8 +155,8 @@ namespace glm
// -- Matrix conversions --
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat2x2<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<2, 2, T, Q> const& m)
{
this->value[0] = col_type(m[0], 0, 0);
this->value[1] = col_type(m[1], 0, 0);
@@ -171,8 +164,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat3x3<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<3, 3, T, Q> const& m)
{
this->value[0] = col_type(m[0], 0);
this->value[1] = col_type(m[1], 0);
@@ -180,8 +173,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat2x3<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<2, 3, T, Q> const& m)
{
this->value[0] = col_type(m[0], 0);
this->value[1] = col_type(m[1], 0);
@@ -189,8 +182,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat3x2<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<3, 2, T, Q> const& m)
{
this->value[0] = col_type(m[0], 0, 0);
this->value[1] = col_type(m[1], 0, 0);
@@ -198,8 +191,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat2x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<2, 4, T, Q> const& m)
{
this->value[0] = m[0];
this->value[1] = m[1];
@@ -207,8 +200,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x2<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<4, 2, T, Q> const& m)
{
this->value[0] = col_type(m[0], 0, 0);
this->value[1] = col_type(m[1], 0, 0);
@@ -216,8 +209,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat3x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<3, 4, T, Q> const& m)
{
this->value[0] = m[0];
this->value[1] = m[1];
@@ -225,8 +218,8 @@ namespace glm
this->value[3] = col_type(0, 0, 0, 1);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>::tmat4x4(tmat4x3<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<4, 4, T, Q>::mat(mat<4, 3, T, Q> const& m)
{
this->value[0] = col_type(m[0], 0);
this->value[1] = col_type(m[1], 0);
@@ -236,15 +229,15 @@ namespace glm
// -- Accesses --
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type & tmat4x4<T, P>::operator[](typename tmat4x4<T, P>::length_type i)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::col_type & mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i)
{
assert(i < this->length());
return this->value[i];
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type const & tmat4x4<T, P>::operator[](typename tmat4x4<T, P>::length_type i) const
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const
{
assert(i < this->length());
return this->value[i];
@@ -253,8 +246,8 @@ namespace glm
// -- Unary arithmetic operators --
# if !GLM_HAS_DEFAULTED_FUNCTIONS
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator=(tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, T, Q> const& m)
{
//memcpy could be faster
//memcpy(&this->value, &m.value, 16 * sizeof(valType));
@@ -266,9 +259,9 @@ namespace glm
}
# endif//!GLM_HAS_DEFAULTED_FUNCTIONS
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator=(tmat4x4<U, P> const & m)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, U, Q> const& m)
{
//memcpy could be faster
//memcpy(&this->value, &m.value, 16 * sizeof(valType));
@@ -279,9 +272,9 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator+=(U s)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator+=(U s)
{
this->value[0] += s;
this->value[1] += s;
@@ -290,9 +283,9 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P>& tmat4x4<T, P>::operator+=(tmat4x4<U, P> const & m)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator+=(mat<4, 4, U, Q> const& m)
{
this->value[0] += m[0];
this->value[1] += m[1];
@@ -301,9 +294,9 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator-=(U s)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator-=(U s)
{
this->value[0] -= s;
this->value[1] -= s;
@@ -312,9 +305,9 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator-=(tmat4x4<U, P> const & m)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator-=(mat<4, 4, U, Q> const& m)
{
this->value[0] -= m[0];
this->value[1] -= m[1];
@@ -323,9 +316,9 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator*=(U s)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator*=(U s)
{
this->value[0] *= s;
this->value[1] *= s;
@@ -334,16 +327,16 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator*=(tmat4x4<U, P> const & m)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator*=(mat<4, 4, U, Q> const& m)
{
return (*this = *this * m);
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator/=(U s)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator/=(U s)
{
this->value[0] /= s;
this->value[1] /= s;
@@ -352,17 +345,17 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- template <typename U>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator/=(tmat4x4<U, P> const & m)
+ template<typename T, qualifier Q>
+ template<typename U>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator/=(mat<4, 4, U, Q> const& m)
{
return *this *= inverse(m);
}
// -- Increment and decrement operators --
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator++()
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator++()
{
++this->value[0];
++this->value[1];
@@ -371,8 +364,8 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> & tmat4x4<T, P>::operator--()
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator--()
{
--this->value[0];
--this->value[1];
@@ -381,34 +374,34 @@ namespace glm
return *this;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> tmat4x4<T, P>::operator++(int)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> mat<4, 4, T, Q>::operator++(int)
{
- tmat4x4<T, P> Result(*this);
+ mat<4, 4, T, Q> Result(*this);
++*this;
return Result;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> tmat4x4<T, P>::operator--(int)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> mat<4, 4, T, Q>::operator--(int)
{
- tmat4x4<T, P> Result(*this);
+ mat<4, 4, T, Q> Result(*this);
--*this;
return Result;
}
// -- Unary constant operators --
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m)
{
return m;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
-m[0],
-m[1],
-m[2],
@@ -417,91 +410,91 @@ namespace glm
// -- Binary arithmetic operators --
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(tmat4x4<T, P> const & m, T const & s)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T const& s)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m[0] + s,
m[1] + s,
m[2] + s,
m[3] + s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(T const & s, tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator+(T const& s, mat<4, 4, T, Q> const& m)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m[0] + s,
m[1] + s,
m[2] + s,
m[3] + s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator+(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m1[0] + m2[0],
m1[1] + m2[1],
m1[2] + m2[2],
m1[3] + m2[3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(tmat4x4<T, P> const & m, T const & s)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T const& s)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m[0] - s,
m[1] - s,
m[2] - s,
m[3] - s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(T const & s, tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator-(T const& s, mat<4, 4, T, Q> const& m)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
s - m[0],
s - m[1],
s - m[2],
s - m[3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator-(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m1[0] - m2[0],
m1[1] - m2[1],
m1[2] - m2[2],
m1[3] - m2[3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(tmat4x4<T, P> const & m, T const & s)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T const & s)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m[0] * s,
m[1] * s,
m[2] * s,
m[3] * s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(T const & s, tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator*(T const& s, mat<4, 4, T, Q> const& m)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m[0] * s,
m[1] * s,
m[2] * s,
m[3] * s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type operator*
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::col_type operator*
(
- tmat4x4<T, P> const & m,
- typename tmat4x4<T, P>::row_type const & v
+ mat<4, 4, T, Q> const& m,
+ typename mat<4, 4, T, Q>::row_type const& v
)
{
/*
@@ -520,24 +513,24 @@ namespace glm
__m128 a2 = _mm_add_ps(a0, a1);
- return typename tmat4x4<T, P>::col_type(a2);
+ return typename mat<4, 4, T, Q>::col_type(a2);
*/
- typename tmat4x4<T, P>::col_type const Mov0(v[0]);
- typename tmat4x4<T, P>::col_type const Mov1(v[1]);
- typename tmat4x4<T, P>::col_type const Mul0 = m[0] * Mov0;
- typename tmat4x4<T, P>::col_type const Mul1 = m[1] * Mov1;
- typename tmat4x4<T, P>::col_type const Add0 = Mul0 + Mul1;
- typename tmat4x4<T, P>::col_type const Mov2(v[2]);
- typename tmat4x4<T, P>::col_type const Mov3(v[3]);
- typename tmat4x4<T, P>::col_type const Mul2 = m[2] * Mov2;
- typename tmat4x4<T, P>::col_type const Mul3 = m[3] * Mov3;
- typename tmat4x4<T, P>::col_type const Add1 = Mul2 + Mul3;
- typename tmat4x4<T, P>::col_type const Add2 = Add0 + Add1;
+ typename mat<4, 4, T, Q>::col_type const Mov0(v[0]);
+ typename mat<4, 4, T, Q>::col_type const Mov1(v[1]);
+ typename mat<4, 4, T, Q>::col_type const Mul0 = m[0] * Mov0;
+ typename mat<4, 4, T, Q>::col_type const Mul1 = m[1] * Mov1;
+ typename mat<4, 4, T, Q>::col_type const Add0 = Mul0 + Mul1;
+ typename mat<4, 4, T, Q>::col_type const Mov2(v[2]);
+ typename mat<4, 4, T, Q>::col_type const Mov3(v[3]);
+ typename mat<4, 4, T, Q>::col_type const Mul2 = m[2] * Mov2;
+ typename mat<4, 4, T, Q>::col_type const Mul3 = m[3] * Mov3;
+ typename mat<4, 4, T, Q>::col_type const Add1 = Mul2 + Mul3;
+ typename mat<4, 4, T, Q>::col_type const Add2 = Add0 + Add1;
return Add2;
/*
- return typename tmat4x4<T, P>::col_type(
+ return typename mat<4, 4, T, Q>::col_type(
m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2] + m[3][0] * v[3],
m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2] + m[3][1] * v[3],
m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2] + m[3][2] * v[3],
@@ -545,24 +538,24 @@ namespace glm
*/
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::row_type operator*
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::row_type operator*
(
- typename tmat4x4<T, P>::col_type const & v,
- tmat4x4<T, P> const & m
+ typename mat<4, 4, T, Q>::col_type const& v,
+ mat<4, 4, T, Q> const& m
)
{
- return typename tmat4x4<T, P>::row_type(
+ return typename mat<4, 4, T, Q>::row_type(
m[0][0] * v[0] + m[0][1] * v[1] + m[0][2] * v[2] + m[0][3] * v[3],
m[1][0] * v[0] + m[1][1] * v[1] + m[1][2] * v[2] + m[1][3] * v[3],
m[2][0] * v[0] + m[2][1] * v[1] + m[2][2] * v[2] + m[2][3] * v[3],
m[3][0] * v[0] + m[3][1] * v[1] + m[3][2] * v[2] + m[3][3] * v[3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat2x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat2x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2)
{
- return tmat2x4<T, P>(
+ return mat<2, 4, T, Q>(
m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2] + m1[3][2] * m2[0][3],
@@ -573,10 +566,10 @@ namespace glm
m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2] + m1[3][3] * m2[1][3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat3x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat3x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2)
{
- return tmat3x4<T, P>(
+ return mat<3, 4, T, Q>(
m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3],
m1[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2] + m1[3][1] * m2[0][3],
m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2] + m1[3][2] * m2[0][3],
@@ -591,20 +584,20 @@ namespace glm
m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1] + m1[2][3] * m2[2][2] + m1[3][3] * m2[2][3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator*(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2)
{
- typename tmat4x4<T, P>::col_type const SrcA0 = m1[0];
- typename tmat4x4<T, P>::col_type const SrcA1 = m1[1];
- typename tmat4x4<T, P>::col_type const SrcA2 = m1[2];
- typename tmat4x4<T, P>::col_type const SrcA3 = m1[3];
+ typename mat<4, 4, T, Q>::col_type const SrcA0 = m1[0];
+ typename mat<4, 4, T, Q>::col_type const SrcA1 = m1[1];
+ typename mat<4, 4, T, Q>::col_type const SrcA2 = m1[2];
+ typename mat<4, 4, T, Q>::col_type const SrcA3 = m1[3];
- typename tmat4x4<T, P>::col_type const SrcB0 = m2[0];
- typename tmat4x4<T, P>::col_type const SrcB1 = m2[1];
- typename tmat4x4<T, P>::col_type const SrcB2 = m2[2];
- typename tmat4x4<T, P>::col_type const SrcB3 = m2[3];
+ typename mat<4, 4, T, Q>::col_type const SrcB0 = m2[0];
+ typename mat<4, 4, T, Q>::col_type const SrcB1 = m2[1];
+ typename mat<4, 4, T, Q>::col_type const SrcB2 = m2[2];
+ typename mat<4, 4, T, Q>::col_type const SrcB3 = m2[3];
- tmat4x4<T, P> Result(uninitialize);
+ mat<4, 4, T, Q> Result;
Result[0] = SrcA0 * SrcB0[0] + SrcA1 * SrcB0[1] + SrcA2 * SrcB0[2] + SrcA3 * SrcB0[3];
Result[1] = SrcA0 * SrcB1[0] + SrcA1 * SrcB1[1] + SrcA2 * SrcB1[2] + SrcA3 * SrcB1[3];
Result[2] = SrcA0 * SrcB2[0] + SrcA1 * SrcB2[1] + SrcA2 * SrcB2[2] + SrcA3 * SrcB2[3];
@@ -612,55 +605,55 @@ namespace glm
return Result;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator/(tmat4x4<T, P> const & m, T const & s)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T const& s)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
m[0] / s,
m[1] / s,
m[2] / s,
m[3] / s);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator/(T const & s, tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator/(T const& s, mat<4, 4, T, Q> const& m)
{
- return tmat4x4<T, P>(
+ return mat<4, 4, T, Q>(
s / m[0],
s / m[1],
s / m[2],
s / m[3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::col_type operator/(tmat4x4<T, P> const & m, typename tmat4x4<T, P>::row_type const & v)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::col_type operator/(mat<4, 4, T, Q> const& m, typename mat<4, 4, T, Q>::row_type const& v)
{
return inverse(m) * v;
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER typename tmat4x4<T, P>::row_type operator/(typename tmat4x4<T, P>::col_type const & v, tmat4x4<T, P> const & m)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER typename mat<4, 4, T, Q>::row_type operator/(typename mat<4, 4, T, Q>::col_type const& v, mat<4, 4, T, Q> const& m)
{
return v * inverse(m);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER tmat4x4<T, P> operator/(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2)
{
- tmat4x4<T, P> m1_copy(m1);
+ mat<4, 4, T, Q> m1_copy(m1);
return m1_copy /= m2;
}
// -- Boolean operators --
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator==(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2)
{
return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]);
}
- template <typename T, precision P>
- GLM_FUNC_QUALIFIER bool operator!=(tmat4x4<T, P> const & m1, tmat4x4<T, P> const & m2)
+ template<typename T, qualifier Q>
+ GLM_FUNC_QUALIFIER bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2)
{
return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 11:14:01 +0200