From f602c8e7adb2063089506bb80eec3a359c610289 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 24 Jul 2015 02:02:24 +0200 Subject: [PATCH] Updated _MAYBE to follow GLM conventions --- glm/detail/setup.hpp | 8 ++++---- glm/detail/type_mat2x2.hpp | 10 +++++----- glm/detail/type_mat2x3.hpp | 10 +++++----- glm/detail/type_mat2x4.hpp | 10 +++++----- glm/detail/type_mat3x2.hpp | 10 +++++----- glm/detail/type_mat3x3.hpp | 10 +++++----- glm/detail/type_mat3x4.hpp | 10 +++++----- glm/detail/type_mat4x2.hpp | 10 +++++----- glm/detail/type_mat4x3.hpp | 10 +++++----- glm/detail/type_mat4x4.hpp | 10 +++++----- glm/detail/type_vec1.hpp | 6 +++--- glm/detail/type_vec2.hpp | 6 +++--- glm/detail/type_vec3.hpp | 6 +++--- glm/detail/type_vec4.hpp | 6 +++--- glm/gtc/quaternion.hpp | 6 +++--- glm/gtx/dual_quaternion.hpp | 6 +++--- glm/gtx/simd_mat4.hpp | 8 ++++---- glm/gtx/simd_quat.hpp | 4 ++-- glm/gtx/simd_vec4.hpp | 4 ++-- 19 files changed, 75 insertions(+), 75 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 03914395..efac4987 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -925,16 +925,16 @@ #if GLM_HAS_CONSTEXPR # define GLM_CONSTEXPR constexpr -# define GLM_CONSTEXPR_MAYBE constexpr +# define GLM_RELAXED_CONSTEXPR constexpr #else # define GLM_CONSTEXPR -# define GLM_CONSTEXPR_MAYBE const +# define GLM_RELAXED_CONSTEXPR const #endif #ifdef GLM_FORCE_EXPLICIT_CTOR -# define GLM_EXPLICIT_CTOR_MAYBE explicit +# define GLM_EXPLICIT explicit #else -# define GLM_EXPLICIT_CTOR_MAYBE +# define GLM_EXPLICIT #endif /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index 8d40179e..c24d929a 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -55,10 +55,10 @@ namespace glm friend tvec2 operator/(tvec2 const & v, tmat2x2 const & m); # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 2; - static GLM_CONSTEXPR_MAYBE length_t columns = 2; - static GLM_CONSTEXPR_MAYBE length_t rows = 2; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 2; + static GLM_RELAXED_CONSTEXPR length_t columns = 2; + static GLM_RELAXED_CONSTEXPR length_t rows = 2; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -99,7 +99,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat2x2(tmat2x2 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x2(tmat2x2 const & m); GLM_FUNC_DECL explicit tmat2x2(tmat3x3 const & x); GLM_FUNC_DECL explicit tmat2x2(tmat4x4 const & x); diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index d079e222..f0e4fbdc 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -51,10 +51,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 2; - static GLM_CONSTEXPR_MAYBE length_t cols = 3; - static GLM_CONSTEXPR_MAYBE length_t rows = 2; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 2; + static GLM_RELAXED_CONSTEXPR length_t cols = 3; + static GLM_RELAXED_CONSTEXPR length_t rows = 2; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -95,7 +95,7 @@ namespace glm // Matrix conversion template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat2x3(tmat2x3 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x3(tmat2x3 const & m); GLM_FUNC_DECL explicit tmat2x3(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat2x3(tmat3x3 const & x); diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 9ff28845..6b0f190b 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -51,10 +51,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 2; - static GLM_CONSTEXPR_MAYBE length_t cols = 4; - static GLM_CONSTEXPR_MAYBE length_t rows = 2; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 2; + static GLM_RELAXED_CONSTEXPR length_t cols = 4; + static GLM_RELAXED_CONSTEXPR length_t rows = 2; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -96,7 +96,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat2x4(tmat2x4 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat2x4(tmat2x4 const & m); GLM_FUNC_DECL explicit tmat2x4(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat2x4(tmat3x3 const & x); diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index b02e61aa..1ee94214 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -51,10 +51,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 3; - static GLM_CONSTEXPR_MAYBE length_t cols = 2; - static GLM_CONSTEXPR_MAYBE length_t rows = 3; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 3; + static GLM_RELAXED_CONSTEXPR length_t cols = 2; + static GLM_RELAXED_CONSTEXPR length_t rows = 3; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -102,7 +102,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat3x2(tmat3x2 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x2(tmat3x2 const & m); GLM_FUNC_DECL explicit tmat3x2(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat3x2(tmat3x3 const & x); diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index d9b1105a..1ad3e6a2 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -50,10 +50,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 3; - static GLM_CONSTEXPR_MAYBE length_t cols = 3; - static GLM_CONSTEXPR_MAYBE length_t rows = 3; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 3; + static GLM_RELAXED_CONSTEXPR length_t cols = 3; + static GLM_RELAXED_CONSTEXPR length_t rows = 3; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS template @@ -106,7 +106,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat3x3(tmat3x3 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x3(tmat3x3 const & m); GLM_FUNC_DECL explicit tmat3x3(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat3x3(tmat4x4 const & x); diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index 409c8364..12a27820 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -51,10 +51,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 3; - static GLM_CONSTEXPR_MAYBE length_t cols = 4; - static GLM_CONSTEXPR_MAYBE length_t rows = 3; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 3; + static GLM_RELAXED_CONSTEXPR length_t cols = 4; + static GLM_RELAXED_CONSTEXPR length_t rows = 3; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -101,7 +101,7 @@ namespace glm // Matrix conversion template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat3x4(tmat3x4 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat3x4(tmat3x4 const & m); GLM_FUNC_DECL explicit tmat3x4(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat3x4(tmat3x3 const & x); diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index 951c6370..99a1dd74 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -51,10 +51,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE length_t cols = 2; - static GLM_CONSTEXPR_MAYBE length_t rows = 4; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR length_t cols = 2; + static GLM_RELAXED_CONSTEXPR length_t rows = 4; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -107,7 +107,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat4x2(tmat4x2 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x2(tmat4x2 const & m); GLM_FUNC_DECL explicit tmat4x2(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat4x2(tmat3x3 const & x); diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 4433409c..a29c7fb2 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -51,10 +51,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE length_t cols = 3; - static GLM_CONSTEXPR_MAYBE length_t rows = 4; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR length_t cols = 3; + static GLM_RELAXED_CONSTEXPR length_t rows = 4; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS private: @@ -106,7 +106,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat4x3(tmat4x3 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x3(tmat4x3 const & m); GLM_FUNC_DECL explicit tmat4x3(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat4x3(tmat3x3 const & x); diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index de702383..e8e9bcd4 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -50,10 +50,10 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE length_t cols = 4; - static GLM_CONSTEXPR_MAYBE length_t rows = 4; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR length_t cols = 4; + static GLM_RELAXED_CONSTEXPR length_t rows = 4; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS template @@ -111,7 +111,7 @@ namespace glm // Matrix conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tmat4x4(tmat4x4 const & m); + GLM_FUNC_DECL GLM_EXPLICIT tmat4x4(tmat4x4 const & m); GLM_FUNC_DECL explicit tmat4x4(tmat2x2 const & x); GLM_FUNC_DECL explicit tmat4x4(tmat3x3 const & x); diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 6a5e6972..aef5922d 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -56,8 +56,8 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 1; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 1; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS ////////////////////////////////////// @@ -138,7 +138,7 @@ namespace glm //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tvec1(tvec1 const & v); + GLM_FUNC_DECL GLM_EXPLICIT tvec1(tvec1 const & v); ////////////////////////////////////// // Swizzle constructors diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index f15cd200..3609a24f 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -56,8 +56,8 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 2; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 2; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS ////////////////////////////////////// @@ -146,7 +146,7 @@ namespace glm //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tvec2(tvec2 const & v); + GLM_FUNC_DECL GLM_EXPLICIT tvec2(tvec2 const & v); ////////////////////////////////////// // Swizzle constructors diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index 39c9384b..9665c55f 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -56,8 +56,8 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 3; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 3; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS ////////////////////////////////////// @@ -156,7 +156,7 @@ namespace glm //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tvec3(tvec3 const & v); + GLM_FUNC_DECL GLM_EXPLICIT tvec3(tvec3 const & v); ////////////////////////////////////// // Swizzle constructors diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index d61cd8ea..b48040fd 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -110,8 +110,8 @@ namespace detail typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS ////////////////////////////////////// @@ -232,7 +232,7 @@ namespace detail //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tvec4(tvec4 const & v); + GLM_FUNC_DECL GLM_EXPLICIT tvec4(tvec4 const & v); ////////////////////////////////////// // Swizzle constructors diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 18aa963c..07e2f18a 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -66,8 +66,8 @@ namespace glm typedef T value_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS public: @@ -111,7 +111,7 @@ namespace glm // Conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tquat(tquat const & q); + GLM_FUNC_DECL GLM_EXPLICIT tquat(tquat const & q); // explicit conversion operators # if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 5faad6a1..624470f4 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -65,8 +65,8 @@ namespace glm typedef glm::tquat part_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 8; - static GLM_CONSTEXPR_MAYBE precision prec = P; + static GLM_RELAXED_CONSTEXPR length_t components = 8; + static GLM_RELAXED_CONSTEXPR precision prec = P; # endif//GLM_META_PROG_HELPERS public: @@ -111,7 +111,7 @@ namespace glm // tdualquat conversions template - GLM_FUNC_DECL GLM_EXPLICIT_CTOR_MAYBE tdualquat(tdualquat const & q); + GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tdualquat const & q); GLM_FUNC_DECL explicit tdualquat(tmat2x4 const & holder_mat); GLM_FUNC_DECL explicit tdualquat(tmat3x4 const & aug_mat); diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 7373431b..a321d1ed 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -72,10 +72,10 @@ namespace detail typedef fmat4x4SIMD transpose_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE length_t cols = 4; - static GLM_CONSTEXPR_MAYBE length_t rows = 4; - static GLM_CONSTEXPR_MAYBE precision prec = defaultp; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR length_t cols = 4; + static GLM_RELAXED_CONSTEXPR length_t rows = 4; + static GLM_RELAXED_CONSTEXPR precision prec = defaultp; # endif//GLM_META_PROG_HELPERS GLM_FUNC_DECL length_t length() const; diff --git a/glm/gtx/simd_quat.hpp b/glm/gtx/simd_quat.hpp index 82df9abf..0c30e501 100644 --- a/glm/gtx/simd_quat.hpp +++ b/glm/gtx/simd_quat.hpp @@ -77,8 +77,8 @@ namespace detail typedef tquat bool_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE precision prec = defaultp; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR precision prec = defaultp; # endif//GLM_META_PROG_HELPERS #ifdef GLM_SIMD_ENABLE_XYZW_UNION diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 149f9111..905af456 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -100,8 +100,8 @@ namespace detail typedef tvec4 bool_type; # ifdef GLM_META_PROG_HELPERS - static GLM_CONSTEXPR_MAYBE length_t components = 4; - static GLM_CONSTEXPR_MAYBE precision prec = defaultp; + static GLM_RELAXED_CONSTEXPR length_t components = 4; + static GLM_RELAXED_CONSTEXPR precision prec = defaultp; # endif//GLM_META_PROG_HELPERS #ifdef GLM_SIMD_ENABLE_XYZW_UNION