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_mat4x4.hpp | 243 ++++++++++++++-------------- 1 file changed, 121 insertions(+), 122 deletions(-) (limited to 'external/include/glm/detail/type_mat4x4.hpp') diff --git a/external/include/glm/detail/type_mat4x4.hpp b/external/include/glm/detail/type_mat4x4.hpp index 2222d10..694dcd0 100644 --- a/external/include/glm/detail/type_mat4x4.hpp +++ b/external/include/glm/detail/type_mat4x4.hpp @@ -11,183 +11,182 @@ namespace glm { - template - struct tmat4x4 + template + struct mat<4, 4, T, Q> { - typedef tvec4 col_type; - typedef tvec4 row_type; - typedef tmat4x4 type; - typedef tmat4x4 transpose_type; + typedef vec<4, T, Q> col_type; + typedef vec<4, T, Q> row_type; + typedef mat<4, 4, T, Q> type; + typedef mat<4, 4, T, Q> transpose_type; typedef T value_type; private: col_type value[4]; public: + // -- Accesses -- + + typedef length_t length_type; + GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;} + + GLM_FUNC_DECL col_type & operator[](length_type i); + GLM_FUNC_DECL col_type const& operator[](length_type i) const; + // -- Constructors -- - GLM_FUNC_DECL tmat4x4() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL tmat4x4(tmat4x4 const & m) GLM_DEFAULT; - template - GLM_FUNC_DECL tmat4x4(tmat4x4 const & m); - - GLM_FUNC_DECL explicit tmat4x4(ctor); - GLM_FUNC_DECL explicit tmat4x4(T const & x); - GLM_FUNC_DECL tmat4x4( - 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); - GLM_FUNC_DECL tmat4x4( - col_type const & v0, - col_type const & v1, - col_type const & v2, - col_type const & v3); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 mat() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 mat(mat<4, 4, T, Q> const& m) GLM_DEFAULT; + template + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 mat(mat<4, 4, T, P> const& m); + + GLM_FUNC_DECL explicit GLM_CONSTEXPR_CTOR_CXX14 mat(T const& x); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 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); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 mat( + col_type const& v0, + col_type const& v1, + col_type const& v2, + col_type const& v3); // -- Conversions -- - 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, typename X4, typename Y4, typename Z4, typename W4> - GLM_FUNC_DECL tmat4x4( - 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); - - template - GLM_FUNC_DECL tmat4x4( - tvec4 const & v1, - tvec4 const & v2, - tvec4 const & v3, - tvec4 const & v4); + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 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); + + template + GLM_FUNC_DECL GLM_CONSTEXPR_CTOR_CXX14 mat( + vec<4, V1, Q> const& v1, + vec<4, V2, Q> const& v2, + vec<4, V3, Q> const& v3, + vec<4, V4, Q> const& v4); // -- Matrix conversions -- - template - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat4x4 const & m); + template + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<4, 4, U, P> const& m); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat2x2 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat3x3 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat2x3 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat3x2 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat2x4 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat4x2 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat3x4 const & x); - GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat4x3 const & x); - - // -- Accesses -- - - typedef length_t length_type; - GLM_FUNC_DECL static length_type length(){return 4;} - - GLM_FUNC_DECL col_type & operator[](length_type i); - GLM_FUNC_DECL col_type const & operator[](length_type i) const; + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<2, 2, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<3, 3, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<2, 3, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<3, 2, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<2, 4, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<4, 2, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<3, 4, T, Q> const& x); + GLM_FUNC_DECL GLM_EXPLICIT GLM_CONSTEXPR_CTOR_CXX14 mat(mat<4, 3, T, Q> const& x); // -- Unary arithmetic operators -- - GLM_FUNC_DECL tmat4x4 & operator=(tmat4x4 const & m) GLM_DEFAULT; - - template - GLM_FUNC_DECL tmat4x4 & operator=(tmat4x4 const & m); - template - GLM_FUNC_DECL tmat4x4 & operator+=(U s); - template - GLM_FUNC_DECL tmat4x4 & operator+=(tmat4x4 const & m); - template - GLM_FUNC_DECL tmat4x4 & operator-=(U s); - template - GLM_FUNC_DECL tmat4x4 & operator-=(tmat4x4 const & m); - template - GLM_FUNC_DECL tmat4x4 & operator*=(U s); - template - GLM_FUNC_DECL tmat4x4 & operator*=(tmat4x4 const & m); - template - GLM_FUNC_DECL tmat4x4 & operator/=(U s); - template - GLM_FUNC_DECL tmat4x4 & operator/=(tmat4x4 const & m); + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 mat<4, 4, T, Q> & operator=(mat<4, 4, T, Q> const& m) GLM_DEFAULT; + + template + GLM_FUNC_DECL GLM_CONSTEXPR_CXX14 mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator+=(U s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator+=(mat<4, 4, U, Q> const& m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator-=(U s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator-=(mat<4, 4, U, Q> const& m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator*=(U s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator*=(mat<4, 4, U, Q> const& m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator/=(U s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> & operator/=(mat<4, 4, U, Q> const& m); // -- Increment and decrement operators -- - GLM_FUNC_DECL tmat4x4 & operator++(); - GLM_FUNC_DECL tmat4x4 & operator--(); - GLM_FUNC_DECL tmat4x4 operator++(int); - GLM_FUNC_DECL tmat4x4 operator--(int); + GLM_FUNC_DECL mat<4, 4, T, Q> & operator++(); + GLM_FUNC_DECL mat<4, 4, T, Q> & operator--(); + GLM_FUNC_DECL mat<4, 4, T, Q> operator++(int); + GLM_FUNC_DECL mat<4, 4, T, Q> operator--(int); }; // -- Unary operators -- - template - GLM_FUNC_DECL tmat4x4 operator+(tmat4x4 const & m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m); - template - GLM_FUNC_DECL tmat4x4 operator-(tmat4x4 const & m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m); // -- Binary operators -- - template - GLM_FUNC_DECL tmat4x4 operator+(tmat4x4 const & m, T const & s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T const& s); - template - GLM_FUNC_DECL tmat4x4 operator+(T const & s, tmat4x4 const & m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator+(T const& s, mat<4, 4, T, Q> const& m); - template - GLM_FUNC_DECL tmat4x4 operator+(tmat4x4 const & m1, tmat4x4 const & m2); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); - template - GLM_FUNC_DECL tmat4x4 operator-(tmat4x4 const & m, T const & s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T const& s); - template - GLM_FUNC_DECL tmat4x4 operator-(T const & s, tmat4x4 const & m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator-(T const& s, mat<4, 4, T, Q> const& m); - template - GLM_FUNC_DECL tmat4x4 operator-(tmat4x4 const & m1, tmat4x4 const & m2); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); - template - GLM_FUNC_DECL tmat4x4 operator*(tmat4x4 const & m, T const & s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T const& s); - template - GLM_FUNC_DECL tmat4x4 operator*(T const & s, tmat4x4 const & m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator*(T const& s, mat<4, 4, T, Q> const& m); - template - GLM_FUNC_DECL typename tmat4x4::col_type operator*(tmat4x4 const & m, typename tmat4x4::row_type const & v); + template + GLM_FUNC_DECL 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); - template - GLM_FUNC_DECL typename tmat4x4::row_type operator*(typename tmat4x4::col_type const & v, tmat4x4 const & m); + template + GLM_FUNC_DECL 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); - template - GLM_FUNC_DECL tmat2x4 operator*(tmat4x4 const & m1, tmat2x4 const & m2); + template + GLM_FUNC_DECL mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); - template - GLM_FUNC_DECL tmat3x4 operator*(tmat4x4 const & m1, tmat3x4 const & m2); + template + GLM_FUNC_DECL mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); - template - GLM_FUNC_DECL tmat4x4 operator*(tmat4x4 const & m1, tmat4x4 const & m2); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); - template - GLM_FUNC_DECL tmat4x4 operator/(tmat4x4 const & m, T const & s); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T const& s); - template - GLM_FUNC_DECL tmat4x4 operator/(T const & s, tmat4x4 const & m); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator/(T const& s, mat<4, 4, T, Q> const& m); - template - GLM_FUNC_DECL typename tmat4x4::col_type operator/(tmat4x4 const & m, typename tmat4x4::row_type const & v); + template + GLM_FUNC_DECL 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); - template - GLM_FUNC_DECL typename tmat4x4::row_type operator/(typename tmat4x4::col_type const & v, tmat4x4 const & m); + template + GLM_FUNC_DECL 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); - template - GLM_FUNC_DECL tmat4x4 operator/(tmat4x4 const & m1, tmat4x4 const & m2); + template + GLM_FUNC_DECL mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); // -- Boolean operators -- - template - GLM_FUNC_DECL bool operator==(tmat4x4 const & m1, tmat4x4 const & m2); + template + GLM_FUNC_DECL bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); - template - GLM_FUNC_DECL bool operator!=(tmat4x4 const & m1, tmat4x4 const & m2); + template + GLM_FUNC_DECL bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE -- cgit v1.2.3