From c50f3ed38e68218cc43994d17d9d60100a4e9fb1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 5 May 2016 13:40:11 +0200 Subject: [PATCH] - Added constexpr for *vec*, *mat*, *quat* and *dual_quat* types #493 --- glm/detail/type_mat2x3.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat2x3.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat2x4.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat2x4.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat3x2.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat3x2.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat3x3.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat3x3.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat3x4.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat3x4.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat4x2.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat4x2.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat4x3.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat4x3.inl | 34 +++++++++++++++++----------------- glm/detail/type_mat4x4.hpp | 34 +++++++++++++++++----------------- glm/detail/type_mat4x4.inl | 34 +++++++++++++++++----------------- glm/gtx/dual_quaternion.inl | 2 +- 17 files changed, 273 insertions(+), 273 deletions(-) diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index b840187d..cccdb6cd 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -56,45 +56,45 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3(tmat2x3 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat2x3() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat2x3(tmat2x3 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3(tmat2x3 const & m); + GLM_FUNC_DECL tmat2x3(tmat2x3 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x3(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x3(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3( + GLM_FUNC_DECL explicit tmat2x3(T scalar); + GLM_FUNC_DECL tmat2x3( T x0, T y0, T z0, T x1, T y1, T z1); - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3( + GLM_FUNC_DECL tmat2x3( col_type const & v0, col_type const & v1); // -- Conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3( + GLM_FUNC_DECL tmat2x3( X1 x1, Y1 y1, Z1 z1, X2 x2, Y2 y2, Z2 z2); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x3( + GLM_FUNC_DECL tmat2x3( tvec3 const & v1, tvec3 const & v2); // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat2x3 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat2x3 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat3x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x3(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat4x3 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat2x3.inl b/glm/detail/type_mat2x3.inl index 569ed1d7..620716af 100644 --- a/glm/detail/type_mat2x3.inl +++ b/glm/detail/type_mat2x3.inl @@ -36,7 +36,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3() + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0, 0); @@ -47,7 +47,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat2x3 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -56,7 +56,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat2x3 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -67,14 +67,14 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(T scalar) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(T scalar) { this->value[0] = col_type(scalar, 0, 0); this->value[1] = col_type(0, scalar, 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3 + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3 ( T x0, T y0, T z0, T x1, T y1, T z1 @@ -85,7 +85,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(col_type const & v0, col_type const & v1) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(col_type const & v0, col_type const & v1) { this->value[0] = v0; this->value[1] = v1; @@ -97,7 +97,7 @@ namespace glm template < typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3 + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3 ( X1 x1, Y1 y1, Z1 z1, X2 x2, Y2 y2, Z2 z2 @@ -109,7 +109,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tvec3 const & v1, tvec3 const & v2) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tvec3 const & v1, tvec3 const & v2) { this->value[0] = col_type(v1); this->value[1] = col_type(v2); @@ -119,63 +119,63 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat2x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat2x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat3x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat3x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat4x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x3::tmat2x3(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat2x3::tmat2x3(tmat4x3 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 673d796d..51cd965d 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -56,17 +56,17 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4(tmat2x4 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat2x4() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat2x4(tmat2x4 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4(tmat2x4 const & m); + GLM_FUNC_DECL tmat2x4(tmat2x4 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x4(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat2x4(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4( + GLM_FUNC_DECL explicit tmat2x4(T scalar); + GLM_FUNC_DECL tmat2x4( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1); - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4( + GLM_FUNC_DECL tmat2x4( col_type const & v0, col_type const & v1); @@ -75,28 +75,28 @@ namespace glm template < typename X1, typename Y1, typename Z1, typename W1, typename X2, typename Y2, typename Z2, typename W2> - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4( + GLM_FUNC_DECL tmat2x4( X1 x1, Y1 y1, Z1 z1, W1 w1, X2 x2, Y2 y2, Z2 z2, W2 w2); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat2x4( + GLM_FUNC_DECL tmat2x4( tvec4 const & v1, tvec4 const & v2); // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat2x4 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat2x4 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat3x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat2x4(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat4x3 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat2x4.inl b/glm/detail/type_mat2x4.inl index fdb4e89d..99ac7f54 100644 --- a/glm/detail/type_mat2x4.inl +++ b/glm/detail/type_mat2x4.inl @@ -36,7 +36,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4() + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0, 0, 0); @@ -47,7 +47,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat2x4 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -56,7 +56,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat2x4 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -67,7 +67,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(T scalar) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(T scalar) { value_type const Zero(0); this->value[0] = col_type(scalar, Zero, Zero, Zero); @@ -75,7 +75,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4 + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4 ( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1 @@ -86,7 +86,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(col_type const & v0, col_type const & v1) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(col_type const & v0, col_type const & v1) { this->value[0] = v0; this->value[1] = v1; @@ -98,7 +98,7 @@ namespace glm template < typename X1, typename Y1, typename Z1, typename W1, typename X2, typename Y2, typename Z2, typename W2> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4 + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4 ( X1 x1, Y1 y1, Z1 z1, W1 w1, X2 x2, Y2 y2, Z2 z2, W2 w2 @@ -110,7 +110,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tvec4 const & v1, tvec4 const & v2) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tvec4 const & v1, tvec4 const & v2) { this->value[0] = col_type(v1); this->value[1] = col_type(v2); @@ -120,63 +120,63 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat2x2 const & m) { this->value[0] = col_type(m[0], 0, 0); this->value[1] = col_type(m[1], 0, 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat3x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat2x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat3x2 const & m) { this->value[0] = col_type(m[0], 0, 0); this->value[1] = col_type(m[1], 0, 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat3x4 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat4x2 const & m) { this->value[0] = col_type(m[0], 0, 0); this->value[1] = col_type(m[1], 0, 0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat2x4::tmat2x4(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat2x4::tmat2x4(tmat4x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index 4a4e1594..73470d15 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -56,18 +56,18 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2(tmat3x2 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat3x2() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat3x2(tmat3x2 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2(tmat3x2 const & m); + GLM_FUNC_DECL tmat3x2(tmat3x2 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x2(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x2(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2( + GLM_FUNC_DECL explicit tmat3x2(T scalar); + GLM_FUNC_DECL tmat3x2( T x0, T y0, T x1, T y1, T x2, T y2); - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2( + GLM_FUNC_DECL tmat3x2( col_type const & v0, col_type const & v1, col_type const & v2); @@ -78,13 +78,13 @@ namespace glm typename X1, typename Y1, typename X2, typename Y2, typename X3, typename Y3> - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2( + GLM_FUNC_DECL tmat3x2( X1 x1, Y1 y1, X2 x2, Y2 y2, X3 x3, Y3 y3); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x2( + GLM_FUNC_DECL tmat3x2( tvec2 const & v1, tvec2 const & v2, tvec2 const & v3); @@ -92,16 +92,16 @@ namespace glm // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat3x2 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat3x2 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat3x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x2(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat4x3 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat3x2.inl b/glm/detail/type_mat3x2.inl index 296941be..4a9dc7ee 100644 --- a/glm/detail/type_mat3x2.inl +++ b/glm/detail/type_mat3x2.inl @@ -36,7 +36,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2() + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0); @@ -48,7 +48,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat3x2 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -58,7 +58,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat3x2 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -70,7 +70,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(T scalar) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(T scalar) { this->value[0] = col_type(scalar, 0); this->value[1] = col_type(0, scalar); @@ -78,7 +78,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2 + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2 ( T x0, T y0, T x1, T y1, @@ -91,7 +91,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2 + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2 ( col_type const & v0, col_type const & v1, @@ -110,7 +110,7 @@ namespace glm typename X1, typename Y1, typename X2, typename Y2, typename X3, typename Y3> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2 + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2 ( X1 x1, Y1 y1, X2 x2, Y2 y2, @@ -124,7 +124,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2 + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2 ( tvec2 const & v1, tvec2 const & v2, @@ -140,7 +140,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat3x2 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -148,7 +148,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat2x2 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -156,7 +156,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat3x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -164,7 +164,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -172,7 +172,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat2x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -180,7 +180,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -188,7 +188,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -196,7 +196,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat4x2 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -204,7 +204,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x2::tmat3x2(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat3x2::tmat3x2(tmat4x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index 3f56f1ff..e6279678 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -55,18 +55,18 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3(tmat3x3 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat3x3() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat3x3(tmat3x3 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3(tmat3x3 const & m); + GLM_FUNC_DECL tmat3x3(tmat3x3 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x3(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x3(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3( + GLM_FUNC_DECL explicit tmat3x3(T scalar); + GLM_FUNC_DECL tmat3x3( T x0, T y0, T z0, T x1, T y1, T z1, T x2, T y2, T z2); - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3( + GLM_FUNC_DECL tmat3x3( col_type const & v0, col_type const & v1, col_type const & v2); @@ -77,13 +77,13 @@ namespace glm typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2, typename X3, typename Y3, typename Z3> - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3( + GLM_FUNC_DECL tmat3x3( X1 x1, Y1 y1, Z1 z1, X2 x2, Y2 y2, Z2 z2, X3 x3, Y3 y3, Z3 z3); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x3( + GLM_FUNC_DECL tmat3x3( tvec3 const & v1, tvec3 const & v2, tvec3 const & v3); @@ -91,16 +91,16 @@ namespace glm // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat3x3 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat3x3 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat3x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x3(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat4x3 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat3x3.inl b/glm/detail/type_mat3x3.inl index 14f5ad53..e77655ee 100644 --- a/glm/detail/type_mat3x3.inl +++ b/glm/detail/type_mat3x3.inl @@ -60,7 +60,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3() + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0, 0); @@ -72,7 +72,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat3x3 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -82,7 +82,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat3x3 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -94,7 +94,7 @@ namespace detail {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(T scalar) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(T scalar) { this->value[0] = col_type(scalar, 0, 0); this->value[1] = col_type(0, scalar, 0); @@ -102,7 +102,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3 + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3 ( T x0, T y0, T z0, T x1, T y1, T z1, @@ -115,7 +115,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3 + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3 ( col_type const & v0, col_type const & v1, @@ -134,7 +134,7 @@ namespace detail typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2, typename X3, typename Y3, typename Z3> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3 + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3 ( X1 x1, Y1 y1, Z1 z1, X2 x2, Y2 y2, Z2 z2, @@ -148,7 +148,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3 + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3 ( tvec3 const & v1, tvec3 const & v2, @@ -164,7 +164,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat3x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -172,7 +172,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat2x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -180,7 +180,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -188,7 +188,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat2x3 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -196,7 +196,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat3x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -204,7 +204,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -212,7 +212,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat4x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -220,7 +220,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -228,7 +228,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x3::tmat3x3(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat3x3::tmat3x3(tmat4x3 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index 8df6bea8..8cf67945 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -56,18 +56,18 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x4() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x4(tmat3x4 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat3x4() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat3x4(tmat3x4 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x4(tmat3x4 const & m); + GLM_FUNC_DECL tmat3x4(tmat3x4 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x4(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat3x4(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x4( + GLM_FUNC_DECL explicit tmat3x4(T scalar); + GLM_FUNC_DECL tmat3x4( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1, T x2, T y2, T z2, T w2); - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x4( + GLM_FUNC_DECL tmat3x4( col_type const & v0, col_type const & v1, col_type const & v2); @@ -78,13 +78,13 @@ 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_DECL GLM_CONSTEXPR tmat3x4( + GLM_FUNC_DECL tmat3x4( X1 x1, Y1 y1, Z1 z1, W1 w1, X2 x2, Y2 y2, Z2 z2, W2 w2, X3 x3, Y3 y3, Z3 z3, W3 w3); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat3x4( + GLM_FUNC_DECL tmat3x4( tvec4 const & v1, tvec4 const & v2, tvec4 const & v3); @@ -92,16 +92,16 @@ namespace glm // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat3x4 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat3x4 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat3x4(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat4x3 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat3x4.inl b/glm/detail/type_mat3x4.inl index d92b85d4..86806010 100644 --- a/glm/detail/type_mat3x4.inl +++ b/glm/detail/type_mat3x4.inl @@ -36,7 +36,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4() + GLM_FUNC_QUALIFIER tmat3x4::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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x4 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -58,7 +58,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x4 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -70,7 +70,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(T scalar) + GLM_FUNC_QUALIFIER tmat3x4::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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4 + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 ( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1, @@ -91,7 +91,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4 + GLM_FUNC_QUALIFIER tmat3x4::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::tmat3x4 + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 ( X1 x1, Y1 y1, Z1 z1, W1 w1, X2 x2, Y2 y2, Z2 z2, W2 w2, @@ -124,7 +124,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4 + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4 ( tvec4 const & v1, tvec4 const & v2, @@ -140,7 +140,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -148,7 +148,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat2x2 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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x3 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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -172,7 +172,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat2x3 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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat3x2 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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -196,7 +196,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat4x2 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 - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat3x4::tmat3x4(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat3x4::tmat3x4(tmat4x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index e95c458d..1a6d3593 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -56,19 +56,19 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2(tmat4x2 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat4x2() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat4x2(tmat4x2 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2(tmat4x2 const & m); + GLM_FUNC_DECL tmat4x2(tmat4x2 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x2(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x2(T scalar); - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2( + GLM_FUNC_DECL explicit tmat4x2(T scalar); + GLM_FUNC_DECL tmat4x2( T x0, T y0, T x1, T y1, T x2, T y2, T x3, T y3); - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2( + GLM_FUNC_DECL tmat4x2( col_type const & v0, col_type const & v1, col_type const & v2, @@ -81,14 +81,14 @@ namespace glm typename X2, typename Y2, typename X3, typename Y3, typename X4, typename Y4> - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2( + GLM_FUNC_DECL tmat4x2( X1 x1, Y1 y1, X2 x2, Y2 y2, X3 x3, Y3 y3, X4 x4, Y4 y4); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x2( + GLM_FUNC_DECL tmat4x2( tvec2 const & v1, tvec2 const & v2, tvec2 const & v3, @@ -97,16 +97,16 @@ namespace glm // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat4x2 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat4x2 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat4x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x2(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat4x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat3x4 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat4x2.inl b/glm/detail/type_mat4x2.inl index 3b855179..1cccb9e0 100644 --- a/glm/detail/type_mat4x2.inl +++ b/glm/detail/type_mat4x2.inl @@ -43,7 +43,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2() + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0); @@ -56,7 +56,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat4x2 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -67,7 +67,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat4x2 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -80,7 +80,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(T scalar) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(T scalar) { this->value[0] = col_type(scalar, 0); this->value[1] = col_type(0, scalar); @@ -89,7 +89,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2 + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2 ( T x0, T y0, T x1, T y1, @@ -104,7 +104,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2 + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2 ( col_type const & v0, col_type const & v1, @@ -126,7 +126,7 @@ namespace glm typename X2, typename Y2, typename X3, typename Y3, typename X4, typename Y4> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2 + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2 ( X1 x1, Y1 y1, X2 x2, Y2 y2, @@ -142,7 +142,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2 + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2 ( tvec2 const & v1, tvec2 const & v2, @@ -160,7 +160,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat4x2 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -169,7 +169,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat2x2 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -178,7 +178,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat3x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -187,7 +187,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -196,7 +196,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat2x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -205,7 +205,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat3x2 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -214,7 +214,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -223,7 +223,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat4x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -232,7 +232,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x2::tmat4x2(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat4x2::tmat4x2(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 38a2337b..4f16fd6d 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -56,19 +56,19 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat4x3() GLM_DEFAULT_CTOR; GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3(tmat4x3 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3(tmat4x3 const & m); + GLM_FUNC_DECL tmat4x3(tmat4x3 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x3(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x3(T const & x); - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3( + GLM_FUNC_DECL explicit tmat4x3(ctor); + GLM_FUNC_DECL explicit tmat4x3(T const & x); + GLM_FUNC_DECL tmat4x3( T const & x0, T const & y0, T const & z0, T const & x1, T const & y1, T const & z1, T const & x2, T const & y2, T const & z2, T const & x3, T const & y3, T const & z3); - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3( + GLM_FUNC_DECL tmat4x3( col_type const & v0, col_type const & v1, col_type const & v2, @@ -81,14 +81,14 @@ namespace glm typename X2, typename Y2, typename Z2, typename X3, typename Y3, typename Z3, typename X4, typename Y4, typename Z4> - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3( + GLM_FUNC_DECL tmat4x3( X1 const & x1, Y1 const & y1, Z1 const & z1, X2 const & x2, Y2 const & y2, Z2 const & z2, X3 const & x3, Y3 const & y3, Z3 const & z3, X4 const & x4, Y4 const & y4, Z4 const & z4); template - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x3( + GLM_FUNC_DECL tmat4x3( tvec3 const & v1, tvec3 const & v2, tvec3 const & v3, @@ -97,16 +97,16 @@ namespace glm // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat4x3 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat4x3 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat4x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x3(tmat3x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat2x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat3x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat4x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat2x3 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat3x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat2x4 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat4x2 const & x); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat3x4 const & x); // -- Accesses -- diff --git a/glm/detail/type_mat4x3.inl b/glm/detail/type_mat4x3.inl index 130714ef..d285c6ef 100644 --- a/glm/detail/type_mat4x3.inl +++ b/glm/detail/type_mat4x3.inl @@ -36,7 +36,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3() + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0, 0); @@ -49,7 +49,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat4x3 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -60,7 +60,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat4x3 const & m) { this->value[0] = m.value[0]; this->value[1] = m.value[1]; @@ -73,7 +73,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(T const & s) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(T const & s) { this->value[0] = col_type(s, 0, 0); this->value[1] = col_type(0, s, 0); @@ -82,7 +82,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3 + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3 ( T const & x0, T const & y0, T const & z0, T const & x1, T const & y1, T const & z1, @@ -97,7 +97,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3 + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3 ( col_type const & v0, col_type const & v1, @@ -119,7 +119,7 @@ namespace glm typename X2, typename Y2, typename Z2, typename X3, typename Y3, typename Z3, typename X4, typename Y4, typename Z4> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3 + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3 ( X1 const & x1, Y1 const & y1, Z1 const & z1, X2 const & x2, Y2 const & y2, Z2 const & z2, @@ -135,7 +135,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3 + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3 ( tvec3 const & v1, tvec3 const & v2, @@ -153,7 +153,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat4x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -162,7 +162,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat2x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -171,7 +171,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat3x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -180,7 +180,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat4x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -189,7 +189,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat2x3 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -198,7 +198,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat3x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -207,7 +207,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat2x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); @@ -216,7 +216,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat4x2 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -225,7 +225,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x3::tmat4x3(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat4x3::tmat4x3(tmat3x4 const & m) { this->value[0] = col_type(m[0]); this->value[1] = col_type(m[1]); diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index 4cb9d77f..2e4c794e 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -55,19 +55,19 @@ namespace glm public: // -- Constructors -- - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x4() GLM_DEFAULT_CTOR; - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x4(tmat4x4 const & m) GLM_DEFAULT; + GLM_FUNC_DECL tmat4x4() GLM_DEFAULT_CTOR; + GLM_FUNC_DECL tmat4x4(tmat4x4 const & m) GLM_DEFAULT; template - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x4(tmat4x4 const & m); + GLM_FUNC_DECL tmat4x4(tmat4x4 const & m); GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x4(ctor); - GLM_FUNC_DECL GLM_CONSTEXPR explicit tmat4x4(T const & x); - GLM_FUNC_DECL GLM_CONSTEXPR tmat4x4( + 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 GLM_CONSTEXPR tmat4x4( + GLM_FUNC_DECL tmat4x4( col_type const & v0, col_type const & v1, col_type const & v2, @@ -80,14 +80,14 @@ namespace glm 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 GLM_CONSTEXPR tmat4x4( + 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 GLM_CONSTEXPR tmat4x4( + GLM_FUNC_DECL tmat4x4( tvec4 const & v1, tvec4 const & v2, tvec4 const & v3, @@ -96,16 +96,16 @@ namespace glm // -- Matrix conversions -- template - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat4x4 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat4x4 const & m); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat2x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat3x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat2x3 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat3x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat2x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat4x2 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat3x4 const & x); - GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tmat4x4(tmat4x3 const & x); + 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 -- diff --git a/glm/detail/type_mat4x4.inl b/glm/detail/type_mat4x4.inl index a6903d02..09685a3f 100644 --- a/glm/detail/type_mat4x4.inl +++ b/glm/detail/type_mat4x4.inl @@ -96,7 +96,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4() + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4() { # ifndef GLM_FORCE_NO_CTOR_INIT this->value[0] = col_type(1, 0, 0, 0); @@ -109,7 +109,7 @@ namespace detail # if !GLM_HAS_DEFAULTED_FUNCTIONS template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat4x4 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -120,7 +120,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat4x4 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat4x4 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -133,7 +133,7 @@ namespace detail {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(T const & s) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(T const & s) { this->value[0] = col_type(s, 0, 0, 0); this->value[1] = col_type(0, s, 0, 0); @@ -142,7 +142,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4 + GLM_FUNC_QUALIFIER tmat4x4::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, @@ -157,7 +157,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4 + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4 ( col_type const & v0, col_type const & v1, @@ -173,7 +173,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4 + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4 ( tmat4x4 const & m ) @@ -192,7 +192,7 @@ namespace detail 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 GLM_CONSTEXPR tmat4x4::tmat4x4 + GLM_FUNC_QUALIFIER tmat4x4::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, @@ -228,7 +228,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4 + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4 ( tvec4 const & v1, tvec4 const & v2, @@ -250,7 +250,7 @@ namespace detail // -- Matrix conversions -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat2x2 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat2x2 const & m) { this->value[0] = col_type(m[0], 0, 0); this->value[1] = col_type(m[1], 0, 0); @@ -259,7 +259,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat3x3 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat3x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -268,7 +268,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat2x3 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat2x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); @@ -277,7 +277,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat3x2 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat3x2 const & m) { this->value[0] = col_type(m[0], 0, 0); this->value[1] = col_type(m[1], 0, 0); @@ -286,7 +286,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat2x4 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat2x4 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -295,7 +295,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat4x2 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat4x2 const & m) { this->value[0] = col_type(m[0], 0, 0); this->value[1] = col_type(m[1], 0, 0); @@ -304,7 +304,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat3x4 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat3x4 const & m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -313,7 +313,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tmat4x4::tmat4x4(tmat4x3 const & m) + GLM_FUNC_QUALIFIER tmat4x4::tmat4x4(tmat4x3 const & m) { this->value[0] = col_type(m[0], 0); this->value[1] = col_type(m[1], 0); diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index 324520d9..b5880748 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -61,7 +61,7 @@ namespace glm # if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT) template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat() + GLM_FUNC_QUALIFIER tdualquat::tdualquat() # ifndef GLM_FORCE_NO_CTOR_INIT : real(tquat()) , dual(tquat(0, 0, 0, 0))