From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/detail/type_mat3x4.inl | 278 ++++++++++++++-------------- 1 file changed, 137 insertions(+), 141 deletions(-) (limited to 'external/include/glm/detail/type_mat3x4.inl') diff --git a/external/include/glm/detail/type_mat3x4.inl b/external/include/glm/detail/type_mat3x4.inl index 3596f26..c8562d1 100644 --- a/external/include/glm/detail/type_mat3x4.inl +++ b/external/include/glm/detail/type_mat3x4.inl @@ -5,11 +5,11 @@ namespace glm { // -- Constructors -- -# if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4() +# if !GLM_HAS_DEFAULTED_FUNCTIONS || defined(GLM_FORCE_CTOR_INIT) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); @@ -18,8 +18,8 @@ namespace glm # endif # if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x4 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat(mat<3, 4, T, Q> const& m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -27,29 +27,25 @@ namespace glm } # endif//!GLM_HAS_DEFAULTED_FUNCTIONS - template - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x4 const & m) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat(mat<3, 4, T, P> const& m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; this->value[2] = m.value[2]; } - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tmat3x4::tmat3x4(ctor) - {} - - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(T scalar) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat(T scalar) { this->value[0] = col_type(scalar, 0, 0, 0); this->value[1] = col_type(0, scalar, 0, 0); this->value[2] = col_type(0, 0, scalar, 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat ( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1, @@ -61,12 +57,12 @@ namespace glm this->value[2] = col_type(x2, y2, z2, w2); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat ( - col_type const & v0, - col_type const & v1, - col_type const & v2 + col_type const& v0, + col_type const& v1, + col_type const& v2 ) { this->value[0] = v0; @@ -76,12 +72,12 @@ namespace glm // -- Conversion constructors -- - template - template < + template + 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> - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat ( X1 x1, Y1 y1, Z1 z1, W1 w1, X2 x2, Y2 y2, Z2 z2, W2 w2, @@ -92,90 +88,90 @@ namespace glm this->value[1] = col_type(static_cast(x2), value_type(y2), value_type(z2), value_type(w2)); this->value[2] = col_type(static_cast(x3), value_type(y3), value_type(z3), value_type(w3)); } - - template - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 + + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat ( - tvec4 const & v1, - tvec4 const & v2, - tvec4 const & v3 + vec<4, V1, Q> const& v1, + vec<4, V2, Q> const& v2, + vec<4, V3, Q> const& v3 ) { this->value[0] = col_type(v1); this->value[1] = col_type(v2); this->value[2] = col_type(v3); } - + // -- Matrix conversions -- - template - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x4 const & m) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat(mat<3, 4, U, P> const& m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); this->value[2] = col_type(m[2]); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat2x2 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); this->value[2] = col_type(0, 0, 1, 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x3 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); this->value[2] = col_type(m[2], 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat4x4 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat(mat<4, 4, T, Q> const& m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); this->value[2] = col_type(m[2]); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat2x3 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); this->value[2] = col_type(0, 0, 1, 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x2 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); this->value[2] = col_type(m[2], 1, 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat2x4 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 4, T, Q>::mat(mat<2, 4, T, Q> const& m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); this->value[2] = col_type(0, 0, 1, 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat4x2 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); this->value[2] = col_type(m[2], 1, 0); } - template - GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat4x3 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR_CXX14 mat<3, 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); @@ -184,15 +180,15 @@ namespace glm // -- Accesses -- - template - GLM_FUNC_QUALIFIER typename tmat3x4::col_type & tmat3x4::operator[](typename tmat3x4::length_type i) + template + GLM_FUNC_QUALIFIER typename mat<3, 4, T, Q>::col_type & mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) { assert(i < this->length()); return this->value[i]; } - template - GLM_FUNC_QUALIFIER typename tmat3x4::col_type const & tmat3x4::operator[](typename tmat3x4::length_type i) const + template + GLM_FUNC_QUALIFIER typename mat<3, 4, T, Q>::col_type const& mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) const { assert(i < this->length()); return this->value[i]; @@ -201,8 +197,8 @@ namespace glm // -- Unary updatable operators -- # if !GLM_HAS_DEFAULTED_FUNCTIONS - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator=(tmat3x4 const & m) + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator=(mat<3, 4, T, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -211,9 +207,9 @@ namespace glm } # endif//!GLM_HAS_DEFAULTED_FUNCTIONS - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator=(tmat3x4 const & m) + template + template + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CXX14 mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator=(mat<3, 4, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -221,9 +217,9 @@ namespace glm return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator+=(U s) + template + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -231,9 +227,9 @@ namespace glm return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator+=(tmat3x4 const & m) + template + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator+=(mat<3, 4, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -241,9 +237,9 @@ namespace glm return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator-=(U s) + template + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -251,9 +247,9 @@ namespace glm return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator-=(tmat3x4 const & m) + template + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator-=(mat<3, 4, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -261,9 +257,9 @@ namespace glm return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator*=(U s) + template + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -271,9 +267,9 @@ namespace glm return *this; } - template - template - GLM_FUNC_QUALIFIER tmat3x4 & tmat3x4::operator/=(U s) + template + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> & mat<3, 4, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -283,8 +279,8 @@ namespace glm // -- Increment and decrement operators -- - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator++() + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -292,8 +288,8 @@ namespace glm return *this; } - template - GLM_FUNC_QUALIFIER tmat3x4& tmat3x4::operator--() + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -301,34 +297,34 @@ namespace glm return *this; } - template - GLM_FUNC_QUALIFIER tmat3x4 tmat3x4::operator++(int) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> mat<3, 4, T, Q>::operator++(int) { - tmat3x4 Result(*this); + mat<3, 4, T, Q> Result(*this); ++*this; return Result; } - template - GLM_FUNC_QUALIFIER tmat3x4 tmat3x4::operator--(int) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> mat<3, 4, T, Q>::operator--(int) { - tmat3x4 Result(*this); + mat<3, 4, T, Q> Result(*this); --*this; return Result; } // -- Unary arithmetic operators -- - template - GLM_FUNC_QUALIFIER tmat3x4 operator+(tmat3x4 const & m) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m) { return m; } - template - GLM_FUNC_QUALIFIER tmat3x4 operator-(tmat3x4 const & m) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m) { - return tmat3x4( + return mat<3, 4, T, Q>( -m[0], -m[1], -m[2]); @@ -336,89 +332,89 @@ namespace glm // -- Binary arithmetic operators -- - template - GLM_FUNC_QUALIFIER tmat3x4 operator+(tmat3x4 const & m, T scalar) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar) { - return tmat3x4( + return mat<3, 4, T, Q>( m[0] + scalar, m[1] + scalar, m[2] + scalar); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator+(tmat3x4 const & m1, tmat3x4 const & m2) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { - return tmat3x4( + return mat<3, 4, T, Q>( m1[0] + m2[0], m1[1] + m2[1], m1[2] + m2[2]); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator-(tmat3x4 const & m, T scalar) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar) { - return tmat3x4( + return mat<3, 4, T, Q>( m[0] - scalar, m[1] - scalar, m[2] - scalar); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator-(tmat3x4 const & m1, tmat3x4 const & m2) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { - return tmat3x4( + return mat<3, 4, T, Q>( m1[0] - m2[0], m1[1] - m2[1], m1[2] - m2[2]); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator*(tmat3x4 const & m, T scalar) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar) { - return tmat3x4( + return mat<3, 4, T, Q>( m[0] * scalar, m[1] * scalar, m[2] * scalar); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator*(T scalar, tmat3x4 const & m) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m) { - return tmat3x4( + return mat<3, 4, T, Q>( m[0] * scalar, m[1] * scalar, m[2] * scalar); } - template - GLM_FUNC_QUALIFIER typename tmat3x4::col_type operator* + template + GLM_FUNC_QUALIFIER typename mat<3, 4, T, Q>::col_type operator* ( - tmat3x4 const & m, - typename tmat3x4::row_type const & v + mat<3, 4, T, Q> const& m, + typename mat<3, 4, T, Q>::row_type const& v ) { - return typename tmat3x4::col_type( + return typename mat<3, 4, T, Q>::col_type( m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z, m[0][1] * v.x + m[1][1] * v.y + m[2][1] * v.z, m[0][2] * v.x + m[1][2] * v.y + m[2][2] * v.z, m[0][3] * v.x + m[1][3] * v.y + m[2][3] * v.z); } - template - GLM_FUNC_QUALIFIER typename tmat3x4::row_type operator* + template + GLM_FUNC_QUALIFIER typename mat<3, 4, T, Q>::row_type operator* ( - typename tmat3x4::col_type const & v, - tmat3x4 const & m + typename mat<3, 4, T, Q>::col_type const& v, + mat<3, 4, T, Q> const& m ) { - return typename tmat3x4::row_type( + return typename mat<3, 4, T, Q>::row_type( v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2] + v.w * m[0][3], v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2] + v.w * m[1][3], v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2] + v.w * m[2][3]); } - template - GLM_FUNC_QUALIFIER tmat4x4 operator*(tmat3x4 const & m1, tmat4x3 const & m2) + template + GLM_FUNC_QUALIFIER mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { const T SrcA00 = m1[0][0]; const T SrcA01 = m1[0][1]; @@ -446,7 +442,7 @@ namespace glm const T SrcB31 = m2[3][1]; const T SrcB32 = m2[3][2]; - tmat4x4 Result(uninitialize); + mat<4, 4, T, Q> Result; Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02; Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02; Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01 + SrcA22 * SrcB02; @@ -466,10 +462,10 @@ namespace glm return Result; } - template - GLM_FUNC_QUALIFIER tmat2x4 operator*(tmat3x4 const & m1, tmat2x3 const & m2) + template + GLM_FUNC_QUALIFIER mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { - return tmat2x4( + 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[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2], m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2], @@ -480,10 +476,10 @@ namespace glm m1[0][3] * m2[1][0] + m1[1][3] * m2[1][1] + m1[2][3] * m2[1][2]); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator*(tmat3x4 const & m1, tmat3x3 const & m2) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { - return tmat3x4( + 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[0][1] * m2[0][0] + m1[1][1] * m2[0][1] + m1[2][1] * m2[0][2], m1[0][2] * m2[0][0] + m1[1][2] * m2[0][1] + m1[2][2] * m2[0][2], @@ -498,19 +494,19 @@ namespace glm m1[0][3] * m2[2][0] + m1[1][3] * m2[2][1] + m1[2][3] * m2[2][2]); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator/(tmat3x4 const & m, T scalar) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar) { - return tmat3x4( + return mat<3, 4, T, Q>( m[0] / scalar, m[1] / scalar, m[2] / scalar); } - template - GLM_FUNC_QUALIFIER tmat3x4 operator/(T scalar, tmat3x4 const & m) + template + GLM_FUNC_QUALIFIER mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m) { - return tmat3x4( + return mat<3, 4, T, Q>( scalar / m[0], scalar / m[1], scalar / m[2]); @@ -518,14 +514,14 @@ namespace glm // -- Boolean operators -- - template - GLM_FUNC_QUALIFIER bool operator==(tmat3x4 const & m1, tmat3x4 const & m2) + template + GLM_FUNC_QUALIFIER bool operator==(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]); } - template - GLM_FUNC_QUALIFIER bool operator!=(tmat3x4 const & m1, tmat3x4 const & m2) + template + GLM_FUNC_QUALIFIER bool operator!=(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]); } -- cgit v1.2.3