diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e6ed427b..7cae022a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,9 +27,6 @@ option(GLM_BUILD_INSTALL "Generate the install target" ${GLM_IS_MASTER_PROJECT}) include(GNUInstallDirs) -option(GLM_ENABLE_CXX_98 "Enable C++ 98" OFF) -option(GLM_ENABLE_CXX_11 "Enable C++ 11" OFF) -option(GLM_ENABLE_CXX_14 "Enable C++ 14" OFF) option(GLM_ENABLE_CXX_17 "Enable C++ 17" OFF) option(GLM_ENABLE_CXX_20 "Enable C++ 20" OFF) @@ -61,43 +58,8 @@ elseif(GLM_ENABLE_CXX_17) message(STATUS "GLM: Build with C++17 features") endif() -elseif(GLM_ENABLE_CXX_14) - set(CMAKE_CXX_STANDARD 14) - add_definitions(-DGLM_FORCE_CXX14) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - message(STATUS "GLM: Disable -Wc++98-compat warnings") - add_compile_options(-Wno-c++98-compat) - add_compile_options(-Wno-c++98-compat-pedantic) - add_compile_options(-Wno-switch-default) - endif() - if(NOT GLM_QUIET) - message(STATUS "GLM: Build with C++14 features") - endif() - -elseif(GLM_ENABLE_CXX_11) - set(CMAKE_CXX_STANDARD 11) - add_definitions(-DGLM_FORCE_CXX11) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - message(STATUS "GLM: Disable -Wc++98-compat warnings") - add_compile_options(-Wno-c++98-compat) - add_compile_options(-Wno-c++98-compat-pedantic) - add_compile_options(-Wno-switch-default) - endif() - if(NOT GLM_QUIET) - message(STATUS "GLM: Build with C++11 features") - endif() - -elseif(GLM_ENABLE_CXX_98) - set(CMAKE_CXX_STANDARD 98) - add_definitions(-DGLM_FORCE_CXX98) - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wno-switch-default) - endif() - if(NOT GLM_QUIET) - message(STATUS "GLM: Build with C++98 features") - endif() - else() + set(CMAKE_CXX_STANDARD 17) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") message(STATUS "GLM: Disable -Wc++98-compat warnings") add_compile_options(-Wno-c++98-compat) diff --git a/doc/api/a00002.html b/doc/api/a00002.html index 37fcdc9eb..71add987e 100644 --- a/doc/api/a00002.html +++ b/doc/api/a00002.html @@ -81,11 +81,11 @@ $(function() {

Functions

template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType abs (genType x) +GLM_FUNC_DECL constexpr genType abs (genType x)  Returns x if x >= 0; otherwise, it returns -x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > abs (vec< L, T, Q > const &x) +GLM_FUNC_DECL constexpr vec< L, T, Q > abs (vec< L, T, Q > const &x)  Returns x if x >= 0; otherwise, it returns -x. More...
  template<length_t L, typename T , qualifier Q> @@ -93,15 +93,15 @@ Functions  Returns a value equal to the nearest integer that is greater than or equal to x. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType clamp (genType x, genType minVal, genType maxVal) +GLM_FUNC_DECL constexpr genType clamp (genType x, genType minVal, genType maxVal)  Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal and maxVal. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > clamp (vec< L, T, Q > const &x, T minVal, T maxVal) +GLM_FUNC_DECL constexpr vec< L, T, Q > clamp (vec< L, T, Q > const &x, T minVal, T maxVal)  Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal and maxVal. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > clamp (vec< L, T, Q > const &x, vec< L, T, Q > const &minVal, vec< L, T, Q > const &maxVal) +GLM_FUNC_DECL constexpr vec< L, T, Q > clamp (vec< L, T, Q > const &x, vec< L, T, Q > const &minVal, vec< L, T, Q > const &maxVal)  Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal and maxVal. More...
  GLM_FUNC_DECL int floatBitsToInt (float v) @@ -158,31 +158,31 @@ Functions  Builds a floating-point number from x and the corresponding integral exponent of two in exp, returning: significand * exp(2, exponent) More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType max (genType x, genType y) +GLM_FUNC_DECL constexpr genType max (genType x, genType y)  Returns y if x < y; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, T y) +GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, T y)  Returns y if x < y; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns y if x < y; otherwise, it returns x. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType min (genType x, genType y) +GLM_FUNC_DECL constexpr genType min (genType x, genType y)  Returns y if y < x; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &x, T y) +GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &x, T y)  Returns y if y < x; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns y if y < x; otherwise, it returns x. More...
  template<typename genTypeT , typename genTypeU > -GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix (genTypeT x, genTypeT y, genTypeU a) +GLM_FUNC_DECL constexpr genTypeT mix (genTypeT x, genTypeT y, genTypeU a)  If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. More...
  template<length_t L, typename T , qualifier Q> @@ -202,7 +202,7 @@ Functions  Returns a value equal to the nearest integer to x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > sign (vec< L, T, Q > const &x) +GLM_FUNC_DECL constexpr vec< L, T, Q > sign (vec< L, T, Q > const &x)  Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. More...
  template<typename genType > diff --git a/doc/api/a00002_source.html b/doc/api/a00002_source.html index aac0ef854..c289a12c9 100644 --- a/doc/api/a00002_source.html +++ b/doc/api/a00002_source.html @@ -80,13 +80,13 @@ $(function() {
21 {
24 
31  template<typename genType>
-
32  GLM_FUNC_DECL GLM_CONSTEXPR genType abs(genType x);
+
32  GLM_FUNC_DECL constexpr genType abs(genType x);
33 
42  template<length_t L, typename T, qualifier Q>
-
43  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> abs(vec<L, T, Q> const& x);
+
43  GLM_FUNC_DECL constexpr vec<L, T, Q> abs(vec<L, T, Q> const& x);
44 
53  template<length_t L, typename T, qualifier Q>
-
54  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> sign(vec<L, T, Q> const& x);
+
54  GLM_FUNC_DECL constexpr vec<L, T, Q> sign(vec<L, T, Q> const& x);
55 
64  template<length_t L, typename T, qualifier Q>
65  GLM_FUNC_DECL vec<L, T, Q> floor(vec<L, T, Q> const& x);
@@ -122,40 +122,40 @@ $(function() {
168  GLM_FUNC_DECL genType modf(genType x, genType& i);
169 
176  template<typename genType>
-
177  GLM_FUNC_DECL GLM_CONSTEXPR genType min(genType x, genType y);
+
177  GLM_FUNC_DECL constexpr genType min(genType x, genType y);
178 
187  template<length_t L, typename T, qualifier Q>
-
188  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> min(vec<L, T, Q> const& x, T y);
+
188  GLM_FUNC_DECL constexpr vec<L, T, Q> min(vec<L, T, Q> const& x, T y);
189 
198  template<length_t L, typename T, qualifier Q>
-
199  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> min(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
199  GLM_FUNC_DECL constexpr vec<L, T, Q> min(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
200 
207  template<typename genType>
-
208  GLM_FUNC_DECL GLM_CONSTEXPR genType max(genType x, genType y);
+
208  GLM_FUNC_DECL constexpr genType max(genType x, genType y);
209 
218  template<length_t L, typename T, qualifier Q>
-
219  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> max(vec<L, T, Q> const& x, T y);
+
219  GLM_FUNC_DECL constexpr vec<L, T, Q> max(vec<L, T, Q> const& x, T y);
220 
229  template<length_t L, typename T, qualifier Q>
-
230  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> max(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
230  GLM_FUNC_DECL constexpr vec<L, T, Q> max(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
231 
239  template<typename genType>
-
240  GLM_FUNC_DECL GLM_CONSTEXPR genType clamp(genType x, genType minVal, genType maxVal);
+
240  GLM_FUNC_DECL constexpr genType clamp(genType x, genType minVal, genType maxVal);
241 
251  template<length_t L, typename T, qualifier Q>
-
252  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> clamp(vec<L, T, Q> const& x, T minVal, T maxVal);
+
252  GLM_FUNC_DECL constexpr vec<L, T, Q> clamp(vec<L, T, Q> const& x, T minVal, T maxVal);
253 
263  template<length_t L, typename T, qualifier Q>
-
264  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> clamp(vec<L, T, Q> const& x, vec<L, T, Q> const& minVal, vec<L, T, Q> const& maxVal);
+
264  GLM_FUNC_DECL constexpr vec<L, T, Q> clamp(vec<L, T, Q> const& x, vec<L, T, Q> const& minVal, vec<L, T, Q> const& maxVal);
265 
308  template<typename genTypeT, typename genTypeU>
-
309  GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a);
+
309  GLM_FUNC_DECL constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a);
310 
311  template<length_t L, typename T, typename U, qualifier Q>
-
312  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> mix(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, U, Q> const& a);
+
312  GLM_FUNC_DECL constexpr vec<L, T, Q> mix(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, U, Q> const& a);
313 
314  template<length_t L, typename T, typename U, qualifier Q>
-
315  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> mix(vec<L, T, Q> const& x, vec<L, T, Q> const& y, U a);
+
315  GLM_FUNC_DECL constexpr vec<L, T, Q> mix(vec<L, T, Q> const& x, vec<L, T, Q> const& y, U a);
316 
321  template<typename genType>
322  GLM_FUNC_DECL genType step(genType edge, genType x);
@@ -222,22 +222,22 @@ $(function() {
539 
glm::smoothstep
GLM_FUNC_DECL genType smoothstep(genType edge0, genType edge1, genType x)
Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and performs smooth Hermite interpolation between 0 a...
-
glm::abs
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > abs(vec< L, T, Q > const &x)
Returns x if x >= 0; otherwise, it returns -x.
+
glm::abs
GLM_FUNC_DECL constexpr vec< L, T, Q > abs(vec< L, T, Q > const &x)
Returns x if x >= 0; otherwise, it returns -x.
glm::ldexp
GLM_FUNC_DECL genType ldexp(genType const &x, int const &exp)
Builds a floating-point number from x and the corresponding integral exponent of two in exp,...
-
glm::clamp
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > clamp(vec< L, T, Q > const &x, vec< L, T, Q > const &minVal, vec< L, T, Q > const &maxVal)
Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal an...
+
glm::clamp
GLM_FUNC_DECL constexpr vec< L, T, Q > clamp(vec< L, T, Q > const &x, vec< L, T, Q > const &minVal, vec< L, T, Q > const &maxVal)
Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal an...
glm::step
GLM_FUNC_DECL vec< L, T, Q > step(vec< L, T, Q > const &edge, vec< L, T, Q > const &x)
Returns 0.0 if x < edge, otherwise it returns 1.0.
-
glm::min
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns y if y < x; otherwise, it returns x.
+
glm::min
GLM_FUNC_DECL constexpr vec< L, T, Q > min(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns y if y < x; otherwise, it returns x.
glm::frexp
GLM_FUNC_DECL genType frexp(genType x, int &exp)
Splits x into a floating-point significand in the range [0.5, 1.0) and an integral exponent of two,...
glm::ceil
GLM_FUNC_DECL vec< L, T, Q > ceil(vec< L, T, Q > const &x)
Returns a value equal to the nearest integer that is greater than or equal to x.
-
glm::sign
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > sign(vec< L, T, Q > const &x)
Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
+
glm::sign
GLM_FUNC_DECL constexpr vec< L, T, Q > sign(vec< L, T, Q > const &x)
Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
glm::round
GLM_FUNC_DECL vec< L, T, Q > round(vec< L, T, Q > const &x)
Returns a value equal to the nearest integer to x.
glm::floatBitsToUint
GLM_FUNC_DECL vec< L, uint, Q > floatBitsToUint(vec< L, float, Q > const &v)
Returns a unsigned integer value representing the encoding of a floating-point value.
glm::roundEven
GLM_FUNC_DECL vec< L, T, Q > roundEven(vec< L, T, Q > const &x)
Returns a value equal to the nearest integer to x.
glm::isinf
GLM_FUNC_DECL vec< L, bool, Q > isinf(vec< L, T, Q > const &x)
Returns true if x holds a positive infinity or negative infinity representation in the underlying imp...
-
glm::max
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns y if x < y; otherwise, it returns x.
+
glm::max
GLM_FUNC_DECL constexpr vec< L, T, Q > max(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns y if x < y; otherwise, it returns x.
glm::exp
GLM_FUNC_DECL vec< L, T, Q > exp(vec< L, T, Q > const &v)
Returns the natural exponentiation of v, i.e., e^v.
glm::modf
GLM_FUNC_DECL genType modf(genType x, genType &i)
Returns the fractional part of x and sets i to the integer part (as a whole number floating point val...
-
glm::mix
GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
+
glm::mix
GLM_FUNC_DECL constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
glm::floor
GLM_FUNC_DECL vec< L, T, Q > floor(vec< L, T, Q > const &x)
Returns a value equal to the nearest integer that is less then or equal to x.
glm::isnan
GLM_FUNC_DECL vec< L, bool, Q > isnan(vec< L, T, Q > const &x)
Returns true if x holds a NaN (not a number) representation in the underlying implementation's set of...
glm::fract
GLM_FUNC_DECL vec< L, T, Q > fract(vec< L, T, Q > const &x)
Return x - floor(x).
diff --git a/doc/api/a00014_source.html b/doc/api/a00014_source.html index b3c329df0..b7d9f2572 100644 --- a/doc/api/a00014_source.html +++ b/doc/api/a00014_source.html @@ -880,7 +880,7 @@ $(function() {
808  struct { detail::_swizzle<4, T, Q, 3,3,3,2> E3 ## E3 ## E3 ## E2; }; \
809  struct { detail::_swizzle<4, T, Q, 3,3,3,3> E3 ## E3 ## E3 ## E3; };
-
glm::e
GLM_FUNC_DECL GLM_CONSTEXPR genType e()
Return e constant.
+
glm::e
GLM_FUNC_DECL constexpr genType e()
Return e constant.
Generated by   diff --git a/doc/api/a00020_source.html b/doc/api/a00020_source.html index 540f775d8..308519d6f 100644 --- a/doc/api/a00020_source.html +++ b/doc/api/a00020_source.html @@ -81,7 +81,7 @@ $(function() {
9  template<template<length_t L, typename T, qualifier Q> class vec, typename R, typename T, qualifier Q>
10  struct functor1<vec, 1, R, T, Q>
11  {
-
12  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, R, Q> call(R (*Func) (T x), vec<1, T, Q> const& v)
+
12  GLM_FUNC_QUALIFIER constexpr static vec<1, R, Q> call(R (*Func) (T x), vec<1, T, Q> const& v)
13  {
14  return vec<1, R, Q>(Func(v.x));
15  }
@@ -90,7 +90,7 @@ $(function() {
18  template<template<length_t L, typename T, qualifier Q> class vec, typename R, typename T, qualifier Q>
19  struct functor1<vec, 2, R, T, Q>
20  {
-
21  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, R, Q> call(R (*Func) (T x), vec<2, T, Q> const& v)
+
21  GLM_FUNC_QUALIFIER constexpr static vec<2, R, Q> call(R (*Func) (T x), vec<2, T, Q> const& v)
22  {
23  return vec<2, R, Q>(Func(v.x), Func(v.y));
24  }
@@ -99,7 +99,7 @@ $(function() {
27  template<template<length_t L, typename T, qualifier Q> class vec, typename R, typename T, qualifier Q>
28  struct functor1<vec, 3, R, T, Q>
29  {
-
30  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, R, Q> call(R (*Func) (T x), vec<3, T, Q> const& v)
+
30  GLM_FUNC_QUALIFIER constexpr static vec<3, R, Q> call(R (*Func) (T x), vec<3, T, Q> const& v)
31  {
32  return vec<3, R, Q>(Func(v.x), Func(v.y), Func(v.z));
33  }
@@ -108,7 +108,7 @@ $(function() {
36  template<template<length_t L, typename T, qualifier Q> class vec, typename R, typename T, qualifier Q>
37  struct functor1<vec, 4, R, T, Q>
38  {
-
39  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, R, Q> call(R (*Func) (T x), vec<4, T, Q> const& v)
+
39  GLM_FUNC_QUALIFIER constexpr static vec<4, R, Q> call(R (*Func) (T x), vec<4, T, Q> const& v)
40  {
41  return vec<4, R, Q>(Func(v.x), Func(v.y), Func(v.z), Func(v.w));
42  }
@@ -126,7 +126,7 @@ $(function() {
54  }
55 
56  template<typename Fct>
-
57  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, T, Q> const& b)
+
57  GLM_FUNC_QUALIFIER constexpr static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, T, Q> const& b)
58  {
59  return vec<1, T, Q>(Func(a.x, b.x));
60  }
@@ -141,7 +141,7 @@ $(function() {
69  }
70 
71  template<typename Fct>
-
72  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, T, Q> const& b)
+
72  GLM_FUNC_QUALIFIER constexpr static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, T, Q> const& b)
73  {
74  return vec<2, T, Q>(Func(a.x, b.x), Func(a.y, b.y));
75  }
@@ -156,7 +156,7 @@ $(function() {
84  }
85 
86  template<class Fct>
-
87  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, T, Q> const& b)
+
87  GLM_FUNC_QUALIFIER constexpr static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, T, Q> const& b)
88  {
89  return vec<3, T, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z));
90  }
@@ -171,7 +171,7 @@ $(function() {
99  }
100 
101  template<class Fct>
-
102  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, T, Q> const& b)
+
102  GLM_FUNC_QUALIFIER constexpr static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, T, Q> const& b)
103  {
104  return vec<4, T, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z), Func(a.w, b.w));
105  }
@@ -188,7 +188,7 @@ $(function() {
116  return vec<1, T, Q>(Func(a.x, b));
117  }
118  template<class Fct>
-
119  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, T b)
+
119  GLM_FUNC_QUALIFIER constexpr static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, T b)
120  {
121  return vec<1, T, Q>(Func(a.x, b));
122  }
@@ -203,7 +203,7 @@ $(function() {
131  }
132 
133  template<class Fct>
-
134  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, T b)
+
134  GLM_FUNC_QUALIFIER constexpr static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, T b)
135  {
136  return vec<2, T, Q>(Func(a.x, b), Func(a.y, b));
137  }
@@ -218,7 +218,7 @@ $(function() {
146  }
147 
148  template<class Fct>
-
149  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, T b)
+
149  GLM_FUNC_QUALIFIER constexpr static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, T b)
150  {
151  return vec<3, T, Q>(Func(a.x, b), Func(a.y, b), Func(a.z, b));
152  }
@@ -232,7 +232,7 @@ $(function() {
160  return vec<4, T, Q>(Func(a.x, b), Func(a.y, b), Func(a.z, b), Func(a.w, b));
161  }
162  template<class Fct>
-
163  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, T b)
+
163  GLM_FUNC_QUALIFIER constexpr static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, T b)
164  {
165  return vec<4, T, Q>(Func(a.x, b), Func(a.y, b), Func(a.z, b), Func(a.w, b));
166  }
@@ -250,7 +250,7 @@ $(function() {
178  }
179 
180  template<class Fct>
-
181  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, int, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, int, Q> const& b)
+
181  GLM_FUNC_QUALIFIER constexpr static vec<1, int, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, int, Q> const& b)
182  {
183  return vec<1, int, Q>(Func(a.x, b.x));
184  }
@@ -264,7 +264,7 @@ $(function() {
192  return vec<2, int, Q>(Func(a.x, b.x), Func(a.y, b.y));
193  }
194  template<class Fct>
-
195  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, int, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, int, Q> const& b)
+
195  GLM_FUNC_QUALIFIER constexpr static vec<2, int, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, int, Q> const& b)
196  {
197  return vec<2, int, Q>(Func(a.x, b.x), Func(a.y, b.y));
198  }
@@ -278,7 +278,7 @@ $(function() {
206  return vec<3, int, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z));
207  }
208  template<class Fct>
-
209  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, int, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, int, Q> const& b)
+
209  GLM_FUNC_QUALIFIER constexpr static vec<3, int, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, int, Q> const& b)
210  {
211  return vec<3, int, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z));
212  }
@@ -293,7 +293,7 @@ $(function() {
221  }
222 
223  template<class Fct>
-
224  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, int, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, int, Q> const& b)
+
224  GLM_FUNC_QUALIFIER constexpr static vec<4, int, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, int, Q> const& b)
225  {
226  return vec<4, int, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z), Func(a.w, b.w));
227  }
diff --git a/doc/api/a00023_source.html b/doc/api/a00023_source.html index 73a0ccfdb..2a6d7868d 100644 --- a/doc/api/a00023_source.html +++ b/doc/api/a00023_source.html @@ -85,9 +85,9 @@ $(function() {
13  template<typename genFIType>
14  struct compute_abs<genFIType, true>
15  {
-
16  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genFIType call(genFIType x)
+
16  GLM_FUNC_QUALIFIER constexpr static genFIType call(genFIType x)
17  {
-
18  GLM_STATIC_ASSERT(
+
18  static_assert(
19  std::numeric_limits<genFIType>::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits<genFIType>::is_signed,
20  "'abs' only accept floating-point and integer scalar or vector inputs");
21 
@@ -110,9 +110,9 @@ $(function() {
38  template<typename genFIType>
39  struct compute_abs<genFIType, false>
40  {
-
41  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genFIType call(genFIType x)
+
41  GLM_FUNC_QUALIFIER constexpr static genFIType call(genFIType x)
42  {
-
43  GLM_STATIC_ASSERT(
+
43  static_assert(
44  (!std::numeric_limits<genFIType>::is_signed && std::numeric_limits<genFIType>::is_integer),
45  "'abs' only accept floating-point and integer scalar or vector inputs");
46  return x;
diff --git a/doc/api/a00026_source.html b/doc/api/a00026_source.html index 295020b46..a855c8b05 100644 --- a/doc/api/a00026_source.html +++ b/doc/api/a00026_source.html @@ -123,7 +123,7 @@ $(function() {
51  template<length_t L, typename T, qualifier Q>
52  struct compute_vec_add<L, T, Q, false>
53  {
-
54  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
54  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
55  {
56  return detail::functor2<vec, L, T, Q>::call(std::plus<T>(), a, b);
57  }
@@ -132,7 +132,7 @@ $(function() {
60  template<length_t L, typename T, qualifier Q>
61  struct compute_vec_sub<L, T, Q, false>
62  {
-
63  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
63  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
64  {
65  return detail::functor2<vec, L, T, Q>::call(std::minus<T>(), a, b);
66  }
@@ -141,7 +141,7 @@ $(function() {
69  template<length_t L, typename T, qualifier Q>
70  struct compute_vec_mul<L, T, Q, false>
71  {
-
72  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
72  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
73  {
74  return detail::functor2<vec, L, T, Q>::call(std::multiplies<T>(), a, b);
75  }
@@ -150,7 +150,7 @@ $(function() {
78  template<length_t L, typename T, qualifier Q>
79  struct compute_vec_div<L, T, Q, false>
80  {
-
81  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
81  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
82  {
83  return detail::functor2<vec, L, T, Q>::call(std::divides<T>(), a, b);
84  }
@@ -159,7 +159,7 @@ $(function() {
87  template<length_t L, typename T, qualifier Q>
88  struct compute_vec_mod<L, T, Q, false>
89  {
-
90  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
90  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
91  {
92  return detail::functor2<vec, L, T, Q>::call(std::modulus<T>(), a, b);
93  }
@@ -168,7 +168,7 @@ $(function() {
96  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
97  struct compute_vec_and<L, T, Q, IsInt, Size, false>
98  {
-
99  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
99  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
100  {
101  vec<L, T, Q> v(a);
102  for (length_t i = 0; i < L; ++i)
@@ -180,7 +180,7 @@ $(function() {
108  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
109  struct compute_vec_or<L, T, Q, IsInt, Size, false>
110  {
-
111  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
111  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
112  {
113  vec<L, T, Q> v(a);
114  for (length_t i = 0; i < L; ++i)
@@ -192,7 +192,7 @@ $(function() {
120  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
121  struct compute_vec_xor<L, T, Q, IsInt, Size, false>
122  {
-
123  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
123  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
124  {
125  vec<L, T, Q> v(a);
126  for (length_t i = 0; i < L; ++i)
@@ -204,7 +204,7 @@ $(function() {
132  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
133  struct compute_vec_shift_left<L, T, Q, IsInt, Size, false>
134  {
-
135  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
135  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
136  {
137  vec<L, T, Q> v(a);
138  for (length_t i = 0; i < L; ++i)
@@ -216,7 +216,7 @@ $(function() {
144  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
145  struct compute_vec_shift_right<L, T, Q, IsInt, Size, false>
146  {
-
147  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+
147  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
148  {
149  vec<L, T, Q> v(a);
150  for (length_t i = 0; i < L; ++i)
@@ -228,7 +228,7 @@ $(function() {
156  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
157  struct compute_vec_equal<L, T, Q, IsInt, Size, false>
158  {
-
159  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec<L, T, Q> const& v1, vec<L, T, Q> const& v2)
+
159  GLM_FUNC_QUALIFIER constexpr static bool call(vec<L, T, Q> const& v1, vec<L, T, Q> const& v2)
160  {
161  bool b = true;
162  for (length_t i = 0; b && i < L; ++i)
@@ -240,7 +240,7 @@ $(function() {
168  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
169  struct compute_vec_nequal<L, T, Q, IsInt, Size, false>
170  {
-
171  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2)
+
171  GLM_FUNC_QUALIFIER constexpr static bool call(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2)
172  {
173  return !compute_vec_equal<L, T, Q, detail::is_int<T>::value, sizeof(T) * 8, detail::is_aligned<Q>::value>::call(v1, v2);
174  }
@@ -249,7 +249,7 @@ $(function() {
177  template<length_t L, typename T, qualifier Q, int IsInt, std::size_t Size>
178  struct compute_vec_bitwise_not<L, T, Q, IsInt, Size, false>
179  {
-
180  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a)
+
180  GLM_FUNC_QUALIFIER constexpr static vec<L, T, Q> call(vec<L, T, Q> const& a)
181  {
182  vec<L, T, Q> v(a);
183  for (length_t i = 0; i < L; ++i)
diff --git a/doc/api/a00029_source.html b/doc/api/a00029_source.html index 17b1ddf9d..ec971bd15 100644 --- a/doc/api/a00029_source.html +++ b/doc/api/a00029_source.html @@ -82,7 +82,7 @@ $(function() {
10  template <typename T, bool isFloat>
11  struct compute_equal
12  {
-
13  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T a, T b)
+
13  GLM_FUNC_QUALIFIER constexpr static bool call(T a, T b)
14  {
15  return a == b;
16  }
@@ -91,7 +91,7 @@ $(function() {
19  template <typename T>
20  struct compute_equal<T, true>
21  {
-
22  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T a, T b)
+
22  GLM_FUNC_QUALIFIER constexpr static bool call(T a, T b)
23  {
24  return detail::compute_abs<T, std::numeric_limits<T>::is_signed>::call(b - a) <= static_cast<T>(0);
25  //return std::memcmp(&a, &b, sizeof(T)) == 0;
diff --git a/doc/api/a00032_source.html b/doc/api/a00032_source.html index fa327087b..2337ef6e7 100644 --- a/doc/api/a00032_source.html +++ b/doc/api/a00032_source.html @@ -249,10 +249,10 @@ $(function() {
178  struct type
179  {
180  glm_f64vec2 data[2];
-
181  GLM_CONSTEXPR glm_f64vec2 getv(int i) const {
+
181  constexpr glm_f64vec2 getv(int i) const {
182  return data[i];
183  }
-
184  GLM_CONSTEXPR void setv(int i, const glm_f64vec2& v) {
+
184  constexpr void setv(int i, const glm_f64vec2& v) {
185  data[i] = v;
186  }
187  };
@@ -348,7 +348,7 @@ $(function() {
277  template<typename genType>
278  struct init_gentype<genType, GENTYPE_QUAT>
279  {
-
280  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genType identity()
+
280  GLM_FUNC_QUALIFIER constexpr static genType identity()
281  {
282  return genType(1, 0, 0, 0);
283  }
@@ -357,7 +357,7 @@ $(function() {
286  template<typename genType>
287  struct init_gentype<genType, GENTYPE_MAT>
288  {
-
289  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genType identity()
+
289  GLM_FUNC_QUALIFIER constexpr static genType identity()
290  {
291  return genType(1);
292  }
@@ -366,7 +366,7 @@ $(function() {
295 }//namespace glm
glm::uint64
detail::uint64 uint64
64 bit unsigned integer type.
Definition: scalar_uint_sized.hpp:67
-
glm::identity
GLM_FUNC_DECL GLM_CONSTEXPR genType identity()
Builds an identity matrix.
+
glm::identity
GLM_FUNC_DECL constexpr genType identity()
Builds an identity matrix.
glm::int64
detail::int64 int64
64 bit signed integer type.
Definition: scalar_int_sized.hpp:67
diff --git a/doc/api/a00035_source.html b/doc/api/a00035_source.html index 504e985c3..0e239665e 100644 --- a/doc/api/a00035_source.html +++ b/doc/api/a00035_source.html @@ -373,9 +373,9 @@ $(function() {
307 #endif
308 
309 #if GLM_HAS_CONSTEXPR
-
310 # define GLM_CONSTEXPR constexpr
+
310 # define constexpr constexpr
311 #else
-
312 # define GLM_CONSTEXPR
+
312 # define constexpr
313 #endif
314 
315 //
@@ -501,11 +501,11 @@ $(function() {
438 // Static assert
439 
440 #if GLM_HAS_STATIC_ASSERT
-
441 # define GLM_STATIC_ASSERT(x, message) static_assert(x, message)
+
441 # define static_assert(x, message) static_assert(x, message)
442 #elif GLM_COMPILER & GLM_COMPILER_VC
-
443 # define GLM_STATIC_ASSERT(x, message) typedef char __CASSERT__##__LINE__[(x) ? 1 : -1]
+
443 # define static_assert(x, message) typedef char __CASSERT__##__LINE__[(x) ? 1 : -1]
444 #else
-
445 # define GLM_STATIC_ASSERT(x, message) assert(x)
+
445 # define static_assert(x, message) assert(x)
446 #endif//GLM_LANG
447 
449 // Qualifiers
@@ -551,7 +551,7 @@ $(function() {
489 # define GLM_NEVER_INLINE
490 #endif//defined(GLM_FORCE_INLINE)
491 
-
492 #define GLM_CTOR_DECL GLM_CUDA_FUNC_DECL GLM_CONSTEXPR
+
492 #define GLM_CTOR_DECL GLM_CUDA_FUNC_DECL constexpr
493 #define GLM_FUNC_DISCARD_DECL GLM_CUDA_FUNC_DECL
494 #define GLM_FUNC_DECL GLM_NODISCARD GLM_CUDA_FUNC_DECL
495 #define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE
diff --git a/doc/api/a00038_source.html b/doc/api/a00038_source.html index 4fe9289a3..f520de4cb 100644 --- a/doc/api/a00038_source.html +++ b/doc/api/a00038_source.html @@ -93,18 +93,18 @@ $(function() {
21  typedef int int_type;
22  typedef float float_type;
23 
-
24  GLM_CONSTEXPR float_t(float_type Num = 0.0f) : f(Num) {}
+
24  constexpr float_t(float_type Num = 0.0f) : f(Num) {}
25 
-
26  GLM_CONSTEXPR float_t& operator=(float_t const& x)
+
26  constexpr float_t& operator=(float_t const& x)
27  {
28  f = x.f;
29  return *this;
30  }
31 
32  // Portable extraction of components.
-
33  GLM_CONSTEXPR bool negative() const { return i < 0; }
-
34  GLM_CONSTEXPR int_type mantissa() const { return i & ((1 << 23) - 1); }
-
35  GLM_CONSTEXPR int_type exponent() const { return (i >> 23) & ((1 << 8) - 1); }
+
33  constexpr bool negative() const { return i < 0; }
+
34  constexpr int_type mantissa() const { return i & ((1 << 23) - 1); }
+
35  constexpr int_type exponent() const { return (i >> 23) & ((1 << 8) - 1); }
36 
37  int_type i;
38  float_type f;
@@ -116,18 +116,18 @@ $(function() {
44  typedef detail::int64 int_type;
45  typedef double float_type;
46 
-
47  GLM_CONSTEXPR float_t(float_type Num = static_cast<float_type>(0)) : f(Num) {}
+
47  constexpr float_t(float_type Num = static_cast<float_type>(0)) : f(Num) {}
48 
-
49  GLM_CONSTEXPR float_t& operator=(float_t const& x)
+
49  constexpr float_t& operator=(float_t const& x)
50  {
51  f = x.f;
52  return *this;
53  }
54 
55  // Portable extraction of components.
-
56  GLM_CONSTEXPR bool negative() const { return i < 0; }
-
57  GLM_CONSTEXPR int_type mantissa() const { return i & ((int_type(1) << 52) - 1); }
-
58  GLM_CONSTEXPR int_type exponent() const { return (i >> 52) & ((int_type(1) << 11) - 1); }
+
56  constexpr bool negative() const { return i < 0; }
+
57  constexpr int_type mantissa() const { return i & ((int_type(1) << 52) - 1); }
+
58  constexpr int_type exponent() const { return (i >> 52) & ((int_type(1) << 11) - 1); }
59 
60  int_type i;
61  float_type f;
diff --git a/doc/api/a00044_source.html b/doc/api/a00044_source.html index cd50187ec..73989ae87 100644 --- a/doc/api/a00044_source.html +++ b/doc/api/a00044_source.html @@ -95,14 +95,14 @@ $(function() {
25  // -- Accesses --
26 
27  typedef length_t length_type;
-
28  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 2; }
+
28  GLM_FUNC_DECL static constexpr length_type length() { return 2; }
29 
-
30  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
30  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
32 
33  // -- Constructors --
34 
-
35  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
35  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
36  template<qualifier P>
37  GLM_CTOR_DECL mat(mat<2, 2, T, P> const& m);
38 
@@ -143,103 +143,103 @@ $(function() {
73  // -- Unary arithmetic operators --
74 
75  template<typename U>
-
76  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator=(mat<2, 2, U, Q> const& m);
+
76  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator=(mat<2, 2, U, Q> const& m);
77  template<typename U>
-
78  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator+=(U s);
+
78  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator+=(U s);
79  template<typename U>
-
80  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator+=(mat<2, 2, U, Q> const& m);
+
80  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator+=(mat<2, 2, U, Q> const& m);
81  template<typename U>
-
82  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator-=(U s);
+
82  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator-=(U s);
83  template<typename U>
-
84  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator-=(mat<2, 2, U, Q> const& m);
+
84  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator-=(mat<2, 2, U, Q> const& m);
85  template<typename U>
-
86  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator*=(U s);
+
86  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator*=(U s);
87  template<typename U>
-
88  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator*=(mat<2, 2, U, Q> const& m);
+
88  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator*=(mat<2, 2, U, Q> const& m);
89  template<typename U>
-
90  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator/=(U s);
+
90  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator/=(U s);
91  template<typename U>
-
92  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator/=(mat<2, 2, U, Q> const& m);
+
92  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator/=(mat<2, 2, U, Q> const& m);
93 
94  // -- Increment and decrement operators --
95 
-
96  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator++ ();
-
97  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator-- ();
-
98  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator++(int);
-
99  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator--(int);
+
96  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator++ ();
+
97  GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator-- ();
+
98  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator++(int);
+
99  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator--(int);
100  };
101 
102  // -- Unary operators --
103 
104  template<typename T, qualifier Q>
-
105  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m);
+
105  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m);
106 
107  template<typename T, qualifier Q>
-
108  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m);
+
108  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m);
109 
110  // -- Binary operators --
111 
112  template<typename T, qualifier Q>
-
113  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m, T scalar);
+
113  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m, T scalar);
114 
115  template<typename T, qualifier Q>
-
116  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(T scalar, mat<2, 2, T, Q> const& m);
+
116  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(T scalar, mat<2, 2, T, Q> const& m);
117 
118  template<typename T, qualifier Q>
-
119  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
119  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
120 
121  template<typename T, qualifier Q>
-
122  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m, T scalar);
+
122  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m, T scalar);
123 
124  template<typename T, qualifier Q>
-
125  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(T scalar, mat<2, 2, T, Q> const& m);
+
125  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(T scalar, mat<2, 2, T, Q> const& m);
126 
127  template<typename T, qualifier Q>
-
128  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
128  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
129 
130  template<typename T, qualifier Q>
-
131  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m, T scalar);
+
131  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m, T scalar);
132 
133  template<typename T, qualifier Q>
-
134  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(T scalar, mat<2, 2, T, Q> const& m);
+
134  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(T scalar, mat<2, 2, T, Q> const& m);
135 
136  template<typename T, qualifier Q>
-
137  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type operator*(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v);
+
137  GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::col_type operator*(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v);
138 
139  template<typename T, qualifier Q>
-
140  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::row_type operator*(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m);
+
140  GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::row_type operator*(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m);
141 
142  template<typename T, qualifier Q>
-
143  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
143  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
144 
145  template<typename T, qualifier Q>
-
146  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
146  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
147 
148  template<typename T, qualifier Q>
-
149  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
149  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
150 
151  template<typename T, qualifier Q>
-
152  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m, T scalar);
+
152  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m, T scalar);
153 
154  template<typename T, qualifier Q>
-
155  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator/(T scalar, mat<2, 2, T, Q> const& m);
+
155  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator/(T scalar, mat<2, 2, T, Q> const& m);
156 
157  template<typename T, qualifier Q>
-
158  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type operator/(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v);
+
158  GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::col_type operator/(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v);
159 
160  template<typename T, qualifier Q>
-
161  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::row_type operator/(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m);
+
161  GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::row_type operator/(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m);
162 
163  template<typename T, qualifier Q>
-
164  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
164  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
165 
166  // -- Boolean operators --
167 
168  template<typename T, qualifier Q>
-
169  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
169  GLM_FUNC_DECL constexpr bool operator==(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
170 
171  template<typename T, qualifier Q>
-
172  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
172  GLM_FUNC_DECL constexpr bool operator!=(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
173 } //namespace glm
174 
175 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00047_source.html b/doc/api/a00047_source.html index e00a98c3f..ba391d51e 100644 --- a/doc/api/a00047_source.html +++ b/doc/api/a00047_source.html @@ -96,14 +96,14 @@ $(function() {
26  // -- Accesses --
27 
28  typedef length_t length_type;
-
29  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 2; }
+
29  GLM_FUNC_DECL static constexpr length_type length() { return 2; }
30 
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
32  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
32  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
33 
34  // -- Constructors --
35 
-
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
37  template<qualifier P>
38  GLM_CTOR_DECL mat(mat<2, 3, T, P> const& m);
39 
@@ -144,84 +144,84 @@ $(function() {
74  // -- Unary arithmetic operators --
75 
76  template<typename U>
-
77  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator=(mat<2, 3, U, Q> const& m);
+
77  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator=(mat<2, 3, U, Q> const& m);
78  template<typename U>
-
79  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator+=(U s);
+
79  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator+=(U s);
80  template<typename U>
-
81  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator+=(mat<2, 3, U, Q> const& m);
+
81  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator+=(mat<2, 3, U, Q> const& m);
82  template<typename U>
-
83  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator-=(U s);
+
83  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator-=(U s);
84  template<typename U>
-
85  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator-=(mat<2, 3, U, Q> const& m);
+
85  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator-=(mat<2, 3, U, Q> const& m);
86  template<typename U>
-
87  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator*=(U s);
+
87  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator*=(U s);
88  template<typename U>
-
89  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator/=(U s);
+
89  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator/=(U s);
90 
91  // -- Increment and decrement operators --
92 
-
93  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator++ ();
-
94  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator-- ();
-
95  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator++(int);
-
96  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator--(int);
+
93  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator++ ();
+
94  GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator-- ();
+
95  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator++(int);
+
96  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator--(int);
97  };
98 
99  // -- Unary operators --
100 
101  template<typename T, qualifier Q>
-
102  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m);
+
102  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m);
103 
104  template<typename T, qualifier Q>
-
105  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m);
+
105  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m);
106 
107  // -- Binary operators --
108 
109  template<typename T, qualifier Q>
-
110  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar);
+
110  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar);
111 
112  template<typename T, qualifier Q>
-
113  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
113  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
114 
115  template<typename T, qualifier Q>
-
116  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar);
+
116  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar);
117 
118  template<typename T, qualifier Q>
-
119  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
119  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
120 
121  template<typename T, qualifier Q>
-
122  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar);
+
122  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar);
123 
124  template<typename T, qualifier Q>
-
125  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(T scalar, mat<2, 3, T, Q> const& m);
+
125  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(T scalar, mat<2, 3, T, Q> const& m);
126 
127  template<typename T, qualifier Q>
-
128  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type operator*(mat<2, 3, T, Q> const& m, typename mat<2, 3, T, Q>::row_type const& v);
+
128  GLM_FUNC_DECL constexpr typename mat<2, 3, T, Q>::col_type operator*(mat<2, 3, T, Q> const& m, typename mat<2, 3, T, Q>::row_type const& v);
129 
130  template<typename T, qualifier Q>
-
131  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 3, T, Q>::row_type operator*(typename mat<2, 3, T, Q>::col_type const& v, mat<2, 3, T, Q> const& m);
+
131  GLM_FUNC_DECL constexpr typename mat<2, 3, T, Q>::row_type operator*(typename mat<2, 3, T, Q>::col_type const& v, mat<2, 3, T, Q> const& m);
132 
133  template<typename T, qualifier Q>
-
134  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
134  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
135 
136  template<typename T, qualifier Q>
-
137  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
137  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
138 
139  template<typename T, qualifier Q>
-
140  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
140  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
141 
142  template<typename T, qualifier Q>
-
143  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator/(mat<2, 3, T, Q> const& m, T scalar);
+
143  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator/(mat<2, 3, T, Q> const& m, T scalar);
144 
145  template<typename T, qualifier Q>
-
146  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator/(T scalar, mat<2, 3, T, Q> const& m);
+
146  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator/(T scalar, mat<2, 3, T, Q> const& m);
147 
148  // -- Boolean operators --
149 
150  template<typename T, qualifier Q>
-
151  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
151  GLM_FUNC_DECL constexpr bool operator==(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
152 
153  template<typename T, qualifier Q>
-
154  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
154  GLM_FUNC_DECL constexpr bool operator!=(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
155 }//namespace glm
156 
157 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00050_source.html b/doc/api/a00050_source.html index 781c52b27..b769882bd 100644 --- a/doc/api/a00050_source.html +++ b/doc/api/a00050_source.html @@ -96,14 +96,14 @@ $(function() {
26  // -- Accesses --
27 
28  typedef length_t length_type;
-
29  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 2; }
+
29  GLM_FUNC_DECL static constexpr length_type length() { return 2; }
30 
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
32  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
32  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
33 
34  // -- Constructors --
35 
-
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
37  template<qualifier P>
38  GLM_CTOR_DECL mat(mat<2, 4, T, P> const& m);
39 
@@ -146,84 +146,84 @@ $(function() {
76  // -- Unary arithmetic operators --
77 
78  template<typename U>
-
79  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator=(mat<2, 4, U, Q> const& m);
+
79  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator=(mat<2, 4, U, Q> const& m);
80  template<typename U>
-
81  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator+=(U s);
+
81  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator+=(U s);
82  template<typename U>
-
83  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator+=(mat<2, 4, U, Q> const& m);
+
83  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator+=(mat<2, 4, U, Q> const& m);
84  template<typename U>
-
85  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator-=(U s);
+
85  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator-=(U s);
86  template<typename U>
-
87  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator-=(mat<2, 4, U, Q> const& m);
+
87  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator-=(mat<2, 4, U, Q> const& m);
88  template<typename U>
-
89  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator*=(U s);
+
89  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator*=(U s);
90  template<typename U>
-
91  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator/=(U s);
+
91  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator/=(U s);
92 
93  // -- Increment and decrement operators --
94 
-
95  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator++ ();
-
96  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator-- ();
-
97  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator++(int);
-
98  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator--(int);
+
95  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator++ ();
+
96  GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator-- ();
+
97  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator++(int);
+
98  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator--(int);
99  };
100 
101  // -- Unary operators --
102 
103  template<typename T, qualifier Q>
-
104  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m);
+
104  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m);
105 
106  template<typename T, qualifier Q>
-
107  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m);
+
107  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m);
108 
109  // -- Binary operators --
110 
111  template<typename T, qualifier Q>
-
112  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m, T scalar);
+
112  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m, T scalar);
113 
114  template<typename T, qualifier Q>
-
115  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
115  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
116 
117  template<typename T, qualifier Q>
-
118  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m, T scalar);
+
118  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m, T scalar);
119 
120  template<typename T, qualifier Q>
-
121  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
121  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
122 
123  template<typename T, qualifier Q>
-
124  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m, T scalar);
+
124  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m, T scalar);
125 
126  template<typename T, qualifier Q>
-
127  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(T scalar, mat<2, 4, T, Q> const& m);
+
127  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(T scalar, mat<2, 4, T, Q> const& m);
128 
129  template<typename T, qualifier Q>
-
130  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type operator*(mat<2, 4, T, Q> const& m, typename mat<2, 4, T, Q>::row_type const& v);
+
130  GLM_FUNC_DECL constexpr typename mat<2, 4, T, Q>::col_type operator*(mat<2, 4, T, Q> const& m, typename mat<2, 4, T, Q>::row_type const& v);
131 
132  template<typename T, qualifier Q>
-
133  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 4, T, Q>::row_type operator*(typename mat<2, 4, T, Q>::col_type const& v, mat<2, 4, T, Q> const& m);
+
133  GLM_FUNC_DECL constexpr typename mat<2, 4, T, Q>::row_type operator*(typename mat<2, 4, T, Q>::col_type const& v, mat<2, 4, T, Q> const& m);
134 
135  template<typename T, qualifier Q>
-
136  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
136  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
137 
138  template<typename T, qualifier Q>
-
139  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
+
139  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<2, 2, T, Q> const& m2);
140 
141  template<typename T, qualifier Q>
-
142  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
142  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
143 
144  template<typename T, qualifier Q>
-
145  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator/(mat<2, 4, T, Q> const& m, T scalar);
+
145  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator/(mat<2, 4, T, Q> const& m, T scalar);
146 
147  template<typename T, qualifier Q>
-
148  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator/(T scalar, mat<2, 4, T, Q> const& m);
+
148  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator/(T scalar, mat<2, 4, T, Q> const& m);
149 
150  // -- Boolean operators --
151 
152  template<typename T, qualifier Q>
-
153  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
153  GLM_FUNC_DECL constexpr bool operator==(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
154 
155  template<typename T, qualifier Q>
-
156  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
156  GLM_FUNC_DECL constexpr bool operator!=(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
157 }//namespace glm
158 
159 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00053_source.html b/doc/api/a00053_source.html index 76f5e878a..743c32dd5 100644 --- a/doc/api/a00053_source.html +++ b/doc/api/a00053_source.html @@ -96,14 +96,14 @@ $(function() {
26  // -- Accesses --
27 
28  typedef length_t length_type;
-
29  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 3; }
+
29  GLM_FUNC_DECL static constexpr length_type length() { return 3; }
30 
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
32  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
32  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
33 
34  // -- Constructors --
35 
-
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
37  template<qualifier P>
38  GLM_CTOR_DECL mat(mat<3, 2, T, P> const& m);
39 
@@ -151,84 +151,84 @@ $(function() {
81  // -- Unary arithmetic operators --
82 
83  template<typename U>
-
84  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator=(mat<3, 2, U, Q> const& m);
+
84  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator=(mat<3, 2, U, Q> const& m);
85  template<typename U>
-
86  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator+=(U s);
+
86  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator+=(U s);
87  template<typename U>
-
88  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator+=(mat<3, 2, U, Q> const& m);
+
88  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator+=(mat<3, 2, U, Q> const& m);
89  template<typename U>
-
90  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator-=(U s);
+
90  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator-=(U s);
91  template<typename U>
-
92  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator-=(mat<3, 2, U, Q> const& m);
+
92  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator-=(mat<3, 2, U, Q> const& m);
93  template<typename U>
-
94  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator*=(U s);
+
94  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator*=(U s);
95  template<typename U>
-
96  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator/=(U s);
+
96  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator/=(U s);
97 
98  // -- Increment and decrement operators --
99 
-
100  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator++ ();
-
101  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator-- ();
-
102  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator++(int);
-
103  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator--(int);
+
100  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator++ ();
+
101  GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator-- ();
+
102  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator++(int);
+
103  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator--(int);
104  };
105 
106  // -- Unary operators --
107 
108  template<typename T, qualifier Q>
-
109  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m);
+
109  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m);
110 
111  template<typename T, qualifier Q>
-
112  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m);
+
112  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m);
113 
114  // -- Binary operators --
115 
116  template<typename T, qualifier Q>
-
117  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m, T scalar);
+
117  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m, T scalar);
118 
119  template<typename T, qualifier Q>
-
120  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
120  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
121 
122  template<typename T, qualifier Q>
-
123  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m, T scalar);
+
123  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m, T scalar);
124 
125  template<typename T, qualifier Q>
-
126  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
126  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
127 
128  template<typename T, qualifier Q>
-
129  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m, T scalar);
+
129  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m, T scalar);
130 
131  template<typename T, qualifier Q>
-
132  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(T scalar, mat<3, 2, T, Q> const& m);
+
132  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(T scalar, mat<3, 2, T, Q> const& m);
133 
134  template<typename T, qualifier Q>
-
135  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type operator*(mat<3, 2, T, Q> const& m, typename mat<3, 2, T, Q>::row_type const& v);
+
135  GLM_FUNC_DECL constexpr typename mat<3, 2, T, Q>::col_type operator*(mat<3, 2, T, Q> const& m, typename mat<3, 2, T, Q>::row_type const& v);
136 
137  template<typename T, qualifier Q>
-
138  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 2, T, Q>::row_type operator*(typename mat<3, 2, T, Q>::col_type const& v, mat<3, 2, T, Q> const& m);
+
138  GLM_FUNC_DECL constexpr typename mat<3, 2, T, Q>::row_type operator*(typename mat<3, 2, T, Q>::col_type const& v, mat<3, 2, T, Q> const& m);
139 
140  template<typename T, qualifier Q>
-
141  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
141  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
142 
143  template<typename T, qualifier Q>
-
144  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
144  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
145 
146  template<typename T, qualifier Q>
-
147  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
147  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
148 
149  template<typename T, qualifier Q>
-
150  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator/(mat<3, 2, T, Q> const& m, T scalar);
+
150  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator/(mat<3, 2, T, Q> const& m, T scalar);
151 
152  template<typename T, qualifier Q>
-
153  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator/(T scalar, mat<3, 2, T, Q> const& m);
+
153  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator/(T scalar, mat<3, 2, T, Q> const& m);
154 
155  // -- Boolean operators --
156 
157  template<typename T, qualifier Q>
-
158  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
158  GLM_FUNC_DECL constexpr bool operator==(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
159 
160  template<typename T, qualifier Q>
-
161  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
+
161  GLM_FUNC_DECL constexpr bool operator!=(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2);
162 
163 }//namespace glm
164 
diff --git a/doc/api/a00056_source.html b/doc/api/a00056_source.html index 4f22f7446..a7f886e47 100644 --- a/doc/api/a00056_source.html +++ b/doc/api/a00056_source.html @@ -95,14 +95,14 @@ $(function() {
25  // -- Accesses --
26 
27  typedef length_t length_type;
-
28  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 3; }
+
28  GLM_FUNC_DECL static constexpr length_type length() { return 3; }
29 
-
30  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
30  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
32 
33  // -- Constructors --
34 
-
35  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
35  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
36  template<qualifier P>
37  GLM_CTOR_DECL mat(mat<3, 3, T, P> const& m);
38 
@@ -150,103 +150,103 @@ $(function() {
80  // -- Unary arithmetic operators --
81 
82  template<typename U>
-
83  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator=(mat<3, 3, U, Q> const& m);
+
83  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator=(mat<3, 3, U, Q> const& m);
84  template<typename U>
-
85  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator+=(U s);
+
85  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator+=(U s);
86  template<typename U>
-
87  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator+=(mat<3, 3, U, Q> const& m);
+
87  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator+=(mat<3, 3, U, Q> const& m);
88  template<typename U>
-
89  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator-=(U s);
+
89  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator-=(U s);
90  template<typename U>
-
91  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator-=(mat<3, 3, U, Q> const& m);
+
91  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator-=(mat<3, 3, U, Q> const& m);
92  template<typename U>
-
93  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator*=(U s);
+
93  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator*=(U s);
94  template<typename U>
-
95  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator*=(mat<3, 3, U, Q> const& m);
+
95  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator*=(mat<3, 3, U, Q> const& m);
96  template<typename U>
-
97  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator/=(U s);
+
97  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator/=(U s);
98  template<typename U>
-
99  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator/=(mat<3, 3, U, Q> const& m);
+
99  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator/=(mat<3, 3, U, Q> const& m);
100 
101  // -- Increment and decrement operators --
102 
-
103  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator++();
-
104  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator--();
-
105  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator++(int);
-
106  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator--(int);
+
103  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator++();
+
104  GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator--();
+
105  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator++(int);
+
106  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator--(int);
107  };
108 
109  // -- Unary operators --
110 
111  template<typename T, qualifier Q>
-
112  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m);
+
112  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m);
113 
114  template<typename T, qualifier Q>
-
115  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m);
+
115  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m);
116 
117  // -- Binary operators --
118 
119  template<typename T, qualifier Q>
-
120  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m, T scalar);
+
120  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m, T scalar);
121 
122  template<typename T, qualifier Q>
-
123  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(T scalar, mat<3, 3, T, Q> const& m);
+
123  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(T scalar, mat<3, 3, T, Q> const& m);
124 
125  template<typename T, qualifier Q>
-
126  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
126  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
127 
128  template<typename T, qualifier Q>
-
129  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m, T scalar);
+
129  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m, T scalar);
130 
131  template<typename T, qualifier Q>
-
132  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(T scalar, mat<3, 3, T, Q> const& m);
+
132  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(T scalar, mat<3, 3, T, Q> const& m);
133 
134  template<typename T, qualifier Q>
-
135  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
135  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
136 
137  template<typename T, qualifier Q>
-
138  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m, T scalar);
+
138  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m, T scalar);
139 
140  template<typename T, qualifier Q>
-
141  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(T scalar, mat<3, 3, T, Q> const& m);
+
141  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(T scalar, mat<3, 3, T, Q> const& m);
142 
143  template<typename T, qualifier Q>
-
144  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type operator*(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v);
+
144  GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::col_type operator*(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v);
145 
146  template<typename T, qualifier Q>
-
147  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::row_type operator*(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m);
+
147  GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::row_type operator*(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m);
148 
149  template<typename T, qualifier Q>
-
150  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
150  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
151 
152  template<typename T, qualifier Q>
-
153  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
153  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
154 
155  template<typename T, qualifier Q>
-
156  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
156  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
157 
158  template<typename T, qualifier Q>
-
159  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m, T scalar);
+
159  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m, T scalar);
160 
161  template<typename T, qualifier Q>
-
162  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator/(T scalar, mat<3, 3, T, Q> const& m);
+
162  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator/(T scalar, mat<3, 3, T, Q> const& m);
163 
164  template<typename T, qualifier Q>
-
165  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type operator/(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v);
+
165  GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::col_type operator/(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v);
166 
167  template<typename T, qualifier Q>
-
168  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::row_type operator/(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m);
+
168  GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::row_type operator/(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m);
169 
170  template<typename T, qualifier Q>
-
171  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
171  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
172 
173  // -- Boolean operators --
174 
175  template<typename T, qualifier Q>
-
176  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
176  GLM_FUNC_DECL constexpr bool operator==(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
177 
178  template<typename T, qualifier Q>
-
179  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
179  GLM_FUNC_DECL constexpr bool operator!=(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
180 }//namespace glm
181 
182 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00059_source.html b/doc/api/a00059_source.html index 3b0ae540c..ba6aaef82 100644 --- a/doc/api/a00059_source.html +++ b/doc/api/a00059_source.html @@ -96,14 +96,14 @@ $(function() {
26  // -- Accesses --
27 
28  typedef length_t length_type;
-
29  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 3; }
+
29  GLM_FUNC_DECL static constexpr length_type length() { return 3; }
30 
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
32  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
32  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
33 
34  // -- Constructors --
35 
-
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
37  template<qualifier P>
38  GLM_CTOR_DECL mat(mat<3, 4, T, P> const& m);
39 
@@ -151,84 +151,84 @@ $(function() {
81  // -- Unary arithmetic operators --
82 
83  template<typename U>
-
84  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator=(mat<3, 4, U, Q> const& m);
+
84  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator=(mat<3, 4, U, Q> const& m);
85  template<typename U>
-
86  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator+=(U s);
+
86  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator+=(U s);
87  template<typename U>
-
88  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator+=(mat<3, 4, U, Q> const& m);
+
88  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator+=(mat<3, 4, U, Q> const& m);
89  template<typename U>
-
90  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator-=(U s);
+
90  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator-=(U s);
91  template<typename U>
-
92  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator-=(mat<3, 4, U, Q> const& m);
+
92  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator-=(mat<3, 4, U, Q> const& m);
93  template<typename U>
-
94  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator*=(U s);
+
94  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator*=(U s);
95  template<typename U>
-
96  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator/=(U s);
+
96  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator/=(U s);
97 
98  // -- Increment and decrement operators --
99 
-
100  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator++();
-
101  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator--();
-
102  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator++(int);
-
103  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator--(int);
+
100  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator++();
+
101  GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator--();
+
102  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator++(int);
+
103  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator--(int);
104  };
105 
106  // -- Unary operators --
107 
108  template<typename T, qualifier Q>
-
109  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m);
+
109  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m);
110 
111  template<typename T, qualifier Q>
-
112  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m);
+
112  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m);
113 
114  // -- Binary operators --
115 
116  template<typename T, qualifier Q>
-
117  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar);
+
117  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar);
118 
119  template<typename T, qualifier Q>
-
120  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
120  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
121 
122  template<typename T, qualifier Q>
-
123  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar);
+
123  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar);
124 
125  template<typename T, qualifier Q>
-
126  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
126  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
127 
128  template<typename T, qualifier Q>
-
129  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar);
+
129  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar);
130 
131  template<typename T, qualifier Q>
-
132  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m);
+
132  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m);
133 
134  template<typename T, qualifier Q>
-
135  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type operator*(mat<3, 4, T, Q> const& m, typename mat<3, 4, T, Q>::row_type const& v);
+
135  GLM_FUNC_DECL constexpr typename mat<3, 4, T, Q>::col_type operator*(mat<3, 4, T, Q> const& m, typename mat<3, 4, T, Q>::row_type const& v);
136 
137  template<typename T, qualifier Q>
-
138  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 4, T, Q>::row_type operator*(typename mat<3, 4, T, Q>::col_type const& v, mat<3, 4, T, Q> const& m);
+
138  GLM_FUNC_DECL constexpr typename mat<3, 4, T, Q>::row_type operator*(typename mat<3, 4, T, Q>::col_type const& v, mat<3, 4, T, Q> const& m);
139 
140  template<typename T, qualifier Q>
-
141  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
141  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
142 
143  template<typename T, qualifier Q>
-
144  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
+
144  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2);
145 
146  template<typename T, qualifier Q>
-
147  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
+
147  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2);
148 
149  template<typename T, qualifier Q>
-
150  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar);
+
150  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar);
151 
152  template<typename T, qualifier Q>
-
153  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m);
+
153  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m);
154 
155  // -- Boolean operators --
156 
157  template<typename T, qualifier Q>
-
158  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
158  GLM_FUNC_DECL constexpr bool operator==(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
159 
160  template<typename T, qualifier Q>
-
161  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
161  GLM_FUNC_DECL constexpr bool operator!=(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
162 }//namespace glm
163 
164 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00062_source.html b/doc/api/a00062_source.html index b4121c592..64824730a 100644 --- a/doc/api/a00062_source.html +++ b/doc/api/a00062_source.html @@ -96,14 +96,14 @@ $(function() {
26  // -- Accesses --
27 
28  typedef length_t length_type;
-
29  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 4; }
+
29  GLM_FUNC_DECL static constexpr length_type length() { return 4; }
30 
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
32  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
32  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
33 
34  // -- Constructors --
35 
-
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
37  template<qualifier P>
38  GLM_CTOR_DECL mat(mat<4, 2, T, P> const& m);
39 
@@ -156,84 +156,84 @@ $(function() {
86  // -- Unary arithmetic operators --
87 
88  template<typename U>
-
89  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator=(mat<4, 2, U, Q> const& m);
+
89  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator=(mat<4, 2, U, Q> const& m);
90  template<typename U>
-
91  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator+=(U s);
+
91  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator+=(U s);
92  template<typename U>
-
93  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator+=(mat<4, 2, U, Q> const& m);
+
93  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator+=(mat<4, 2, U, Q> const& m);
94  template<typename U>
-
95  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator-=(U s);
+
95  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator-=(U s);
96  template<typename U>
-
97  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator-=(mat<4, 2, U, Q> const& m);
+
97  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator-=(mat<4, 2, U, Q> const& m);
98  template<typename U>
-
99  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator*=(U s);
+
99  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator*=(U s);
100  template<typename U>
-
101  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator/=(U s);
+
101  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator/=(U s);
102 
103  // -- Increment and decrement operators --
104 
-
105  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator++ ();
-
106  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator-- ();
-
107  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator++(int);
-
108  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator--(int);
+
105  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator++ ();
+
106  GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator-- ();
+
107  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator++(int);
+
108  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator--(int);
109  };
110 
111  // -- Unary operators --
112 
113  template<typename T, qualifier Q>
-
114  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m);
+
114  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m);
115 
116  template<typename T, qualifier Q>
-
117  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m);
+
117  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m);
118 
119  // -- Binary operators --
120 
121  template<typename T, qualifier Q>
-
122  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m, T scalar);
+
122  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m, T scalar);
123 
124  template<typename T, qualifier Q>
-
125  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
125  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
126 
127  template<typename T, qualifier Q>
-
128  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m, T scalar);
+
128  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m, T scalar);
129 
130  template<typename T, qualifier Q>
-
131  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
131  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
132 
133  template<typename T, qualifier Q>
-
134  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m, T scalar);
+
134  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m, T scalar);
135 
136  template<typename T, qualifier Q>
-
137  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(T scalar, mat<4, 2, T, Q> const& m);
+
137  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(T scalar, mat<4, 2, T, Q> const& m);
138 
139  template<typename T, qualifier Q>
-
140  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type operator*(mat<4, 2, T, Q> const& m, typename mat<4, 2, T, Q>::row_type const& v);
+
140  GLM_FUNC_DECL constexpr typename mat<4, 2, T, Q>::col_type operator*(mat<4, 2, T, Q> const& m, typename mat<4, 2, T, Q>::row_type const& v);
141 
142  template<typename T, qualifier Q>
-
143  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 2, T, Q>::row_type operator*(typename mat<4, 2, T, Q>::col_type const& v, mat<4, 2, T, Q> const& m);
+
143  GLM_FUNC_DECL constexpr typename mat<4, 2, T, Q>::row_type operator*(typename mat<4, 2, T, Q>::col_type const& v, mat<4, 2, T, Q> const& m);
144 
145  template<typename T, qualifier Q>
-
146  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
146  GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
147 
148  template<typename T, qualifier Q>
-
149  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
149  GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
150 
151  template<typename T, qualifier Q>
-
152  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
152  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
153 
154  template<typename T, qualifier Q>
-
155  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator/(mat<4, 2, T, Q> const& m, T scalar);
+
155  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator/(mat<4, 2, T, Q> const& m, T scalar);
156 
157  template<typename T, qualifier Q>
-
158  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator/(T scalar, mat<4, 2, T, Q> const& m);
+
158  GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator/(T scalar, mat<4, 2, T, Q> const& m);
159 
160  // -- Boolean operators --
161 
162  template<typename T, qualifier Q>
-
163  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
163  GLM_FUNC_DECL constexpr bool operator==(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
164 
165  template<typename T, qualifier Q>
-
166  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
+
166  GLM_FUNC_DECL constexpr bool operator!=(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2);
167 }//namespace glm
168 
169 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00065_source.html b/doc/api/a00065_source.html index 4eb0ff3fd..664217aa9 100644 --- a/doc/api/a00065_source.html +++ b/doc/api/a00065_source.html @@ -96,14 +96,14 @@ $(function() {
26  // -- Accesses --
27 
28  typedef length_t length_type;
-
29  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 4; }
+
29  GLM_FUNC_DECL static constexpr length_type length() { return 4; }
30 
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
32  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
32  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
33 
34  // -- Constructors --
35 
-
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
36  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
37  template<qualifier P>
38  GLM_CTOR_DECL mat(mat<4, 3, T, P> const& m);
39 
@@ -156,84 +156,84 @@ $(function() {
86  // -- Unary arithmetic operators --
87 
88  template<typename U>
-
89  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator=(mat<4, 3, U, Q> const& m);
+
89  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator=(mat<4, 3, U, Q> const& m);
90  template<typename U>
-
91  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator+=(U s);
+
91  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator+=(U s);
92  template<typename U>
-
93  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator+=(mat<4, 3, U, Q> const& m);
+
93  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator+=(mat<4, 3, U, Q> const& m);
94  template<typename U>
-
95  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator-=(U s);
+
95  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator-=(U s);
96  template<typename U>
-
97  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator-=(mat<4, 3, U, Q> const& m);
+
97  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator-=(mat<4, 3, U, Q> const& m);
98  template<typename U>
-
99  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator*=(U s);
+
99  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator*=(U s);
100  template<typename U>
-
101  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator/=(U s);
+
101  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator/=(U s);
102 
103  // -- Increment and decrement operators --
104 
-
105  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q>& operator++();
-
106  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q>& operator--();
-
107  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator++(int);
-
108  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator--(int);
+
105  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q>& operator++();
+
106  GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q>& operator--();
+
107  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator++(int);
+
108  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator--(int);
109  };
110 
111  // -- Unary operators --
112 
113  template<typename T, qualifier Q>
-
114  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m);
+
114  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m);
115 
116  template<typename T, qualifier Q>
-
117  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m);
+
117  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m);
118 
119  // -- Binary operators --
120 
121  template<typename T, qualifier Q>
-
122  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m, T scalar);
+
122  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m, T scalar);
123 
124  template<typename T, qualifier Q>
-
125  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
125  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
126 
127  template<typename T, qualifier Q>
-
128  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m, T scalar);
+
128  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m, T scalar);
129 
130  template<typename T, qualifier Q>
-
131  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
131  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
132 
133  template<typename T, qualifier Q>
-
134  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m, T scalar);
+
134  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m, T scalar);
135 
136  template<typename T, qualifier Q>
-
137  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(T scalar, mat<4, 3, T, Q> const& m);
+
137  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(T scalar, mat<4, 3, T, Q> const& m);
138 
139  template<typename T, qualifier Q>
-
140  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type operator*(mat<4, 3, T, Q> const& m, typename mat<4, 3, T, Q>::row_type const& v);
+
140  GLM_FUNC_DECL constexpr typename mat<4, 3, T, Q>::col_type operator*(mat<4, 3, T, Q> const& m, typename mat<4, 3, T, Q>::row_type const& v);
141 
142  template<typename T, qualifier Q>
-
143  GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 3, T, Q>::row_type operator*(typename mat<4, 3, T, Q>::col_type const& v, mat<4, 3, T, Q> const& m);
+
143  GLM_FUNC_DECL constexpr typename mat<4, 3, T, Q>::row_type operator*(typename mat<4, 3, T, Q>::col_type const& v, mat<4, 3, T, Q> const& m);
144 
145  template<typename T, qualifier Q>
-
146  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
146  GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
147 
148  template<typename T, qualifier Q>
-
149  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
149  GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
150 
151  template<typename T, qualifier Q>
-
152  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
152  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
153 
154  template<typename T, qualifier Q>
-
155  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator/(mat<4, 3, T, Q> const& m, T scalar);
+
155  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator/(mat<4, 3, T, Q> const& m, T scalar);
156 
157  template<typename T, qualifier Q>
-
158  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator/(T scalar, mat<4, 3, T, Q> const& m);
+
158  GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator/(T scalar, mat<4, 3, T, Q> const& m);
159 
160  // -- Boolean operators --
161 
162  template<typename T, qualifier Q>
-
163  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
163  GLM_FUNC_DECL constexpr bool operator==(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
164 
165  template<typename T, qualifier Q>
-
166  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
+
166  GLM_FUNC_DECL constexpr bool operator!=(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2);
167 }//namespace glm
168 
169 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00068_source.html b/doc/api/a00068_source.html index ed119d66f..4e0a7ef9f 100644 --- a/doc/api/a00068_source.html +++ b/doc/api/a00068_source.html @@ -95,14 +95,14 @@ $(function() {
25  // -- Accesses --
26 
27  typedef length_t length_type;
-
28  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;}
+
28  GLM_FUNC_DECL static constexpr length_type length(){return 4;}
29 
-
30  GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT;
-
31  GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT;
+
30  GLM_FUNC_DECL constexpr col_type & operator[](length_type i) GLM_NOEXCEPT;
+
31  GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const GLM_NOEXCEPT;
32 
33  // -- Constructors --
34 
-
35  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR;
+
35  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR;
36  template<qualifier P>
37  GLM_CTOR_DECL mat(mat<4, 4, T, P> const& m);
38 
@@ -155,103 +155,103 @@ $(function() {
85  // -- Unary arithmetic operators --
86 
87  template<typename U>
-
88  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m);
+
88  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m);
89  template<typename U>
-
90  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator+=(U s);
+
90  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator+=(U s);
91  template<typename U>
-
92  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator+=(mat<4, 4, U, Q> const& m);
+
92  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator+=(mat<4, 4, U, Q> const& m);
93  template<typename U>
-
94  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator-=(U s);
+
94  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator-=(U s);
95  template<typename U>
-
96  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator-=(mat<4, 4, U, Q> const& m);
+
96  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator-=(mat<4, 4, U, Q> const& m);
97  template<typename U>
-
98  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator*=(U s);
+
98  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator*=(U s);
99  template<typename U>
-
100  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator*=(mat<4, 4, U, Q> const& m);
+
100  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator*=(mat<4, 4, U, Q> const& m);
101  template<typename U>
-
102  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator/=(U s);
+
102  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator/=(U s);
103  template<typename U>
-
104  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator/=(mat<4, 4, U, Q> const& m);
+
104  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator/=(mat<4, 4, U, Q> const& m);
105 
106  // -- Increment and decrement operators --
107 
-
108  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator++();
-
109  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator--();
-
110  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator++(int);
-
111  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator--(int);
+
108  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator++();
+
109  GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator--();
+
110  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator++(int);
+
111  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator--(int);
112  };
113 
114  // -- Unary operators --
115 
116  template<typename T, qualifier Q>
-
117  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m);
+
117  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m);
118 
119  template<typename T, qualifier Q>
-
120  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m);
+
120  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m);
121 
122  // -- Binary operators --
123 
124  template<typename T, qualifier Q>
-
125  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T scalar);
+
125  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T scalar);
126 
127  template<typename T, qualifier Q>
-
128  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(T scalar, mat<4, 4, T, Q> const& m);
+
128  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(T scalar, mat<4, 4, T, Q> const& m);
129 
130  template<typename T, qualifier Q>
-
131  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
131  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
132 
133  template<typename T, qualifier Q>
-
134  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T scalar);
+
134  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T scalar);
135 
136  template<typename T, qualifier Q>
-
137  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(T scalar, mat<4, 4, T, Q> const& m);
+
137  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(T scalar, mat<4, 4, T, Q> const& m);
138 
139  template<typename T, qualifier Q>
-
140  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
140  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
141 
142  template<typename T, qualifier Q>
-
143  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T scalar);
+
143  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T scalar);
144 
145  template<typename T, qualifier Q>
-
146  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(T scalar, mat<4, 4, T, Q> const& m);
+
146  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(T scalar, mat<4, 4, T, Q> const& m);
147 
148  template<typename T, qualifier Q>
-
149  GLM_FUNC_DECL GLM_CONSTEXPR 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);
+
149  GLM_FUNC_DECL constexpr 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);
150 
151  template<typename T, qualifier Q>
-
152  GLM_FUNC_DECL GLM_CONSTEXPR 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);
+
152  GLM_FUNC_DECL constexpr 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);
153 
154  template<typename T, qualifier Q>
-
155  GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
+
155  GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2);
156 
157  template<typename T, qualifier Q>
-
158  GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
+
158  GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2);
159 
160  template<typename T, qualifier Q>
-
161  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
161  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
162 
163  template<typename T, qualifier Q>
-
164  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T scalar);
+
164  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T scalar);
165 
166  template<typename T, qualifier Q>
-
167  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator/(T scalar, mat<4, 4, T, Q> const& m);
+
167  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator/(T scalar, mat<4, 4, T, Q> const& m);
168 
169  template<typename T, qualifier Q>
-
170  GLM_FUNC_DECL GLM_CONSTEXPR 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);
+
170  GLM_FUNC_DECL constexpr 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);
171 
172  template<typename T, qualifier Q>
-
173  GLM_FUNC_DECL GLM_CONSTEXPR 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);
+
173  GLM_FUNC_DECL constexpr 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);
174 
175  template<typename T, qualifier Q>
-
176  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
176  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
177 
178  // -- Boolean operators --
179 
180  template<typename T, qualifier Q>
-
181  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
181  GLM_FUNC_DECL constexpr bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
182 
183  template<typename T, qualifier Q>
-
184  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
+
184  GLM_FUNC_DECL constexpr bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2);
185 }//namespace glm
186 
187 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00071_source.html b/doc/api/a00071_source.html index 37f0eff98..573537dd3 100644 --- a/doc/api/a00071_source.html +++ b/doc/api/a00071_source.html @@ -132,15 +132,15 @@ $(function() {
62 
63  typedef length_t length_type;
64 
-
66  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;}
+
66  GLM_FUNC_DECL static constexpr length_type length(){return 4;}
67 
-
68  GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i);
-
69  GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const;
+
68  GLM_FUNC_DECL constexpr T & operator[](length_type i);
+
69  GLM_FUNC_DECL constexpr T const& operator[](length_type i) const;
70 
71  // -- Implicit basic constructors --
72 
-
73  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR qua() GLM_DEFAULT_CTOR;
-
74  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua(qua<T, Q> const& q) GLM_DEFAULT;
+
73  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr qua() GLM_DEFAULT_CTOR;
+
74  GLM_DEFAULTED_FUNC_DECL constexpr qua(qua<T, Q> const& q) GLM_DEFAULT;
75  template<qualifier P>
76  GLM_CTOR_DECL qua(qua<T, P> const& q);
77 
@@ -154,7 +154,7 @@ $(function() {
85  GLM_CTOR_DECL qua(T w, T x, T y, T z);
86 # endif
87 
-
88  GLM_FUNC_DECL static GLM_CONSTEXPR qua<T, Q> wxyz(T w, T x, T y, T z);
+
88  GLM_FUNC_DECL static constexpr qua<T, Q> wxyz(T w, T x, T y, T z);
89 
90  // -- Conversion constructors --
91 
@@ -174,20 +174,20 @@ $(function() {
113 
114  // -- Unary arithmetic operators --
115 
-
116  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua<T, Q>& operator=(qua<T, Q> const& q) GLM_DEFAULT;
+
116  GLM_DEFAULTED_FUNC_DECL constexpr qua<T, Q>& operator=(qua<T, Q> const& q) GLM_DEFAULT;
117 
118  template<typename U>
-
119  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua<T, Q>& operator=(qua<U, Q> const& q);
+
119  GLM_FUNC_DISCARD_DECL constexpr qua<T, Q>& operator=(qua<U, Q> const& q);
120  template<typename U>
-
121  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua<T, Q>& operator+=(qua<U, Q> const& q);
+
121  GLM_FUNC_DISCARD_DECL constexpr qua<T, Q>& operator+=(qua<U, Q> const& q);
122  template<typename U>
-
123  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua<T, Q>& operator-=(qua<U, Q> const& q);
+
123  GLM_FUNC_DISCARD_DECL constexpr qua<T, Q>& operator-=(qua<U, Q> const& q);
124  template<typename U>
-
125  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua<T, Q>& operator*=(qua<U, Q> const& q);
+
125  GLM_FUNC_DISCARD_DECL constexpr qua<T, Q>& operator*=(qua<U, Q> const& q);
126  template<typename U>
-
127  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua<T, Q>& operator*=(U s);
+
127  GLM_FUNC_DISCARD_DECL constexpr qua<T, Q>& operator*=(U s);
128  template<typename U>
-
129  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua<T, Q>& operator/=(U s);
+
129  GLM_FUNC_DISCARD_DECL constexpr qua<T, Q>& operator/=(U s);
130  };
131 
132 # if GLM_SILENT_WARNINGS == GLM_ENABLE
@@ -203,50 +203,50 @@ $(function() {
142  // -- Unary bit operators --
143 
144  template<typename T, qualifier Q>
-
145  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator+(qua<T, Q> const& q);
+
145  GLM_FUNC_DECL constexpr qua<T, Q> operator+(qua<T, Q> const& q);
146 
147  template<typename T, qualifier Q>
-
148  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator-(qua<T, Q> const& q);
+
148  GLM_FUNC_DECL constexpr qua<T, Q> operator-(qua<T, Q> const& q);
149 
150  // -- Binary operators --
151 
152  template<typename T, qualifier Q>
-
153  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator+(qua<T, Q> const& q, qua<T, Q> const& p);
+
153  GLM_FUNC_DECL constexpr qua<T, Q> operator+(qua<T, Q> const& q, qua<T, Q> const& p);
154 
155  template<typename T, qualifier Q>
-
156  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator-(qua<T, Q> const& q, qua<T, Q> const& p);
+
156  GLM_FUNC_DECL constexpr qua<T, Q> operator-(qua<T, Q> const& q, qua<T, Q> const& p);
157 
158  template<typename T, qualifier Q>
-
159  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator*(qua<T, Q> const& q, qua<T, Q> const& p);
+
159  GLM_FUNC_DECL constexpr qua<T, Q> operator*(qua<T, Q> const& q, qua<T, Q> const& p);
160 
161  template<typename T, qualifier Q>
-
162  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(qua<T, Q> const& q, vec<3, T, Q> const& v);
+
162  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(qua<T, Q> const& q, vec<3, T, Q> const& v);
163 
164  template<typename T, qualifier Q>
-
165  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, qua<T, Q> const& q);
+
165  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, qua<T, Q> const& q);
166 
167  template<typename T, qualifier Q>
-
168  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(qua<T, Q> const& q, vec<4, T, Q> const& v);
+
168  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(qua<T, Q> const& q, vec<4, T, Q> const& v);
169 
170  template<typename T, qualifier Q>
-
171  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v, qua<T, Q> const& q);
+
171  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v, qua<T, Q> const& q);
172 
173  template<typename T, qualifier Q>
-
174  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator*(qua<T, Q> const& q, T const& s);
+
174  GLM_FUNC_DECL constexpr qua<T, Q> operator*(qua<T, Q> const& q, T const& s);
175 
176  template<typename T, qualifier Q>
-
177  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator*(T const& s, qua<T, Q> const& q);
+
177  GLM_FUNC_DECL constexpr qua<T, Q> operator*(T const& s, qua<T, Q> const& q);
178 
179  template<typename T, qualifier Q>
-
180  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> operator/(qua<T, Q> const& q, T const& s);
+
180  GLM_FUNC_DECL constexpr qua<T, Q> operator/(qua<T, Q> const& q, T const& s);
181 
182  // -- Boolean operators --
183 
184  template<typename T, qualifier Q>
-
185  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(qua<T, Q> const& q1, qua<T, Q> const& q2);
+
185  GLM_FUNC_DECL constexpr bool operator==(qua<T, Q> const& q1, qua<T, Q> const& q2);
186 
187  template<typename T, qualifier Q>
-
188  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(qua<T, Q> const& q1, qua<T, Q> const& q2);
+
188  GLM_FUNC_DECL constexpr bool operator!=(qua<T, Q> const& q1, qua<T, Q> const& q2);
189 } //namespace glm
190 
191 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00074_source.html b/doc/api/a00074_source.html index 50ce83577..cda7cc7da 100644 --- a/doc/api/a00074_source.html +++ b/doc/api/a00074_source.html @@ -154,15 +154,15 @@ $(function() {
84  // -- Component accesses --
85 
87  typedef length_t length_type;
-
88  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 1;}
+
88  GLM_FUNC_DECL static constexpr length_type length(){return 1;}
89 
-
90  GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i);
-
91  GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const;
+
90  GLM_FUNC_DECL constexpr T & operator[](length_type i);
+
91  GLM_FUNC_DECL constexpr T const& operator[](length_type i) const;
92 
93  // -- Implicit basic constructors --
94 
-
95  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
-
96  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
+
95  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR;
+
96  GLM_DEFAULTED_FUNC_DECL constexpr vec(vec const& v) GLM_DEFAULT;
97  template<qualifier P>
98  GLM_CTOR_DECL vec(vec<1, T, P> const& v);
99 
@@ -186,7 +186,7 @@ $(function() {
121 /*
122 # if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
123  template<int E0>
-
124  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(detail::_swizzle<1, T, Q, E0, -1,-2,-3> const& that)
+
124  GLM_FUNC_DISCARD_DECL constexpr vec(detail::_swizzle<1, T, Q, E0, -1,-2,-3> const& that)
125  {
126  *this = that();
127  }
@@ -194,178 +194,178 @@ $(function() {
129 */
130  // -- Unary arithmetic operators --
131 
-
132  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> & operator=(vec const& v) GLM_DEFAULT;
+
132  GLM_DEFAULTED_FUNC_DECL constexpr vec<1, T, Q> & operator=(vec const& v) GLM_DEFAULT;
133 
134  template<typename U>
-
135  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator=(vec<1, U, Q> const& v);
+
135  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator=(vec<1, U, Q> const& v);
136  template<typename U>
-
137  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator+=(U scalar);
+
137  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator+=(U scalar);
138  template<typename U>
-
139  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator+=(vec<1, U, Q> const& v);
+
139  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator+=(vec<1, U, Q> const& v);
140  template<typename U>
-
141  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator-=(U scalar);
+
141  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator-=(U scalar);
142  template<typename U>
-
143  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator-=(vec<1, U, Q> const& v);
+
143  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator-=(vec<1, U, Q> const& v);
144  template<typename U>
-
145  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator*=(U scalar);
+
145  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator*=(U scalar);
146  template<typename U>
-
147  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator*=(vec<1, U, Q> const& v);
+
147  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator*=(vec<1, U, Q> const& v);
148  template<typename U>
-
149  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator/=(U scalar);
+
149  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator/=(U scalar);
150  template<typename U>
-
151  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator/=(vec<1, U, Q> const& v);
+
151  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator/=(vec<1, U, Q> const& v);
152 
153  // -- Increment and decrement operators --
154 
-
155  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator++();
-
156  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator--();
-
157  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator++(int);
-
158  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator--(int);
+
155  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator++();
+
156  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator--();
+
157  GLM_FUNC_DECL constexpr vec<1, T, Q> operator++(int);
+
158  GLM_FUNC_DECL constexpr vec<1, T, Q> operator--(int);
159 
160  // -- Unary bit operators --
161 
162  template<typename U>
-
163  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator%=(U scalar);
+
163  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator%=(U scalar);
164  template<typename U>
-
165  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator%=(vec<1, U, Q> const& v);
+
165  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator%=(vec<1, U, Q> const& v);
166  template<typename U>
-
167  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator&=(U scalar);
+
167  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator&=(U scalar);
168  template<typename U>
-
169  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator&=(vec<1, U, Q> const& v);
+
169  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator&=(vec<1, U, Q> const& v);
170  template<typename U>
-
171  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator|=(U scalar);
+
171  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator|=(U scalar);
172  template<typename U>
-
173  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator|=(vec<1, U, Q> const& v);
+
173  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator|=(vec<1, U, Q> const& v);
174  template<typename U>
-
175  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator^=(U scalar);
+
175  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator^=(U scalar);
176  template<typename U>
-
177  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator^=(vec<1, U, Q> const& v);
+
177  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator^=(vec<1, U, Q> const& v);
178  template<typename U>
-
179  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator<<=(U scalar);
+
179  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator<<=(U scalar);
180  template<typename U>
-
181  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator<<=(vec<1, U, Q> const& v);
+
181  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator<<=(vec<1, U, Q> const& v);
182  template<typename U>
-
183  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator>>=(U scalar);
+
183  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator>>=(U scalar);
184  template<typename U>
-
185  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator>>=(vec<1, U, Q> const& v);
+
185  GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator>>=(vec<1, U, Q> const& v);
186  };
187 
188  // -- Unary operators --
189 
190  template<typename T, qualifier Q>
-
191  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v);
+
191  GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v);
192 
193  template<typename T, qualifier Q>
-
194  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v);
+
194  GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v);
195 
196  // -- Binary operators --
197 
198  template<typename T, qualifier Q>
-
199  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar);
+
199  GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar);
200 
201  template<typename T, qualifier Q>
-
202  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v);
+
202  GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v);
203 
204  template<typename T, qualifier Q>
-
205  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
205  GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
206 
207  template<typename T, qualifier Q>
-
208  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar);
+
208  GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar);
209 
210  template<typename T, qualifier Q>
-
211  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v);
+
211  GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v);
212 
213  template<typename T, qualifier Q>
-
214  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
214  GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
215 
216  template<typename T, qualifier Q>
-
217  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar);
+
217  GLM_FUNC_DECL constexpr vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar);
218 
219  template<typename T, qualifier Q>
-
220  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v);
+
220  GLM_FUNC_DECL constexpr vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v);
221 
222  template<typename T, qualifier Q>
-
223  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
223  GLM_FUNC_DECL constexpr vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
224 
225  template<typename T, qualifier Q>
-
226  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar);
+
226  GLM_FUNC_DECL constexpr vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar);
227 
228  template<typename T, qualifier Q>
-
229  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v);
+
229  GLM_FUNC_DECL constexpr vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v);
230 
231  template<typename T, qualifier Q>
-
232  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
232  GLM_FUNC_DECL constexpr vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
233 
234  template<typename T, qualifier Q>
-
235  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar);
+
235  GLM_FUNC_DECL constexpr vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar);
236 
237  template<typename T, qualifier Q>
-
238  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v);
+
238  GLM_FUNC_DECL constexpr vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v);
239 
240  template<typename T, qualifier Q>
-
241  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
241  GLM_FUNC_DECL constexpr vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
242 
243  template<typename T, qualifier Q>
-
244  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar);
+
244  GLM_FUNC_DECL constexpr vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar);
245 
246  template<typename T, qualifier Q>
-
247  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v);
+
247  GLM_FUNC_DECL constexpr vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v);
248 
249  template<typename T, qualifier Q>
-
250  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
250  GLM_FUNC_DECL constexpr vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
251 
252  template<typename T, qualifier Q>
-
253  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar);
+
253  GLM_FUNC_DECL constexpr vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar);
254 
255  template<typename T, qualifier Q>
-
256  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v);
+
256  GLM_FUNC_DECL constexpr vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v);
257 
258  template<typename T, qualifier Q>
-
259  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
259  GLM_FUNC_DECL constexpr vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
260 
261  template<typename T, qualifier Q>
-
262  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar);
+
262  GLM_FUNC_DECL constexpr vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar);
263 
264  template<typename T, qualifier Q>
-
265  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v);
+
265  GLM_FUNC_DECL constexpr vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v);
266 
267  template<typename T, qualifier Q>
-
268  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
268  GLM_FUNC_DECL constexpr vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
269 
270  template<typename T, qualifier Q>
-
271  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar);
+
271  GLM_FUNC_DECL constexpr vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar);
272 
273  template<typename T, qualifier Q>
-
274  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v);
+
274  GLM_FUNC_DECL constexpr vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v);
275 
276  template<typename T, qualifier Q>
-
277  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
277  GLM_FUNC_DECL constexpr vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
278 
279  template<typename T, qualifier Q>
-
280  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar);
+
280  GLM_FUNC_DECL constexpr vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar);
281 
282  template<typename T, qualifier Q>
-
283  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v);
+
283  GLM_FUNC_DECL constexpr vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v);
284 
285  template<typename T, qualifier Q>
-
286  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
286  GLM_FUNC_DECL constexpr vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
287 
288  template<typename T, qualifier Q>
-
289  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator~(vec<1, T, Q> const& v);
+
289  GLM_FUNC_DECL constexpr vec<1, T, Q> operator~(vec<1, T, Q> const& v);
290 
291  // -- Boolean operators --
292 
293  template<typename T, qualifier Q>
-
294  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
294  GLM_FUNC_DECL constexpr bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
295 
296  template<typename T, qualifier Q>
-
297  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
+
297  GLM_FUNC_DECL constexpr bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2);
298 
299  template<qualifier Q>
-
300  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2);
+
300  GLM_FUNC_DECL constexpr vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2);
301 
302  template<qualifier Q>
-
303  GLM_FUNC_DECL GLM_CONSTEXPR vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2);
+
303  GLM_FUNC_DECL constexpr vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2);
304 }//namespace glm
305 
306 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00077_source.html b/doc/api/a00077_source.html index 1c0196ea5..5645e904a 100644 --- a/doc/api/a00077_source.html +++ b/doc/api/a00077_source.html @@ -160,15 +160,15 @@ $(function() {
90  // -- Component accesses --
91 
93  typedef length_t length_type;
-
94  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 2;}
+
94  GLM_FUNC_DECL static constexpr length_type length(){return 2;}
95 
-
96  GLM_FUNC_DECL GLM_CONSTEXPR T& operator[](length_type i);
-
97  GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const;
+
96  GLM_FUNC_DECL constexpr T& operator[](length_type i);
+
97  GLM_FUNC_DECL constexpr T const& operator[](length_type i) const;
98 
99  // -- Implicit basic constructors --
100 
-
101  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
-
102  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
+
101  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR;
+
102  GLM_DEFAULTED_FUNC_DECL constexpr vec(vec const& v) GLM_DEFAULT;
103  template<qualifier P>
104  GLM_CTOR_DECL vec(vec<2, T, P> const& v);
105 
@@ -212,258 +212,258 @@ $(function() {
147 
148  // -- Unary arithmetic operators --
149 
-
150  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> & operator=(vec const& v) GLM_DEFAULT;
+
150  GLM_DEFAULTED_FUNC_DECL constexpr vec<2, T, Q> & operator=(vec const& v) GLM_DEFAULT;
151 
152  template<typename U>
-
153  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator=(vec<2, U, Q> const& v);
+
153  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator=(vec<2, U, Q> const& v);
154  template<typename U>
-
155  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator+=(U scalar);
+
155  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator+=(U scalar);
156  template<typename U>
-
157  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator+=(vec<1, U, Q> const& v);
+
157  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator+=(vec<1, U, Q> const& v);
158  template<typename U>
-
159  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator+=(vec<2, U, Q> const& v);
+
159  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator+=(vec<2, U, Q> const& v);
160  template<typename U>
-
161  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator-=(U scalar);
+
161  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator-=(U scalar);
162  template<typename U>
-
163  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator-=(vec<1, U, Q> const& v);
+
163  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator-=(vec<1, U, Q> const& v);
164  template<typename U>
-
165  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator-=(vec<2, U, Q> const& v);
+
165  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator-=(vec<2, U, Q> const& v);
166  template<typename U>
-
167  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator*=(U scalar);
+
167  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator*=(U scalar);
168  template<typename U>
-
169  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator*=(vec<1, U, Q> const& v);
+
169  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator*=(vec<1, U, Q> const& v);
170  template<typename U>
-
171  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator*=(vec<2, U, Q> const& v);
+
171  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator*=(vec<2, U, Q> const& v);
172  template<typename U>
-
173  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator/=(U scalar);
+
173  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator/=(U scalar);
174  template<typename U>
-
175  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator/=(vec<1, U, Q> const& v);
+
175  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator/=(vec<1, U, Q> const& v);
176  template<typename U>
-
177  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator/=(vec<2, U, Q> const& v);
+
177  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator/=(vec<2, U, Q> const& v);
178 
179  // -- Increment and decrement operators --
180 
-
181  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator++();
-
182  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator--();
-
183  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator++(int);
-
184  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator--(int);
+
181  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator++();
+
182  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator--();
+
183  GLM_FUNC_DECL constexpr vec<2, T, Q> operator++(int);
+
184  GLM_FUNC_DECL constexpr vec<2, T, Q> operator--(int);
185 
186  // -- Unary bit operators --
187 
188  template<typename U>
-
189  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator%=(U scalar);
+
189  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator%=(U scalar);
190  template<typename U>
-
191  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator%=(vec<1, U, Q> const& v);
+
191  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator%=(vec<1, U, Q> const& v);
192  template<typename U>
-
193  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator%=(vec<2, U, Q> const& v);
+
193  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator%=(vec<2, U, Q> const& v);
194  template<typename U>
-
195  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator&=(U scalar);
+
195  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator&=(U scalar);
196  template<typename U>
-
197  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator&=(vec<1, U, Q> const& v);
+
197  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator&=(vec<1, U, Q> const& v);
198  template<typename U>
-
199  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator&=(vec<2, U, Q> const& v);
+
199  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator&=(vec<2, U, Q> const& v);
200  template<typename U>
-
201  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator|=(U scalar);
+
201  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator|=(U scalar);
202  template<typename U>
-
203  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator|=(vec<1, U, Q> const& v);
+
203  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator|=(vec<1, U, Q> const& v);
204  template<typename U>
-
205  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator|=(vec<2, U, Q> const& v);
+
205  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator|=(vec<2, U, Q> const& v);
206  template<typename U>
-
207  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator^=(U scalar);
+
207  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator^=(U scalar);
208  template<typename U>
-
209  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator^=(vec<1, U, Q> const& v);
+
209  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator^=(vec<1, U, Q> const& v);
210  template<typename U>
-
211  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator^=(vec<2, U, Q> const& v);
+
211  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator^=(vec<2, U, Q> const& v);
212  template<typename U>
-
213  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator<<=(U scalar);
+
213  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator<<=(U scalar);
214  template<typename U>
-
215  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator<<=(vec<1, U, Q> const& v);
+
215  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator<<=(vec<1, U, Q> const& v);
216  template<typename U>
-
217  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator<<=(vec<2, U, Q> const& v);
+
217  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator<<=(vec<2, U, Q> const& v);
218  template<typename U>
-
219  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator>>=(U scalar);
+
219  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator>>=(U scalar);
220  template<typename U>
-
221  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator>>=(vec<1, U, Q> const& v);
+
221  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator>>=(vec<1, U, Q> const& v);
222  template<typename U>
-
223  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator>>=(vec<2, U, Q> const& v);
+
223  GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator>>=(vec<2, U, Q> const& v);
224  };
225 
226  // -- Unary operators --
227 
228  template<typename T, qualifier Q>
-
229  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v);
+
229  GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v);
230 
231  template<typename T, qualifier Q>
-
232  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v);
+
232  GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v);
233 
234  // -- Binary operators --
235 
236  template<typename T, qualifier Q>
-
237  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v, T scalar);
+
237  GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v, T scalar);
238 
239  template<typename T, qualifier Q>
-
240  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
240  GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
241 
242  template<typename T, qualifier Q>
-
243  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(T scalar, vec<2, T, Q> const& v);
+
243  GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(T scalar, vec<2, T, Q> const& v);
244 
245  template<typename T, qualifier Q>
-
246  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
246  GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
247 
248  template<typename T, qualifier Q>
-
249  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
249  GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
250 
251  template<typename T, qualifier Q>
-
252  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v, T scalar);
+
252  GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v, T scalar);
253 
254  template<typename T, qualifier Q>
-
255  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
255  GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
256 
257  template<typename T, qualifier Q>
-
258  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(T scalar, vec<2, T, Q> const& v);
+
258  GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(T scalar, vec<2, T, Q> const& v);
259 
260  template<typename T, qualifier Q>
-
261  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
261  GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
262 
263  template<typename T, qualifier Q>
-
264  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
264  GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
265 
266  template<typename T, qualifier Q>
-
267  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v, T scalar);
+
267  GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v, T scalar);
268 
269  template<typename T, qualifier Q>
-
270  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
270  GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
271 
272  template<typename T, qualifier Q>
-
273  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(T scalar, vec<2, T, Q> const& v);
+
273  GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(T scalar, vec<2, T, Q> const& v);
274 
275  template<typename T, qualifier Q>
-
276  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
276  GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
277 
278  template<typename T, qualifier Q>
-
279  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
279  GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
280 
281  template<typename T, qualifier Q>
-
282  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v, T scalar);
+
282  GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v, T scalar);
283 
284  template<typename T, qualifier Q>
-
285  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
285  GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
286 
287  template<typename T, qualifier Q>
-
288  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(T scalar, vec<2, T, Q> const& v);
+
288  GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(T scalar, vec<2, T, Q> const& v);
289 
290  template<typename T, qualifier Q>
-
291  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
291  GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
292 
293  template<typename T, qualifier Q>
-
294  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
294  GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
295 
296  template<typename T, qualifier Q>
-
297  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v, T scalar);
+
297  GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v, T scalar);
298 
299  template<typename T, qualifier Q>
-
300  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
300  GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
301 
302  template<typename T, qualifier Q>
-
303  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(T scalar, vec<2, T, Q> const& v);
+
303  GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(T scalar, vec<2, T, Q> const& v);
304 
305  template<typename T, qualifier Q>
-
306  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
306  GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
307 
308  template<typename T, qualifier Q>
-
309  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
309  GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
310 
311  template<typename T, qualifier Q>
-
312  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v, T scalar);
+
312  GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v, T scalar);
313 
314  template<typename T, qualifier Q>
-
315  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
315  GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
316 
317  template<typename T, qualifier Q>
-
318  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(T scalar, vec<2, T, Q> const& v);
+
318  GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(T scalar, vec<2, T, Q> const& v);
319 
320  template<typename T, qualifier Q>
-
321  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
321  GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
322 
323  template<typename T, qualifier Q>
-
324  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
324  GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
325 
326  template<typename T, qualifier Q>
-
327  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v, T scalar);
+
327  GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v, T scalar);
328 
329  template<typename T, qualifier Q>
-
330  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
330  GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
331 
332  template<typename T, qualifier Q>
-
333  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(T scalar, vec<2, T, Q> const& v);
+
333  GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(T scalar, vec<2, T, Q> const& v);
334 
335  template<typename T, qualifier Q>
-
336  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
336  GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
337 
338  template<typename T, qualifier Q>
-
339  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
339  GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
340 
341  template<typename T, qualifier Q>
-
342  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v, T scalar);
+
342  GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v, T scalar);
343 
344  template<typename T, qualifier Q>
-
345  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
345  GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
346 
347  template<typename T, qualifier Q>
-
348  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(T scalar, vec<2, T, Q> const& v);
+
348  GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(T scalar, vec<2, T, Q> const& v);
349 
350  template<typename T, qualifier Q>
-
351  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
351  GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
352 
353  template<typename T, qualifier Q>
-
354  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
354  GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
355 
356  template<typename T, qualifier Q>
-
357  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v, T scalar);
+
357  GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v, T scalar);
358 
359  template<typename T, qualifier Q>
-
360  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
360  GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
361 
362  template<typename T, qualifier Q>
-
363  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(T scalar, vec<2, T, Q> const& v);
+
363  GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(T scalar, vec<2, T, Q> const& v);
364 
365  template<typename T, qualifier Q>
-
366  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
366  GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
367 
368  template<typename T, qualifier Q>
-
369  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
369  GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
370 
371  template<typename T, qualifier Q>
-
372  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v, T scalar);
+
372  GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v, T scalar);
373 
374  template<typename T, qualifier Q>
-
375  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
+
375  GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2);
376 
377  template<typename T, qualifier Q>
-
378  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(T scalar, vec<2, T, Q> const& v);
+
378  GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(T scalar, vec<2, T, Q> const& v);
379 
380  template<typename T, qualifier Q>
-
381  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
+
381  GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2);
382 
383  template<typename T, qualifier Q>
-
384  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
384  GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
385 
386  template<typename T, qualifier Q>
-
387  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator~(vec<2, T, Q> const& v);
+
387  GLM_FUNC_DECL constexpr vec<2, T, Q> operator~(vec<2, T, Q> const& v);
388 
389  // -- Boolean operators --
390 
391  template<typename T, qualifier Q>
-
392  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
392  GLM_FUNC_DECL constexpr bool operator==(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
393 
394  template<typename T, qualifier Q>
-
395  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
+
395  GLM_FUNC_DECL constexpr bool operator!=(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2);
396 
397  template<qualifier Q>
-
398  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, bool, Q> operator&&(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2);
+
398  GLM_FUNC_DECL constexpr vec<2, bool, Q> operator&&(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2);
399 
400  template<qualifier Q>
-
401  GLM_FUNC_DECL GLM_CONSTEXPR vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2);
+
401  GLM_FUNC_DECL constexpr vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2);
402 }//namespace glm
403 
404 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00080_source.html b/doc/api/a00080_source.html index 04030556b..54f054111 100644 --- a/doc/api/a00080_source.html +++ b/doc/api/a00080_source.html @@ -166,15 +166,15 @@ $(function() {
96  // -- Component accesses --
97 
99  typedef length_t length_type;
-
100  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 3;}
+
100  GLM_FUNC_DECL static constexpr length_type length(){return 3;}
101 
-
102  GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i);
-
103  GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const;
+
102  GLM_FUNC_DECL constexpr T & operator[](length_type i);
+
103  GLM_FUNC_DECL constexpr T const& operator[](length_type i) const;
104 
105  // -- Implicit basic constructors --
106 
-
107  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
-
108  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT;
+
107  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR;
+
108  GLM_DEFAULTED_FUNC_DECL constexpr vec(vec const& v) GLM_DEFAULT;
109  template<qualifier P>
110  GLM_CTOR_DECL vec(vec<3, T, P> const& v);
111 
@@ -224,19 +224,19 @@ $(function() {
162  // -- Swizzle constructors --
163 # if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR
164  template<int E0, int E1, int E2>
-
165  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(detail::_swizzle<3, T, Q, E0, E1, E2, -1> const& that)
+
165  GLM_FUNC_DISCARD_DECL constexpr vec(detail::_swizzle<3, T, Q, E0, E1, E2, -1> const& that)
166  {
167  *this = that();
168  }
169 
170  template<int E0, int E1>
-
171  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v, T const& scalar)
+
171  GLM_FUNC_DISCARD_DECL constexpr vec(detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v, T const& scalar)
172  {
173  *this = vec(v(), scalar);
174  }
175 
176  template<int E0, int E1>
-
177  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(T const& scalar, detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v)
+
177  GLM_FUNC_DISCARD_DECL constexpr vec(T const& scalar, detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v)
178  {
179  *this = vec(scalar, v());
180  }
@@ -244,80 +244,80 @@ $(function() {
182 
183  // -- Unary arithmetic operators --
184 
-
185  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q>& operator=(vec<3, T, Q> const& v) GLM_DEFAULT;
+
185  GLM_DEFAULTED_FUNC_DECL constexpr vec<3, T, Q>& operator=(vec<3, T, Q> const& v) GLM_DEFAULT;
186 
187  template<typename U>
-
188  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator=(vec<3, U, Q> const& v);
+
188  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator=(vec<3, U, Q> const& v);
189  template<typename U>
-
190  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator+=(U scalar);
+
190  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator+=(U scalar);
191  template<typename U>
-
192  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator+=(vec<1, U, Q> const& v);
+
192  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator+=(vec<1, U, Q> const& v);
193  template<typename U>
-
194  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator+=(vec<3, U, Q> const& v);
+
194  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator+=(vec<3, U, Q> const& v);
195  template<typename U>
-
196  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator-=(U scalar);
+
196  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator-=(U scalar);
197  template<typename U>
-
198  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator-=(vec<1, U, Q> const& v);
+
198  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator-=(vec<1, U, Q> const& v);
199  template<typename U>
-
200  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator-=(vec<3, U, Q> const& v);
+
200  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator-=(vec<3, U, Q> const& v);
201  template<typename U>
-
202  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator*=(U scalar);
+
202  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator*=(U scalar);
203  template<typename U>
-
204  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator*=(vec<1, U, Q> const& v);
+
204  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator*=(vec<1, U, Q> const& v);
205  template<typename U>
-
206  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator*=(vec<3, U, Q> const& v);
+
206  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator*=(vec<3, U, Q> const& v);
207  template<typename U>
-
208  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator/=(U scalar);
+
208  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator/=(U scalar);
209  template<typename U>
-
210  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator/=(vec<1, U, Q> const& v);
+
210  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator/=(vec<1, U, Q> const& v);
211  template<typename U>
-
212  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator/=(vec<3, U, Q> const& v);
+
212  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator/=(vec<3, U, Q> const& v);
213 
214  // -- Increment and decrement operators --
215 
-
216  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator++();
-
217  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator--();
-
218  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator++(int);
-
219  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator--(int);
+
216  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator++();
+
217  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator--();
+
218  GLM_FUNC_DECL constexpr vec<3, T, Q> operator++(int);
+
219  GLM_FUNC_DECL constexpr vec<3, T, Q> operator--(int);
220 
221  // -- Unary bit operators --
222 
223  template<typename U>
-
224  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator%=(U scalar);
+
224  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator%=(U scalar);
225  template<typename U>
-
226  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator%=(vec<1, U, Q> const& v);
+
226  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator%=(vec<1, U, Q> const& v);
227  template<typename U>
-
228  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator%=(vec<3, U, Q> const& v);
+
228  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator%=(vec<3, U, Q> const& v);
229  template<typename U>
-
230  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator&=(U scalar);
+
230  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator&=(U scalar);
231  template<typename U>
-
232  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator&=(vec<1, U, Q> const& v);
+
232  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator&=(vec<1, U, Q> const& v);
233  template<typename U>
-
234  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator&=(vec<3, U, Q> const& v);
+
234  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator&=(vec<3, U, Q> const& v);
235  template<typename U>
-
236  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator|=(U scalar);
+
236  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator|=(U scalar);
237  template<typename U>
-
238  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator|=(vec<1, U, Q> const& v);
+
238  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator|=(vec<1, U, Q> const& v);
239  template<typename U>
-
240  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator|=(vec<3, U, Q> const& v);
+
240  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator|=(vec<3, U, Q> const& v);
241  template<typename U>
-
242  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator^=(U scalar);
+
242  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator^=(U scalar);
243  template<typename U>
-
244  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator^=(vec<1, U, Q> const& v);
+
244  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator^=(vec<1, U, Q> const& v);
245  template<typename U>
-
246  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator^=(vec<3, U, Q> const& v);
+
246  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator^=(vec<3, U, Q> const& v);
247  template<typename U>
-
248  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator<<=(U scalar);
+
248  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator<<=(U scalar);
249  template<typename U>
-
250  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator<<=(vec<1, U, Q> const& v);
+
250  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator<<=(vec<1, U, Q> const& v);
251  template<typename U>
-
252  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator<<=(vec<3, U, Q> const& v);
+
252  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator<<=(vec<3, U, Q> const& v);
253  template<typename U>
-
254  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator>>=(U scalar);
+
254  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator>>=(U scalar);
255  template<typename U>
-
256  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator>>=(vec<1, U, Q> const& v);
+
256  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator>>=(vec<1, U, Q> const& v);
257  template<typename U>
-
258  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator>>=(vec<3, U, Q> const& v);
+
258  GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator>>=(vec<3, U, Q> const& v);
259  };
260 
261 
@@ -325,179 +325,179 @@ $(function() {
263  // -- Unary operators --
264 
265  template<typename T, qualifier Q>
-
266  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v);
+
266  GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v);
267 
268  template<typename T, qualifier Q>
-
269  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v);
+
269  GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v);
270 
271  // -- Binary operators --
272 
273  template<typename T, qualifier Q>
-
274  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v, T scalar);
+
274  GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v, T scalar);
275 
276  template<typename T, qualifier Q>
-
277  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar);
+
277  GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar);
278 
279  template<typename T, qualifier Q>
-
280  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(T scalar, vec<3, T, Q> const& v);
+
280  GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(T scalar, vec<3, T, Q> const& v);
281 
282  template<typename T, qualifier Q>
-
283  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
283  GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
284 
285  template<typename T, qualifier Q>
-
286  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
286  GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
287 
288  template<typename T, qualifier Q>
-
289  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v, T scalar);
+
289  GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v, T scalar);
290 
291  template<typename T, qualifier Q>
-
292  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
292  GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
293 
294  template<typename T, qualifier Q>
-
295  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(T scalar, vec<3, T, Q> const& v);
+
295  GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(T scalar, vec<3, T, Q> const& v);
296 
297  template<typename T, qualifier Q>
-
298  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
298  GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
299 
300  template<typename T, qualifier Q>
-
301  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
301  GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
302 
303  template<typename T, qualifier Q>
-
304  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, T scalar);
+
304  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, T scalar);
305 
306  template<typename T, qualifier Q>
-
307  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
307  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
308 
309  template<typename T, qualifier Q>
-
310  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(T scalar, vec<3, T, Q> const& v);
+
310  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(T scalar, vec<3, T, Q> const& v);
311 
312  template<typename T, qualifier Q>
-
313  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
313  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
314 
315  template<typename T, qualifier Q>
-
316  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
316  GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
317 
318  template<typename T, qualifier Q>
-
319  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v, T scalar);
+
319  GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v, T scalar);
320 
321  template<typename T, qualifier Q>
-
322  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
322  GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
323 
324  template<typename T, qualifier Q>
-
325  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(T scalar, vec<3, T, Q> const& v);
+
325  GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(T scalar, vec<3, T, Q> const& v);
326 
327  template<typename T, qualifier Q>
-
328  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
328  GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
329 
330  template<typename T, qualifier Q>
-
331  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
331  GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
332 
333  template<typename T, qualifier Q>
-
334  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v, T scalar);
+
334  GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v, T scalar);
335 
336  template<typename T, qualifier Q>
-
337  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
337  GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
338 
339  template<typename T, qualifier Q>
-
340  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(T scalar, vec<3, T, Q> const& v);
+
340  GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(T scalar, vec<3, T, Q> const& v);
341 
342  template<typename T, qualifier Q>
-
343  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
343  GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
344 
345  template<typename T, qualifier Q>
-
346  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
346  GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
347 
348  template<typename T, qualifier Q>
-
349  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, T scalar);
+
349  GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, T scalar);
350 
351  template<typename T, qualifier Q>
-
352  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
352  GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
353 
354  template<typename T, qualifier Q>
-
355  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(T scalar, vec<3, T, Q> const& v);
+
355  GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(T scalar, vec<3, T, Q> const& v);
356 
357  template<typename T, qualifier Q>
-
358  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
358  GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
359 
360  template<typename T, qualifier Q>
-
361  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
361  GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
362 
363  template<typename T, qualifier Q>
-
364  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v, T scalar);
+
364  GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v, T scalar);
365 
366  template<typename T, qualifier Q>
-
367  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
367  GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
368 
369  template<typename T, qualifier Q>
-
370  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(T scalar, vec<3, T, Q> const& v);
+
370  GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(T scalar, vec<3, T, Q> const& v);
371 
372  template<typename T, qualifier Q>
-
373  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
373  GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
374 
375  template<typename T, qualifier Q>
-
376  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
376  GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
377 
378  template<typename T, qualifier Q>
-
379  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v, T scalar);
+
379  GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v, T scalar);
380 
381  template<typename T, qualifier Q>
-
382  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
382  GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
383 
384  template<typename T, qualifier Q>
-
385  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(T scalar, vec<3, T, Q> const& v);
+
385  GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(T scalar, vec<3, T, Q> const& v);
386 
387  template<typename T, qualifier Q>
-
388  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
388  GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
389 
390  template<typename T, qualifier Q>
-
391  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
391  GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
392 
393  template<typename T, qualifier Q>
-
394  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v, T scalar);
+
394  GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v, T scalar);
395 
396  template<typename T, qualifier Q>
-
397  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
397  GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
398 
399  template<typename T, qualifier Q>
-
400  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(T scalar, vec<3, T, Q> const& v);
+
400  GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(T scalar, vec<3, T, Q> const& v);
401 
402  template<typename T, qualifier Q>
-
403  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
403  GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
404 
405  template<typename T, qualifier Q>
-
406  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
406  GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
407 
408  template<typename T, qualifier Q>
-
409  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v, T scalar);
+
409  GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v, T scalar);
410 
411  template<typename T, qualifier Q>
-
412  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
+
412  GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2);
413 
414  template<typename T, qualifier Q>
-
415  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(T scalar, vec<3, T, Q> const& v);
+
415  GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(T scalar, vec<3, T, Q> const& v);
416 
417  template<typename T, qualifier Q>
-
418  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
+
418  GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2);
419 
420  template<typename T, qualifier Q>
-
421  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
421  GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
422 
423  template<typename T, qualifier Q>
-
424  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator~(vec<3, T, Q> const& v);
+
424  GLM_FUNC_DECL constexpr vec<3, T, Q> operator~(vec<3, T, Q> const& v);
425 
426  // -- Boolean operators --
427 
428  template<typename T, qualifier Q>
-
429  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
429  GLM_FUNC_DECL constexpr bool operator==(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
430 
431  template<typename T, qualifier Q>
-
432  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
+
432  GLM_FUNC_DECL constexpr bool operator!=(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2);
433 
434  template<qualifier Q>
-
435  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, bool, Q> operator&&(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2);
+
435  GLM_FUNC_DECL constexpr vec<3, bool, Q> operator&&(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2);
436 
437  template<qualifier Q>
-
438  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2);
+
438  GLM_FUNC_DECL constexpr vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2);
439 
440 
441 
diff --git a/doc/api/a00083_source.html b/doc/api/a00083_source.html index b41117136..2ac1988f4 100644 --- a/doc/api/a00083_source.html +++ b/doc/api/a00083_source.html @@ -164,15 +164,15 @@ $(function() {
94 
95  typedef length_t length_type;
96 
-
98  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;}
+
98  GLM_FUNC_DECL static constexpr length_type length(){return 4;}
99 
-
100  GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i);
-
101  GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const;
+
100  GLM_FUNC_DECL constexpr T & operator[](length_type i);
+
101  GLM_FUNC_DECL constexpr T const& operator[](length_type i) const;
102 
103  // -- Implicit basic constructors --
104 
-
105  GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR;
-
106  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec<4, T, Q> const& v) GLM_DEFAULT;
+
105  GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR;
+
106  GLM_DEFAULTED_FUNC_DECL constexpr vec(vec<4, T, Q> const& v) GLM_DEFAULT;
107  template<qualifier P>
108  GLM_CTOR_DECL vec(vec<4, T, P> const& v);
109 
@@ -304,259 +304,259 @@ $(function() {
254 
255  // -- Unary arithmetic operators --
256 
-
257  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q>& operator=(vec<4, T, Q> const& v) GLM_DEFAULT;
+
257  GLM_DEFAULTED_FUNC_DECL constexpr vec<4, T, Q>& operator=(vec<4, T, Q> const& v) GLM_DEFAULT;
258 
259  template<typename U>
-
260  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator=(vec<4, U, Q> const& v);
+
260  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator=(vec<4, U, Q> const& v);
261  template<typename U>
-
262  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator+=(U scalar);
+
262  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator+=(U scalar);
263  template<typename U>
-
264  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator+=(vec<1, U, Q> const& v);
+
264  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator+=(vec<1, U, Q> const& v);
265  template<typename U>
-
266  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator+=(vec<4, U, Q> const& v);
+
266  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator+=(vec<4, U, Q> const& v);
267  template<typename U>
-
268  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator-=(U scalar);
+
268  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator-=(U scalar);
269  template<typename U>
-
270  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator-=(vec<1, U, Q> const& v);
+
270  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator-=(vec<1, U, Q> const& v);
271  template<typename U>
-
272  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator-=(vec<4, U, Q> const& v);
+
272  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator-=(vec<4, U, Q> const& v);
273  template<typename U>
-
274  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator*=(U scalar);
+
274  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator*=(U scalar);
275  template<typename U>
-
276  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator*=(vec<1, U, Q> const& v);
+
276  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator*=(vec<1, U, Q> const& v);
277  template<typename U>
-
278  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator*=(vec<4, U, Q> const& v);
+
278  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator*=(vec<4, U, Q> const& v);
279  template<typename U>
-
280  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator/=(U scalar);
+
280  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator/=(U scalar);
281  template<typename U>
-
282  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator/=(vec<1, U, Q> const& v);
+
282  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator/=(vec<1, U, Q> const& v);
283  template<typename U>
-
284  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator/=(vec<4, U, Q> const& v);
+
284  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator/=(vec<4, U, Q> const& v);
285 
286  // -- Increment and decrement operators --
287 
-
288  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q> & operator++();
-
289  GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q> & operator--();
-
290  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator++(int);
-
291  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator--(int);
+
288  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q> & operator++();
+
289  GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q> & operator--();
+
290  GLM_FUNC_DECL constexpr vec<4, T, Q> operator++(int);
+
291  GLM_FUNC_DECL constexpr vec<4, T, Q> operator--(int);
292 
293  // -- Unary bit operators --
294 
295  template<typename U>
-
296  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator%=(U scalar);
+
296  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator%=(U scalar);
297  template<typename U>
-
298  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator%=(vec<1, U, Q> const& v);
+
298  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator%=(vec<1, U, Q> const& v);
299  template<typename U>
-
300  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator%=(vec<4, U, Q> const& v);
+
300  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator%=(vec<4, U, Q> const& v);
301  template<typename U>
-
302  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator&=(U scalar);
+
302  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator&=(U scalar);
303  template<typename U>
-
304  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator&=(vec<1, U, Q> const& v);
+
304  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator&=(vec<1, U, Q> const& v);
305  template<typename U>
-
306  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator&=(vec<4, U, Q> const& v);
+
306  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator&=(vec<4, U, Q> const& v);
307  template<typename U>
-
308  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator|=(U scalar);
+
308  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator|=(U scalar);
309  template<typename U>
-
310  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator|=(vec<1, U, Q> const& v);
+
310  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator|=(vec<1, U, Q> const& v);
311  template<typename U>
-
312  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator|=(vec<4, U, Q> const& v);
+
312  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator|=(vec<4, U, Q> const& v);
313  template<typename U>
-
314  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator^=(U scalar);
+
314  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator^=(U scalar);
315  template<typename U>
-
316  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator^=(vec<1, U, Q> const& v);
+
316  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator^=(vec<1, U, Q> const& v);
317  template<typename U>
-
318  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator^=(vec<4, U, Q> const& v);
+
318  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator^=(vec<4, U, Q> const& v);
319  template<typename U>
-
320  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator<<=(U scalar);
+
320  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator<<=(U scalar);
321  template<typename U>
-
322  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator<<=(vec<1, U, Q> const& v);
+
322  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator<<=(vec<1, U, Q> const& v);
323  template<typename U>
-
324  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator<<=(vec<4, U, Q> const& v);
+
324  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator<<=(vec<4, U, Q> const& v);
325  template<typename U>
-
326  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator>>=(U scalar);
+
326  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator>>=(U scalar);
327  template<typename U>
-
328  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator>>=(vec<1, U, Q> const& v);
+
328  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator>>=(vec<1, U, Q> const& v);
329  template<typename U>
-
330  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator>>=(vec<4, U, Q> const& v);
+
330  GLM_FUNC_DECL constexpr vec<4, T, Q> & operator>>=(vec<4, U, Q> const& v);
331  };
332 
333 
334  // -- Unary operators --
335 
336  template<typename T, qualifier Q>
-
337  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v);
+
337  GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v);
338 
339  template<typename T, qualifier Q>
-
340  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v);
+
340  GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v);
341 
342  // -- Binary operators --
343 
344  template<typename T, qualifier Q>
-
345  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar);
+
345  GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar);
346 
347  template<typename T, qualifier Q>
-
348  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
+
348  GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
349 
350  template<typename T, qualifier Q>
-
351  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(T scalar, vec<4, T, Q> const& v);
+
351  GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(T scalar, vec<4, T, Q> const& v);
352 
353  template<typename T, qualifier Q>
-
354  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
+
354  GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
355 
356  template<typename T, qualifier Q>
-
357  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
357  GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
358 
359  template<typename T, qualifier Q>
-
360  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar);
+
360  GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar);
361 
362  template<typename T, qualifier Q>
-
363  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
+
363  GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
364 
365  template<typename T, qualifier Q>
-
366  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(T scalar, vec<4, T, Q> const& v);
+
366  GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(T scalar, vec<4, T, Q> const& v);
367 
368  template<typename T, qualifier Q>
-
369  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
+
369  GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
370 
371  template<typename T, qualifier Q>
-
372  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
372  GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
373 
374  template<typename T, qualifier Q>
-
375  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar);
+
375  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar);
376 
377  template<typename T, qualifier Q>
-
378  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
+
378  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
379 
380  template<typename T, qualifier Q>
-
381  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(T scalar, vec<4, T, Q> const& v);
+
381  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(T scalar, vec<4, T, Q> const& v);
382 
383  template<typename T, qualifier Q>
-
384  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
+
384  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
385 
386  template<typename T, qualifier Q>
-
387  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
387  GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
388 
389  template<typename T, qualifier Q>
-
390  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar);
+
390  GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar);
391 
392  template<typename T, qualifier Q>
-
393  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
+
393  GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2);
394 
395  template<typename T, qualifier Q>
-
396  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(T scalar, vec<4, T, Q> const& v);
+
396  GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(T scalar, vec<4, T, Q> const& v);
397 
398  template<typename T, qualifier Q>
-
399  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
+
399  GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2);
400 
401  template<typename T, qualifier Q>
-
402  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
402  GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
403 
404  template<typename T, qualifier Q>
-
405  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v, T scalar);
+
405  GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v, T scalar);
406 
407  template<typename T, qualifier Q>
-
408  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
+
408  GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
409 
410  template<typename T, qualifier Q>
-
411  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(T scalar, vec<4, T, Q> const& v);
+
411  GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(T scalar, vec<4, T, Q> const& v);
412 
413  template<typename T, qualifier Q>
-
414  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
+
414  GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
415 
416  template<typename T, qualifier Q>
-
417  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
417  GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
418 
419  template<typename T, qualifier Q>
-
420  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v, T scalar);
+
420  GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v, T scalar);
421 
422  template<typename T, qualifier Q>
-
423  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
+
423  GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
424 
425  template<typename T, qualifier Q>
-
426  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(T scalar, vec<4, T, Q> const& v);
+
426  GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(T scalar, vec<4, T, Q> const& v);
427 
428  template<typename T, qualifier Q>
-
429  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
+
429  GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
430 
431  template<typename T, qualifier Q>
-
432  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
432  GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
433 
434  template<typename T, qualifier Q>
-
435  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v, T scalar);
+
435  GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v, T scalar);
436 
437  template<typename T, qualifier Q>
-
438  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
+
438  GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
439 
440  template<typename T, qualifier Q>
-
441  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(T scalar, vec<4, T, Q> const& v);
+
441  GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(T scalar, vec<4, T, Q> const& v);
442 
443  template<typename T, qualifier Q>
-
444  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
+
444  GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
445 
446  template<typename T, qualifier Q>
-
447  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
447  GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
448 
449  template<typename T, qualifier Q>
-
450  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v, T scalar);
+
450  GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v, T scalar);
451 
452  template<typename T, qualifier Q>
-
453  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
+
453  GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
454 
455  template<typename T, qualifier Q>
-
456  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(T scalar, vec<4, T, Q> const& v);
+
456  GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(T scalar, vec<4, T, Q> const& v);
457 
458  template<typename T, qualifier Q>
-
459  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
+
459  GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
460 
461  template<typename T, qualifier Q>
-
462  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
462  GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
463 
464  template<typename T, qualifier Q>
-
465  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v, T scalar);
+
465  GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v, T scalar);
466 
467  template<typename T, qualifier Q>
-
468  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
+
468  GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
469 
470  template<typename T, qualifier Q>
-
471  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(T scalar, vec<4, T, Q> const& v);
+
471  GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(T scalar, vec<4, T, Q> const& v);
472 
473  template<typename T, qualifier Q>
-
474  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
+
474  GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
475 
476  template<typename T, qualifier Q>
-
477  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
477  GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
478 
479  template<typename T, qualifier Q>
-
480  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v, T scalar);
+
480  GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v, T scalar);
481 
482  template<typename T, qualifier Q>
-
483  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
+
483  GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar);
484 
485  template<typename T, qualifier Q>
-
486  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(T scalar, vec<4, T, Q> const& v);
+
486  GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(T scalar, vec<4, T, Q> const& v);
487 
488  template<typename T, qualifier Q>
-
489  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
+
489  GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v);
490 
491  template<typename T, qualifier Q>
-
492  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
492  GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
493 
494  template<typename T, qualifier Q>
-
495  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator~(vec<4, T, Q> const& v);
+
495  GLM_FUNC_DECL constexpr vec<4, T, Q> operator~(vec<4, T, Q> const& v);
496 
497  // -- Boolean operators --
498 
499  template<typename T, qualifier Q>
-
500  GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
500  GLM_FUNC_DECL constexpr bool operator==(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
501 
502  template<typename T, qualifier Q>
-
503  GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
+
503  GLM_FUNC_DECL constexpr bool operator!=(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2);
504 
505  template<qualifier Q>
-
506  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> operator&&(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2);
+
506  GLM_FUNC_DECL constexpr vec<4, bool, Q> operator&&(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2);
507 
508  template<qualifier Q>
-
509  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2);
+
509  GLM_FUNC_DECL constexpr vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2);
510 }//namespace glm
511 
512 #ifndef GLM_EXTERNAL_TEMPLATE
diff --git a/doc/api/a00089_source.html b/doc/api/a00089_source.html index 1ae2fe960..d20a93f53 100644 --- a/doc/api/a00089_source.html +++ b/doc/api/a00089_source.html @@ -82,7 +82,7 @@ $(function() {
10 
11  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
12  struct matrix_functor_1<mat, 2, 2, Ret, T, Q> {
-
13  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<2, 2, T, Q> call(Ret (*Func)(T x), mat<2, 2, T, Q> const &x) {
+
13  GLM_FUNC_QUALIFIER constexpr static mat<2, 2, T, Q> call(Ret (*Func)(T x), mat<2, 2, T, Q> const &x) {
14  return mat<2, 2, Ret, Q>(
15  Func(x[0][0]), Func(x[0][1]),
16  Func(x[1][0]), Func(x[1][1])
@@ -93,7 +93,7 @@ $(function() {
21  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
22  struct matrix_functor_1<mat, 2, 3, Ret, T, Q> {
23 
-
24  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<2, 3, T, Q> call(Ret (*Func)(T x), mat<2, 3, T, Q> const &x) {
+
24  GLM_FUNC_QUALIFIER constexpr static mat<2, 3, T, Q> call(Ret (*Func)(T x), mat<2, 3, T, Q> const &x) {
25  return mat<2, 3, Ret, Q>(
26  Func(x[0][0]), Func(x[0][1]), Func(x[0][2]),
27  Func(x[1][0]), Func(x[1][1]), Func(x[1][2])
@@ -105,7 +105,7 @@ $(function() {
33  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
34  struct matrix_functor_1<mat, 2, 4, Ret, T, Q> {
35 
-
36  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<2, 4, T, Q> call(Ret (*Func)(T x), mat<2, 4, T, Q> const &x) {
+
36  GLM_FUNC_QUALIFIER constexpr static mat<2, 4, T, Q> call(Ret (*Func)(T x), mat<2, 4, T, Q> const &x) {
37  return mat<2, 4, Ret, Q>(
38  Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[0][3]),
39  Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), Func(x[1][3])
@@ -117,7 +117,7 @@ $(function() {
45  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
46  struct matrix_functor_1<mat, 3, 2, Ret, T, Q> {
47 
-
48  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<3, 2, T, Q> call(Ret (*Func)(T x), mat<3, 2, T, Q> const &x) {
+
48  GLM_FUNC_QUALIFIER constexpr static mat<3, 2, T, Q> call(Ret (*Func)(T x), mat<3, 2, T, Q> const &x) {
49  return mat<3, 2, Ret, Q>(
50  Func(x[0][0]), Func(x[0][1]),
51  Func(x[1][0]), Func(x[1][1]),
@@ -130,7 +130,7 @@ $(function() {
58  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
59  struct matrix_functor_1<mat, 3, 3, Ret, T, Q> {
60 
-
61  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<3, 3, T, Q> call(Ret (*Func)(T x), mat<3, 3, T, Q> const &x) {
+
61  GLM_FUNC_QUALIFIER constexpr static mat<3, 3, T, Q> call(Ret (*Func)(T x), mat<3, 3, T, Q> const &x) {
62  return mat<3, 3, Ret, Q>(
63  Func(x[0][0]), Func(x[0][1]), Func(x[0][2]),
64  Func(x[1][0]), Func(x[1][1]), Func(x[1][2]),
@@ -143,7 +143,7 @@ $(function() {
71  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
72  struct matrix_functor_1<mat, 3, 4, Ret, T, Q> {
73 
-
74  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<3, 4, T, Q> call(Ret (*Func)(T x), mat<3, 4, T, Q> const &x) {
+
74  GLM_FUNC_QUALIFIER constexpr static mat<3, 4, T, Q> call(Ret (*Func)(T x), mat<3, 4, T, Q> const &x) {
75  return mat<3, 4, Ret, Q>(
76  Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[0][3]),
77  Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), Func(x[1][3]),
@@ -156,7 +156,7 @@ $(function() {
84  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
85  struct matrix_functor_1<mat, 4, 2, Ret, T, Q> {
86 
-
87  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 2, T, Q> call(Ret (*Func)(T x), mat<4, 2, T, Q> const &x) {
+
87  GLM_FUNC_QUALIFIER constexpr static mat<4, 2, T, Q> call(Ret (*Func)(T x), mat<4, 2, T, Q> const &x) {
88  return mat<4, 2, Ret, Q>(
89  Func(x[0][0]), Func(x[0][1]),
90  Func(x[1][0]), Func(x[1][1]),
@@ -170,7 +170,7 @@ $(function() {
98  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
99  struct matrix_functor_1<mat, 4, 3, Ret, T, Q> {
100 
-
101  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 3, T, Q> call(Ret (*Func)(T x), mat<4, 3, T, Q> const &x) {
+
101  GLM_FUNC_QUALIFIER constexpr static mat<4, 3, T, Q> call(Ret (*Func)(T x), mat<4, 3, T, Q> const &x) {
102  return mat<4, 3, Ret, Q>(
103  Func(x[0][0]), Func(x[0][1]), Func(x[0][2]),
104  Func(x[1][0]), Func(x[1][1]), Func(x[1][2]),
@@ -184,7 +184,7 @@ $(function() {
112  template<template<length_t C, length_t R, typename T, qualifier Q> class mat, typename Ret, typename T, qualifier Q>
113  struct matrix_functor_1<mat, 4, 4, Ret, T, Q> {
114 
-
115  GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 4, T, Q> call(Ret (*Func)(T x), mat<4, 4, T, Q> const &x) {
+
115  GLM_FUNC_QUALIFIER constexpr static mat<4, 4, T, Q> call(Ret (*Func)(T x), mat<4, 4, T, Q> const &x) {
116  return mat<4, 4, Ret, Q>(
117  Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[0][3]),
118  Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), Func(x[1][3]),
diff --git a/doc/api/a00095_source.html b/doc/api/a00095_source.html index 492073b07..6ce8b24e4 100644 --- a/doc/api/a00095_source.html +++ b/doc/api/a00095_source.html @@ -90,14 +90,14 @@ $(function() {
31  GLM_FUNC_DECL mat<C, R, T, Q> mix(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, U a);
32 
33  template <length_t C, length_t R, typename T, qualifier Q>
-
34  GLM_FUNC_DECL GLM_CONSTEXPR mat<C, R, T, Q> abs(mat<C, R, T, Q> const& x);
+
34  GLM_FUNC_DECL constexpr mat<C, R, T, Q> abs(mat<C, R, T, Q> const& x);
35 
37 }//namespace glm
38 
39 #include "matrix_common.inl"
-
glm::abs
GLM_FUNC_DECL GLM_CONSTEXPR genType abs(genType x)
Returns x if x >= 0; otherwise, it returns -x.
-
glm::mix
GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
+
glm::abs
GLM_FUNC_DECL constexpr genType abs(genType x)
Returns x if x >= 0; otherwise, it returns -x.
+
glm::mix
GLM_FUNC_DECL constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
Generated by   diff --git a/doc/api/a00266.html b/doc/api/a00266.html index 0b4fe1038..38c9840c6 100644 --- a/doc/api/a00266.html +++ b/doc/api/a00266.html @@ -81,43 +81,43 @@ $(function() {

Functions

template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y)  Perform a component-wise equal-to comparison of two matrices. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs) +GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon) +GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs) +GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon) +GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y)  Perform a component-wise not-equal-to comparison of two matrices. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs) +GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon) +GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs) +GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t C, length_t R, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon) +GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon)  Returns the component-wise comparison of |x - y| >= epsilon. More...
  diff --git a/doc/api/a00266_source.html b/doc/api/a00266_source.html index baec7b7aa..03c92dc84 100644 --- a/doc/api/a00266_source.html +++ b/doc/api/a00266_source.html @@ -84,42 +84,42 @@ $(function() {
25 {
28 
36  template<length_t C, length_t R, typename T, qualifier Q>
-
37  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y);
+
37  GLM_FUNC_DECL constexpr vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y);
38 
46  template<length_t C, length_t R, typename T, qualifier Q>
-
47  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y);
+
47  GLM_FUNC_DECL constexpr vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y);
48 
56  template<length_t C, length_t R, typename T, qualifier Q>
-
57  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, T epsilon);
+
57  GLM_FUNC_DECL constexpr vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, T epsilon);
58 
66  template<length_t C, length_t R, typename T, qualifier Q>
-
67  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, T, Q> const& epsilon);
+
67  GLM_FUNC_DECL constexpr vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, T, Q> const& epsilon);
68 
76  template<length_t C, length_t R, typename T, qualifier Q>
-
77  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, T epsilon);
+
77  GLM_FUNC_DECL constexpr vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, T epsilon);
78 
86  template<length_t C, length_t R, typename T, qualifier Q>
-
87  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, T, Q> const& epsilon);
+
87  GLM_FUNC_DECL constexpr vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, T, Q> const& epsilon);
88 
96  template<length_t C, length_t R, typename T, qualifier Q>
-
97  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, int ULPs);
+
97  GLM_FUNC_DECL constexpr vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, int ULPs);
98 
106  template<length_t C, length_t R, typename T, qualifier Q>
-
107  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, int, Q> const& ULPs);
+
107  GLM_FUNC_DECL constexpr vec<C, bool, Q> equal(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, int, Q> const& ULPs);
108 
116  template<length_t C, length_t R, typename T, qualifier Q>
-
117  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, int ULPs);
+
117  GLM_FUNC_DECL constexpr vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, int ULPs);
118 
126  template<length_t C, length_t R, typename T, qualifier Q>
-
127  GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, int, Q> const& ULPs);
+
127  GLM_FUNC_DECL constexpr vec<C, bool, Q> notEqual(mat<C, R, T, Q> const& x, mat<C, R, T, Q> const& y, vec<C, int, Q> const& ULPs);
128 
130 }//namespace glm
131 
132 #include "matrix_relational.inl"
-
glm::equal
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal(mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
-
glm::notEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual(mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::equal
GLM_FUNC_DECL constexpr vec< C, bool, Q > equal(mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
+
glm::notEqual
GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual(mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
Generated by   diff --git a/doc/api/a00326.html b/doc/api/a00326.html index 53a826aad..7d813f19d 100644 --- a/doc/api/a00326.html +++ b/doc/api/a00326.html @@ -81,11 +81,11 @@ $(function() {

Functions

template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > conjugate (qua< T, Q > const &q) +GLM_FUNC_DECL constexpr qua< T, Q > conjugate (qua< T, Q > const &q)  Returns the q conjugate. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > inverse (qua< T, Q > const &q) +GLM_FUNC_DECL constexpr qua< T, Q > inverse (qua< T, Q > const &q)  Returns the q inverse. More...
  template<typename T , qualifier Q> @@ -97,7 +97,7 @@ Functions  Returns true if x holds a NaN (not a number) representation in the underlying implementation's set of floating point representations. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > lerp (qua< T, Q > const &x, qua< T, Q > const &y, T a) +GLM_FUNC_DECL constexpr qua< T, Q > lerp (qua< T, Q > const &x, qua< T, Q > const &y, T a)  Linear interpolation of two quaternions. More...
  template<typename T , qualifier Q> diff --git a/doc/api/a00326_source.html b/doc/api/a00326_source.html index ba2023e1b..a24cdacdc 100644 --- a/doc/api/a00326_source.html +++ b/doc/api/a00326_source.html @@ -92,7 +92,7 @@ $(function() {
53  GLM_FUNC_DECL qua<T, Q> mix(qua<T, Q> const& x, qua<T, Q> const& y, T a);
54 
64  template<typename T, qualifier Q>
-
65  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> lerp(qua<T, Q> const& x, qua<T, Q> const& y, T a);
+
65  GLM_FUNC_DECL constexpr qua<T, Q> lerp(qua<T, Q> const& x, qua<T, Q> const& y, T a);
66 
76  template<typename T, qualifier Q>
77  GLM_FUNC_DECL qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a);
@@ -101,10 +101,10 @@ $(function() {
92  GLM_FUNC_DECL qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k);
93 
98  template<typename T, qualifier Q>
-
99  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> conjugate(qua<T, Q> const& q);
+
99  GLM_FUNC_DECL constexpr qua<T, Q> conjugate(qua<T, Q> const& q);
100 
105  template<typename T, qualifier Q>
-
106  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> inverse(qua<T, Q> const& q);
+
106  GLM_FUNC_DECL constexpr qua<T, Q> inverse(qua<T, Q> const& q);
107 
118  template<typename T, qualifier Q>
119  GLM_FUNC_DECL vec<4, bool, Q> isnan(qua<T, Q> const& x);
@@ -118,11 +118,11 @@ $(function() {
glm::isinf
GLM_FUNC_DECL vec< 4, bool, Q > isinf(qua< T, Q > const &x)
Returns true if x holds a positive infinity or negative infinity representation in the underlying imp...
glm::slerp
GLM_FUNC_DECL qua< T, Q > slerp(qua< T, Q > const &x, qua< T, Q > const &y, T a, S k)
Spherical linear interpolation of two quaternions with multiple spins over rotation axis.
-
glm::inverse
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > inverse(qua< T, Q > const &q)
Returns the q inverse.
+
glm::inverse
GLM_FUNC_DECL constexpr qua< T, Q > inverse(qua< T, Q > const &q)
Returns the q inverse.
glm::isnan
GLM_FUNC_DECL vec< 4, bool, Q > isnan(qua< T, Q > const &x)
Returns true if x holds a NaN (not a number) representation in the underlying implementation's set of...
glm::mix
GLM_FUNC_DECL qua< T, Q > mix(qua< T, Q > const &x, qua< T, Q > const &y, T a)
Spherical linear interpolation of two quaternions.
-
glm::conjugate
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > conjugate(qua< T, Q > const &q)
Returns the q conjugate.
-
glm::lerp
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > lerp(qua< T, Q > const &x, qua< T, Q > const &y, T a)
Linear interpolation of two quaternions.
+
glm::conjugate
GLM_FUNC_DECL constexpr qua< T, Q > conjugate(qua< T, Q > const &q)
Returns the q conjugate.
+
glm::lerp
GLM_FUNC_DECL constexpr qua< T, Q > lerp(qua< T, Q > const &x, qua< T, Q > const &y, T a)
Linear interpolation of two quaternions.
Generated by   diff --git a/doc/api/a00344.html b/doc/api/a00344.html index 8214ae55c..9b37da9d8 100644 --- a/doc/api/a00344.html +++ b/doc/api/a00344.html @@ -81,11 +81,11 @@ $(function() {

Functions

template<typename T , qualifier Q> -GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua< T, Q > cross (qua< T, Q > const &q1, qua< T, Q > const &q2) +GLM_FUNC_QUALIFIER constexpr qua< T, Q > cross (qua< T, Q > const &q1, qua< T, Q > const &q2)  Compute a cross product. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR T dot (qua< T, Q > const &x, qua< T, Q > const &y) +GLM_FUNC_DECL constexpr T dot (qua< T, Q > const &x, qua< T, Q > const &y)  Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... More...
  template<typename T , qualifier Q> @@ -93,7 +93,7 @@ Functions  Returns the norm of a quaternions. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > normalize (qua< T, Q > const &q) +GLM_FUNC_DECL constexpr qua< T, Q > normalize (qua< T, Q > const &q)  Returns the normalized quaternion. More...
  diff --git a/doc/api/a00344_source.html b/doc/api/a00344_source.html index 02963f8e3..2dbb35e48 100644 --- a/doc/api/a00344_source.html +++ b/doc/api/a00344_source.html @@ -89,22 +89,22 @@ $(function() {
38  GLM_FUNC_DECL T length(qua<T, Q> const& q);
39 
46  template<typename T, qualifier Q>
-
47  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> normalize(qua<T, Q> const& q);
+
47  GLM_FUNC_DECL constexpr qua<T, Q> normalize(qua<T, Q> const& q);
48 
55  template<typename T, qualifier Q>
-
56  GLM_FUNC_DECL GLM_CONSTEXPR T dot(qua<T, Q> const& x, qua<T, Q> const& y);
+
56  GLM_FUNC_DECL constexpr T dot(qua<T, Q> const& x, qua<T, Q> const& y);
57 
64  template<typename T, qualifier Q>
-
65  GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q> cross(qua<T, Q> const& q1, qua<T, Q> const& q2);
+
65  GLM_FUNC_QUALIFIER constexpr qua<T, Q> cross(qua<T, Q> const& q1, qua<T, Q> const& q2);
66 
68 } //namespace glm
69 
70 #include "quaternion_geometric.inl"
-
glm::dot
GLM_FUNC_DECL GLM_CONSTEXPR T dot(qua< T, Q > const &x, qua< T, Q > const &y)
Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ...
+
glm::dot
GLM_FUNC_DECL constexpr T dot(qua< T, Q > const &x, qua< T, Q > const &y)
Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ...
glm::length
GLM_FUNC_DECL T length(qua< T, Q > const &q)
Returns the norm of a quaternions.
-
glm::normalize
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > normalize(qua< T, Q > const &q)
Returns the normalized quaternion.
-
glm::cross
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua< T, Q > cross(qua< T, Q > const &q1, qua< T, Q > const &q2)
Compute a cross product.
+
glm::normalize
GLM_FUNC_DECL constexpr qua< T, Q > normalize(qua< T, Q > const &q)
Returns the normalized quaternion.
+
glm::cross
GLM_FUNC_QUALIFIER constexpr qua< T, Q > cross(qua< T, Q > const &q1, qua< T, Q > const &q2)
Compute a cross product.
Generated by   diff --git a/doc/api/a00347_source.html b/doc/api/a00347_source.html index 7b1d7160a..8ff3814cb 100644 --- a/doc/api/a00347_source.html +++ b/doc/api/a00347_source.html @@ -101,7 +101,7 @@ $(function() {
glm::notEqual
GLM_FUNC_DECL vec< 4, bool, Q > notEqual(qua< T, Q > const &x, qua< T, Q > const &y, T epsilon)
Returns the component-wise comparison of |x - y| >= epsilon.
glm::equal
GLM_FUNC_DECL vec< 4, bool, Q > equal(qua< T, Q > const &x, qua< T, Q > const &y, T epsilon)
Returns the component-wise comparison of |x - y| < epsilon.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
Generated by   diff --git a/doc/api/a00359.html b/doc/api/a00359.html index e31e6a647..bc2ef72bb 100644 --- a/doc/api/a00359.html +++ b/doc/api/a00359.html @@ -82,17 +82,17 @@ $(function() { Functions template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType cos_one_over_two () +GLM_FUNC_DECL constexpr genType cos_one_over_two ()  Return the value of cos(1 / 2) for floating point types.
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon () +GLM_FUNC_DECL constexpr genType epsilon ()  Return the epsilon constant for floating point types.
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType pi () +GLM_FUNC_DECL constexpr genType pi ()  Return the pi constant for floating point types.
  diff --git a/doc/api/a00359_source.html b/doc/api/a00359_source.html index efe59d61c..9ceaa9a21 100644 --- a/doc/api/a00359_source.html +++ b/doc/api/a00359_source.html @@ -84,21 +84,21 @@ $(function() {
21 {
24 
26  template<typename genType>
-
27  GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon();
+
27  GLM_FUNC_DECL constexpr genType epsilon();
28 
30  template<typename genType>
-
31  GLM_FUNC_DECL GLM_CONSTEXPR genType pi();
+
31  GLM_FUNC_DECL constexpr genType pi();
32 
34  template<typename genType>
-
35  GLM_FUNC_DECL GLM_CONSTEXPR genType cos_one_over_two();
+
35  GLM_FUNC_DECL constexpr genType cos_one_over_two();
36 
38 } //namespace glm
39 
40 #include "scalar_constants.inl"
-
glm::cos_one_over_two
GLM_FUNC_DECL GLM_CONSTEXPR genType cos_one_over_two()
Return the value of cos(1 / 2) for floating point types.
-
glm::pi
GLM_FUNC_DECL GLM_CONSTEXPR genType pi()
Return the pi constant for floating point types.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::cos_one_over_two
GLM_FUNC_DECL constexpr genType cos_one_over_two()
Return the value of cos(1 / 2) for floating point types.
+
glm::pi
GLM_FUNC_DECL constexpr genType pi()
Return the pi constant for floating point types.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
Generated by   diff --git a/doc/api/a00407.html b/doc/api/a00407.html index 72855c201..1ee9f34e6 100644 --- a/doc/api/a00407.html +++ b/doc/api/a00407.html @@ -129,19 +129,19 @@ Functions  Returns a value equal to the nearest integer to x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z) +GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z)  Return the maximum component-wise values of 3 inputs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z, vec< L, T, Q > const &w) +GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z, vec< L, T, Q > const &w)  Return the maximum component-wise values of 4 inputs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c) +GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c)  Return the minimum component-wise values of 3 inputs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d) +GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d)  Return the minimum component-wise values of 4 inputs. More...
  template<length_t L, typename T , qualifier Q> diff --git a/doc/api/a00407_source.html b/doc/api/a00407_source.html index 901fd7548..0c8d5efe6 100644 --- a/doc/api/a00407_source.html +++ b/doc/api/a00407_source.html @@ -85,16 +85,16 @@ $(function() {
25 {
28 
34  template<length_t L, typename T, qualifier Q>
-
35  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> min(vec<L, T, Q> const& a, vec<L, T, Q> const& b, vec<L, T, Q> const& c);
+
35  GLM_FUNC_DECL constexpr vec<L, T, Q> min(vec<L, T, Q> const& a, vec<L, T, Q> const& b, vec<L, T, Q> const& c);
36 
42  template<length_t L, typename T, qualifier Q>
-
43  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> min(vec<L, T, Q> const& a, vec<L, T, Q> const& b, vec<L, T, Q> const& c, vec<L, T, Q> const& d);
+
43  GLM_FUNC_DECL constexpr vec<L, T, Q> min(vec<L, T, Q> const& a, vec<L, T, Q> const& b, vec<L, T, Q> const& c, vec<L, T, Q> const& d);
44 
50  template<length_t L, typename T, qualifier Q>
-
51  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> max(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& z);
+
51  GLM_FUNC_DECL constexpr vec<L, T, Q> max(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& z);
52 
58  template<length_t L, typename T, qualifier Q>
-
59  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> max( vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& z, vec<L, T, Q> const& w);
+
59  GLM_FUNC_DECL constexpr vec<L, T, Q> max( vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& z, vec<L, T, Q> const& w);
60 
68  template<length_t L, typename T, qualifier Q>
69  GLM_FUNC_DECL vec<L, T, Q> fmin(vec<L, T, Q> const& x, T y);
@@ -148,8 +148,8 @@ $(function() {
227 
228 #include "vector_common.inl"
-
glm::min
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min(vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d)
Return the minimum component-wise values of 4 inputs.
-
glm::max
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max(vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z, vec< L, T, Q > const &w)
Return the maximum component-wise values of 4 inputs.
+
glm::min
GLM_FUNC_DECL constexpr vec< L, T, Q > min(vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d)
Return the minimum component-wise values of 4 inputs.
+
glm::max
GLM_FUNC_DECL constexpr vec< L, T, Q > max(vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z, vec< L, T, Q > const &w)
Return the maximum component-wise values of 4 inputs.
glm::repeat
GLM_FUNC_DECL vec< L, T, Q > repeat(vec< L, T, Q > const &Texcoord)
Simulate GL_REPEAT OpenGL wrap mode.
glm::uround
GLM_FUNC_DECL vec< L, uint, Q > uround(vec< L, T, Q > const &x)
Returns a value equal to the nearest integer to x.
glm::fmax
GLM_FUNC_DECL vec< L, T, Q > fmax(vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d)
Returns y if x < y; otherwise, it returns x.
diff --git a/doc/api/a00491.html b/doc/api/a00491.html index 14f1a6eb6..1f625a084 100644 --- a/doc/api/a00491.html +++ b/doc/api/a00491.html @@ -81,39 +81,39 @@ $(function() {

Functions

template<length_t L, qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR bool all (vec< L, bool, Q > const &v) +GLM_FUNC_DECL constexpr bool all (vec< L, bool, Q > const &v)  Returns true if all components of x are true. More...
  template<length_t L, qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR bool any (vec< L, bool, Q > const &v) +GLM_FUNC_DECL constexpr bool any (vec< L, bool, Q > const &v)  Returns true if any component of x is true. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the component-wise comparison of result x == y. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > greaterThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, bool, Q > greaterThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the component-wise comparison of result x > y. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > greaterThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, bool, Q > greaterThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the component-wise comparison of result x >= y. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > lessThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, bool, Q > lessThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the component-wise comparison result of x < y. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > lessThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, bool, Q > lessThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the component-wise comparison of result x <= y. More...
  template<length_t L, qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > not_ (vec< L, bool, Q > const &v) +GLM_FUNC_DECL constexpr vec< L, bool, Q > not_ (vec< L, bool, Q > const &v)  Returns the component-wise logical complement of x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the component-wise comparison of result x != y. More...
  diff --git a/doc/api/a00491_source.html b/doc/api/a00491_source.html index 08c34a21c..75bf7de69 100644 --- a/doc/api/a00491_source.html +++ b/doc/api/a00491_source.html @@ -80,45 +80,45 @@ $(function() {
26 {
29 
37  template<length_t L, typename T, qualifier Q>
-
38  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> lessThan(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
38  GLM_FUNC_DECL constexpr vec<L, bool, Q> lessThan(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
39 
47  template<length_t L, typename T, qualifier Q>
-
48  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> lessThanEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
48  GLM_FUNC_DECL constexpr vec<L, bool, Q> lessThanEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
49 
57  template<length_t L, typename T, qualifier Q>
-
58  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> greaterThan(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
58  GLM_FUNC_DECL constexpr vec<L, bool, Q> greaterThan(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
59 
67  template<length_t L, typename T, qualifier Q>
-
68  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> greaterThanEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
68  GLM_FUNC_DECL constexpr vec<L, bool, Q> greaterThanEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
69 
77  template<length_t L, typename T, qualifier Q>
-
78  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
78  GLM_FUNC_DECL constexpr vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
79 
87  template<length_t L, typename T, qualifier Q>
-
88  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
88  GLM_FUNC_DECL constexpr vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
89 
96  template<length_t L, qualifier Q>
-
97  GLM_FUNC_DECL GLM_CONSTEXPR bool any(vec<L, bool, Q> const& v);
+
97  GLM_FUNC_DECL constexpr bool any(vec<L, bool, Q> const& v);
98 
105  template<length_t L, qualifier Q>
-
106  GLM_FUNC_DECL GLM_CONSTEXPR bool all(vec<L, bool, Q> const& v);
+
106  GLM_FUNC_DECL constexpr bool all(vec<L, bool, Q> const& v);
107 
115  template<length_t L, qualifier Q>
-
116  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> not_(vec<L, bool, Q> const& v);
+
116  GLM_FUNC_DECL constexpr vec<L, bool, Q> not_(vec<L, bool, Q> const& v);
117 
119 }//namespace glm
120 
121 #include "detail/func_vector_relational.inl"
-
glm::lessThanEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > lessThanEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x <= y.
-
glm::greaterThan
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > greaterThan(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x > y.
-
glm::equal
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x == y.
-
glm::lessThan
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > lessThan(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison result of x < y.
-
glm::notEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x != y.
-
glm::any
GLM_FUNC_DECL GLM_CONSTEXPR bool any(vec< L, bool, Q > const &v)
Returns true if any component of x is true.
-
glm::all
GLM_FUNC_DECL GLM_CONSTEXPR bool all(vec< L, bool, Q > const &v)
Returns true if all components of x are true.
-
glm::not_
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > not_(vec< L, bool, Q > const &v)
Returns the component-wise logical complement of x.
-
glm::greaterThanEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > greaterThanEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x >= y.
+
glm::lessThanEqual
GLM_FUNC_DECL constexpr vec< L, bool, Q > lessThanEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x <= y.
+
glm::greaterThan
GLM_FUNC_DECL constexpr vec< L, bool, Q > greaterThan(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x > y.
+
glm::equal
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x == y.
+
glm::lessThan
GLM_FUNC_DECL constexpr vec< L, bool, Q > lessThan(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison result of x < y.
+
glm::notEqual
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x != y.
+
glm::any
GLM_FUNC_DECL constexpr bool any(vec< L, bool, Q > const &v)
Returns true if any component of x is true.
+
glm::all
GLM_FUNC_DECL constexpr bool all(vec< L, bool, Q > const &v)
Returns true if all components of x are true.
+
glm::not_
GLM_FUNC_DECL constexpr vec< L, bool, Q > not_(vec< L, bool, Q > const &v)
Returns the component-wise logical complement of x.
+
glm::greaterThanEqual
GLM_FUNC_DECL constexpr vec< L, bool, Q > greaterThanEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the component-wise comparison of result x >= y.
Generated by   diff --git a/doc/api/a00527.html b/doc/api/a00527.html index 0f1643d16..4c9835a1f 100644 --- a/doc/api/a00527.html +++ b/doc/api/a00527.html @@ -81,7 +81,7 @@ $(function() {

Functions

template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross (vec< 3, T, Q > const &x, vec< 3, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< 3, T, Q > cross (vec< 3, T, Q > const &x, vec< 3, T, Q > const &y)  Returns the cross product of x and y. More...
  template<length_t L, typename T , qualifier Q> @@ -89,7 +89,7 @@ Functions  Returns the distance between p0 and p1, i.e., length(p0 - p1). More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR T dot (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr T dot (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns the dot product of x and y, i.e., result = x * y. More...
  template<length_t L, typename T , qualifier Q> diff --git a/doc/api/a00527_source.html b/doc/api/a00527_source.html index ad478903e..b0ead410a 100644 --- a/doc/api/a00527_source.html +++ b/doc/api/a00527_source.html @@ -85,10 +85,10 @@ $(function() {
40  GLM_FUNC_DECL T distance(vec<L, T, Q> const& p0, vec<L, T, Q> const& p1);
41 
49  template<length_t L, typename T, qualifier Q>
-
50  GLM_FUNC_DECL GLM_CONSTEXPR T dot(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
50  GLM_FUNC_DECL constexpr T dot(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
51 
58  template<typename T, qualifier Q>
-
59  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> cross(vec<3, T, Q> const& x, vec<3, T, Q> const& y);
+
59  GLM_FUNC_DECL constexpr vec<3, T, Q> cross(vec<3, T, Q> const& x, vec<3, T, Q> const& y);
60 
69  template<length_t L, typename T, qualifier Q>
70  GLM_FUNC_DECL vec<L, T, Q> normalize(vec<L, T, Q> const& x);
@@ -121,8 +121,8 @@ $(function() {
glm::refract
GLM_FUNC_DECL vec< L, T, Q > refract(vec< L, T, Q > const &I, vec< L, T, Q > const &N, T eta)
For the incident vector I and surface normal N, and the ratio of indices of refraction eta,...
glm::reflect
GLM_FUNC_DECL vec< L, T, Q > reflect(vec< L, T, Q > const &I, vec< L, T, Q > const &N)
For the incident vector I and surface orientation N, returns the reflection direction : result = I - ...
glm::faceforward
GLM_FUNC_DECL vec< L, T, Q > faceforward(vec< L, T, Q > const &N, vec< L, T, Q > const &I, vec< L, T, Q > const &Nref)
If dot(Nref, I) < 0.0, return N, otherwise, return -N.
-
glm::cross
GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross(vec< 3, T, Q > const &x, vec< 3, T, Q > const &y)
Returns the cross product of x and y.
-
glm::dot
GLM_FUNC_DECL GLM_CONSTEXPR T dot(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the dot product of x and y, i.e., result = x * y.
+
glm::cross
GLM_FUNC_DECL constexpr vec< 3, T, Q > cross(vec< 3, T, Q > const &x, vec< 3, T, Q > const &y)
Returns the cross product of x and y.
+
glm::dot
GLM_FUNC_DECL constexpr T dot(vec< L, T, Q > const &x, vec< L, T, Q > const &y)
Returns the dot product of x and y, i.e., result = x * y.
Generated by   diff --git a/doc/api/a00539.html b/doc/api/a00539.html index 6e69598d0..472cf2ee8 100644 --- a/doc/api/a00539.html +++ b/doc/api/a00539.html @@ -81,115 +81,115 @@ $(function() {

Functions

template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType e () +GLM_FUNC_DECL constexpr genType e ()  Return e constant. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType euler () +GLM_FUNC_DECL constexpr genType euler ()  Return Euler's constant. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType four_over_pi () +GLM_FUNC_DECL constexpr genType four_over_pi ()  Return 4 / pi. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType golden_ratio () +GLM_FUNC_DECL constexpr genType golden_ratio ()  Return the golden ratio constant. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType half_pi () +GLM_FUNC_DECL constexpr genType half_pi ()  Return pi / 2. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ln_two () +GLM_FUNC_DECL constexpr genType ln_ln_two ()  Return ln(ln(2)). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ten () +GLM_FUNC_DECL constexpr genType ln_ten ()  Return ln(10). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType ln_two () +GLM_FUNC_DECL constexpr genType ln_two ()  Return ln(2). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType one () +GLM_FUNC_DECL constexpr genType one ()  Return 1. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_pi () +GLM_FUNC_DECL constexpr genType one_over_pi ()  Return 1 / pi. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_root_two () +GLM_FUNC_DECL constexpr genType one_over_root_two ()  Return 1 / sqrt(2). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_two_pi () +GLM_FUNC_DECL constexpr genType one_over_two_pi ()  Return 1 / (pi * 2). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType quarter_pi () +GLM_FUNC_DECL constexpr genType quarter_pi ()  Return pi / 4. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_five () +GLM_FUNC_DECL constexpr genType root_five ()  Return sqrt(5). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_half_pi () +GLM_FUNC_DECL constexpr genType root_half_pi ()  Return sqrt(pi / 2). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_ln_four () +GLM_FUNC_DECL constexpr genType root_ln_four ()  Return sqrt(ln(4)). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_pi () +GLM_FUNC_DECL constexpr genType root_pi ()  Return square root of pi. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_three () +GLM_FUNC_DECL constexpr genType root_three ()  Return sqrt(3). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_two () +GLM_FUNC_DECL constexpr genType root_two ()  Return sqrt(2). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType root_two_pi () +GLM_FUNC_DECL constexpr genType root_two_pi ()  Return sqrt(2 * pi). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType tau () +GLM_FUNC_DECL constexpr genType tau ()  Return unit-circle circumference, or pi * 2. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType third () +GLM_FUNC_DECL constexpr genType third ()  Return 1 / 3. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType three_over_two_pi () +GLM_FUNC_DECL constexpr genType three_over_two_pi ()  Return pi / 2 * 3. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_pi () +GLM_FUNC_DECL constexpr genType two_over_pi ()  Return 2 / pi. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_root_pi () +GLM_FUNC_DECL constexpr genType two_over_root_pi ()  Return 2 / sqrt(pi). More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType two_pi () +GLM_FUNC_DECL constexpr genType two_pi ()  Return pi * 2. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType two_thirds () +GLM_FUNC_DECL constexpr genType two_thirds ()  Return 2 / 3. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType zero () +GLM_FUNC_DECL constexpr genType zero ()  Return 0. More...
  diff --git a/doc/api/a00539_source.html b/doc/api/a00539_source.html index 3814cef14..f3d688b66 100644 --- a/doc/api/a00539_source.html +++ b/doc/api/a00539_source.html @@ -84,121 +84,121 @@ $(function() {
23 {
26 
29  template<typename genType>
-
30  GLM_FUNC_DECL GLM_CONSTEXPR genType zero();
+
30  GLM_FUNC_DECL constexpr genType zero();
31 
34  template<typename genType>
-
35  GLM_FUNC_DECL GLM_CONSTEXPR genType one();
+
35  GLM_FUNC_DECL constexpr genType one();
36 
39  template<typename genType>
-
40  GLM_FUNC_DECL GLM_CONSTEXPR genType two_pi();
+
40  GLM_FUNC_DECL constexpr genType two_pi();
41 
44  template<typename genType>
-
45  GLM_FUNC_DECL GLM_CONSTEXPR genType tau();
+
45  GLM_FUNC_DECL constexpr genType tau();
46 
49  template<typename genType>
-
50  GLM_FUNC_DECL GLM_CONSTEXPR genType root_pi();
+
50  GLM_FUNC_DECL constexpr genType root_pi();
51 
54  template<typename genType>
-
55  GLM_FUNC_DECL GLM_CONSTEXPR genType half_pi();
+
55  GLM_FUNC_DECL constexpr genType half_pi();
56 
59  template<typename genType>
-
60  GLM_FUNC_DECL GLM_CONSTEXPR genType three_over_two_pi();
+
60  GLM_FUNC_DECL constexpr genType three_over_two_pi();
61 
64  template<typename genType>
-
65  GLM_FUNC_DECL GLM_CONSTEXPR genType quarter_pi();
+
65  GLM_FUNC_DECL constexpr genType quarter_pi();
66 
69  template<typename genType>
-
70  GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_pi();
+
70  GLM_FUNC_DECL constexpr genType one_over_pi();
71 
74  template<typename genType>
-
75  GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_two_pi();
+
75  GLM_FUNC_DECL constexpr genType one_over_two_pi();
76 
79  template<typename genType>
-
80  GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_pi();
+
80  GLM_FUNC_DECL constexpr genType two_over_pi();
81 
84  template<typename genType>
-
85  GLM_FUNC_DECL GLM_CONSTEXPR genType four_over_pi();
+
85  GLM_FUNC_DECL constexpr genType four_over_pi();
86 
89  template<typename genType>
-
90  GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_root_pi();
+
90  GLM_FUNC_DECL constexpr genType two_over_root_pi();
91 
94  template<typename genType>
-
95  GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_root_two();
+
95  GLM_FUNC_DECL constexpr genType one_over_root_two();
96 
99  template<typename genType>
-
100  GLM_FUNC_DECL GLM_CONSTEXPR genType root_half_pi();
+
100  GLM_FUNC_DECL constexpr genType root_half_pi();
101 
104  template<typename genType>
-
105  GLM_FUNC_DECL GLM_CONSTEXPR genType root_two_pi();
+
105  GLM_FUNC_DECL constexpr genType root_two_pi();
106 
109  template<typename genType>
-
110  GLM_FUNC_DECL GLM_CONSTEXPR genType root_ln_four();
+
110  GLM_FUNC_DECL constexpr genType root_ln_four();
111 
114  template<typename genType>
-
115  GLM_FUNC_DECL GLM_CONSTEXPR genType e();
+
115  GLM_FUNC_DECL constexpr genType e();
116 
119  template<typename genType>
-
120  GLM_FUNC_DECL GLM_CONSTEXPR genType euler();
+
120  GLM_FUNC_DECL constexpr genType euler();
121 
124  template<typename genType>
-
125  GLM_FUNC_DECL GLM_CONSTEXPR genType root_two();
+
125  GLM_FUNC_DECL constexpr genType root_two();
126 
129  template<typename genType>
-
130  GLM_FUNC_DECL GLM_CONSTEXPR genType root_three();
+
130  GLM_FUNC_DECL constexpr genType root_three();
131 
134  template<typename genType>
-
135  GLM_FUNC_DECL GLM_CONSTEXPR genType root_five();
+
135  GLM_FUNC_DECL constexpr genType root_five();
136 
139  template<typename genType>
-
140  GLM_FUNC_DECL GLM_CONSTEXPR genType ln_two();
+
140  GLM_FUNC_DECL constexpr genType ln_two();
141 
144  template<typename genType>
-
145  GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ten();
+
145  GLM_FUNC_DECL constexpr genType ln_ten();
146 
149  template<typename genType>
-
150  GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ln_two();
+
150  GLM_FUNC_DECL constexpr genType ln_ln_two();
151 
154  template<typename genType>
-
155  GLM_FUNC_DECL GLM_CONSTEXPR genType third();
+
155  GLM_FUNC_DECL constexpr genType third();
156 
159  template<typename genType>
-
160  GLM_FUNC_DECL GLM_CONSTEXPR genType two_thirds();
+
160  GLM_FUNC_DECL constexpr genType two_thirds();
161 
164  template<typename genType>
-
165  GLM_FUNC_DECL GLM_CONSTEXPR genType golden_ratio();
+
165  GLM_FUNC_DECL constexpr genType golden_ratio();
166 
168 } //namespace glm
169 
170 #include "constants.inl"
-
glm::golden_ratio
GLM_FUNC_DECL GLM_CONSTEXPR genType golden_ratio()
Return the golden ratio constant.
-
glm::two_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType two_pi()
Return pi * 2.
-
glm::root_two
GLM_FUNC_DECL GLM_CONSTEXPR genType root_two()
Return sqrt(2).
-
glm::one_over_two_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_two_pi()
Return 1 / (pi * 2).
-
glm::one_over_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_pi()
Return 1 / pi.
-
glm::ln_ln_two
GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ln_two()
Return ln(ln(2)).
-
glm::half_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType half_pi()
Return pi / 2.
-
glm::third
GLM_FUNC_DECL GLM_CONSTEXPR genType third()
Return 1 / 3.
-
glm::one
GLM_FUNC_DECL GLM_CONSTEXPR genType one()
Return 1.
-
glm::two_over_root_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_root_pi()
Return 2 / sqrt(pi).
-
glm::root_three
GLM_FUNC_DECL GLM_CONSTEXPR genType root_three()
Return sqrt(3).
-
glm::root_half_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType root_half_pi()
Return sqrt(pi / 2).
-
glm::three_over_two_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType three_over_two_pi()
Return pi / 2 * 3.
-
glm::quarter_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType quarter_pi()
Return pi / 4.
-
glm::root_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType root_pi()
Return square root of pi.
-
glm::root_five
GLM_FUNC_DECL GLM_CONSTEXPR genType root_five()
Return sqrt(5).
-
glm::e
GLM_FUNC_DECL GLM_CONSTEXPR genType e()
Return e constant.
-
glm::root_two_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType root_two_pi()
Return sqrt(2 * pi).
-
glm::zero
GLM_FUNC_DECL GLM_CONSTEXPR genType zero()
Return 0.
-
glm::root_ln_four
GLM_FUNC_DECL GLM_CONSTEXPR genType root_ln_four()
Return sqrt(ln(4)).
-
glm::ln_two
GLM_FUNC_DECL GLM_CONSTEXPR genType ln_two()
Return ln(2).
-
glm::two_over_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_pi()
Return 2 / pi.
-
glm::euler
GLM_FUNC_DECL GLM_CONSTEXPR genType euler()
Return Euler's constant.
-
glm::ln_ten
GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ten()
Return ln(10).
-
glm::four_over_pi
GLM_FUNC_DECL GLM_CONSTEXPR genType four_over_pi()
Return 4 / pi.
-
glm::one_over_root_two
GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_root_two()
Return 1 / sqrt(2).
-
glm::two_thirds
GLM_FUNC_DECL GLM_CONSTEXPR genType two_thirds()
Return 2 / 3.
-
glm::tau
GLM_FUNC_DECL GLM_CONSTEXPR genType tau()
Return unit-circle circumference, or pi * 2.
+
glm::golden_ratio
GLM_FUNC_DECL constexpr genType golden_ratio()
Return the golden ratio constant.
+
glm::two_pi
GLM_FUNC_DECL constexpr genType two_pi()
Return pi * 2.
+
glm::root_two
GLM_FUNC_DECL constexpr genType root_two()
Return sqrt(2).
+
glm::one_over_two_pi
GLM_FUNC_DECL constexpr genType one_over_two_pi()
Return 1 / (pi * 2).
+
glm::one_over_pi
GLM_FUNC_DECL constexpr genType one_over_pi()
Return 1 / pi.
+
glm::ln_ln_two
GLM_FUNC_DECL constexpr genType ln_ln_two()
Return ln(ln(2)).
+
glm::half_pi
GLM_FUNC_DECL constexpr genType half_pi()
Return pi / 2.
+
glm::third
GLM_FUNC_DECL constexpr genType third()
Return 1 / 3.
+
glm::one
GLM_FUNC_DECL constexpr genType one()
Return 1.
+
glm::two_over_root_pi
GLM_FUNC_DECL constexpr genType two_over_root_pi()
Return 2 / sqrt(pi).
+
glm::root_three
GLM_FUNC_DECL constexpr genType root_three()
Return sqrt(3).
+
glm::root_half_pi
GLM_FUNC_DECL constexpr genType root_half_pi()
Return sqrt(pi / 2).
+
glm::three_over_two_pi
GLM_FUNC_DECL constexpr genType three_over_two_pi()
Return pi / 2 * 3.
+
glm::quarter_pi
GLM_FUNC_DECL constexpr genType quarter_pi()
Return pi / 4.
+
glm::root_pi
GLM_FUNC_DECL constexpr genType root_pi()
Return square root of pi.
+
glm::root_five
GLM_FUNC_DECL constexpr genType root_five()
Return sqrt(5).
+
glm::e
GLM_FUNC_DECL constexpr genType e()
Return e constant.
+
glm::root_two_pi
GLM_FUNC_DECL constexpr genType root_two_pi()
Return sqrt(2 * pi).
+
glm::zero
GLM_FUNC_DECL constexpr genType zero()
Return 0.
+
glm::root_ln_four
GLM_FUNC_DECL constexpr genType root_ln_four()
Return sqrt(ln(4)).
+
glm::ln_two
GLM_FUNC_DECL constexpr genType ln_two()
Return ln(2).
+
glm::two_over_pi
GLM_FUNC_DECL constexpr genType two_over_pi()
Return 2 / pi.
+
glm::euler
GLM_FUNC_DECL constexpr genType euler()
Return Euler's constant.
+
glm::ln_ten
GLM_FUNC_DECL constexpr genType ln_ten()
Return ln(10).
+
glm::four_over_pi
GLM_FUNC_DECL constexpr genType four_over_pi()
Return 4 / pi.
+
glm::one_over_root_two
GLM_FUNC_DECL constexpr genType one_over_root_two()
Return 1 / sqrt(2).
+
glm::two_thirds
GLM_FUNC_DECL constexpr genType two_thirds()
Return 2 / 3.
+
glm::tau
GLM_FUNC_DECL constexpr genType tau()
Return unit-circle circumference, or pi * 2.
Generated by   diff --git a/doc/api/a00542_source.html b/doc/api/a00542_source.html index 19112a4d4..361081a54 100644 --- a/doc/api/a00542_source.html +++ b/doc/api/a00542_source.html @@ -101,7 +101,7 @@ $(function() {
60 #include "epsilon.inl"
glm::epsilonNotEqual
GLM_FUNC_DECL bool epsilonNotEqual(genType const &x, genType const &y, genType const &epsilon)
Returns the component-wise comparison of |x - y| >= epsilon.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
glm::epsilonEqual
GLM_FUNC_DECL bool epsilonEqual(genType const &x, genType const &y, genType const &epsilon)
Returns the component-wise comparison of |x - y| < epsilon.
diff --git a/doc/api/a00602_source.html b/doc/api/a00602_source.html index 18b58f4c3..dad9f9a52 100644 --- a/doc/api/a00602_source.html +++ b/doc/api/a00602_source.html @@ -229,10 +229,10 @@ $(function() {
glm::isfinite
GLM_FUNC_DECL vec< 4, bool, Q > isfinite(const qua< T, Q > &x)
Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
glm::lerp
GLM_FUNC_QUALIFIER vec< 4, T, Q > lerp(const vec< 4, T, Q > &x, const vec< 4, T, Q > &y, const vec< 4, T, Q > &a)
Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using v...
Definition: compatibility.hpp:46
glm::int3x3
mat< 3, 3, int, highp > int3x3
integer matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
Definition: compatibility.hpp:91
-
glm::mix
GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
+
glm::mix
GLM_FUNC_DECL constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
glm::float4
vec< 4, float, highp > float4
single-qualifier floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
Definition: compatibility.hpp:100
glm::double2
vec< 2, double, highp > double2
double-qualifier floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
Definition: compatibility.hpp:114
-
glm::clamp
GLM_FUNC_DECL GLM_CONSTEXPR genType clamp(genType x, genType minVal, genType maxVal)
Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal an...
+
glm::clamp
GLM_FUNC_DECL constexpr genType clamp(genType x, genType minVal, genType maxVal)
Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal an...
glm::int4x3
mat< 4, 3, int, highp > int4x3
integer matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
Definition: compatibility.hpp:94
glm::double4x4
mat< 4, 4, double, highp > double4x4
double-qualifier floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
Definition: compatibility.hpp:127
glm::bool2
vec< 2, bool, highp > bool2
boolean type with 2 components. (From GLM_GTX_compatibility extension)
Definition: compatibility.hpp:66
diff --git a/doc/api/a00608_source.html b/doc/api/a00608_source.html index 2702334ce..466663a59 100644 --- a/doc/api/a00608_source.html +++ b/doc/api/a00608_source.html @@ -102,15 +102,15 @@ $(function() {
46  // -- Component accesses --
47 
48  typedef length_t length_type;
-
50  GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 2;}
+
50  GLM_FUNC_DECL static constexpr length_type length(){return 2;}
51 
52  GLM_FUNC_DECL part_type & operator[](length_type i);
53  GLM_FUNC_DECL part_type const& operator[](length_type i) const;
54 
55  // -- Implicit basic constructors --
56 
-
57  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT;
-
58  GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, Q> const& d) GLM_DEFAULT;
+
57  GLM_DEFAULTED_FUNC_DECL constexpr tdualquat() GLM_DEFAULT;
+
58  GLM_DEFAULTED_FUNC_DECL constexpr tdualquat(tdualquat<T, Q> const& d) GLM_DEFAULT;
59  template<qualifier P>
60  GLM_CTOR_DECL tdualquat(tdualquat<T, P> const& d);
61 
diff --git a/doc/api/a00623.html b/doc/api/a00623.html index 36a7bc35c..e714e0615 100644 --- a/doc/api/a00623.html +++ b/doc/api/a00623.html @@ -81,7 +81,7 @@ $(function() {

Functions

template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR T cross (vec< 2, T, Q > const &v, vec< 2, T, Q > const &u) +GLM_FUNC_DECL constexpr T cross (vec< 2, T, Q > const &v, vec< 2, T, Q > const &u)  Returns the cross product of x and y. More...
  diff --git a/doc/api/a00623_source.html b/doc/api/a00623_source.html index a0d5fc856..c5acecaf9 100644 --- a/doc/api/a00623_source.html +++ b/doc/api/a00623_source.html @@ -87,13 +87,13 @@ $(function() {
27 {
30 
37  template<typename T, qualifier Q>
-
38  GLM_FUNC_DECL GLM_CONSTEXPR T cross(vec<2, T, Q> const& v, vec<2, T, Q> const& u);
+
38  GLM_FUNC_DECL constexpr T cross(vec<2, T, Q> const& v, vec<2, T, Q> const& u);
39 
41 } //namespace glm
42 
43 #include "exterior_product.inl"
-
glm::cross
GLM_FUNC_DECL GLM_CONSTEXPR T cross(vec< 2, T, Q > const &v, vec< 2, T, Q > const &u)
Returns the cross product of x and y.
+
glm::cross
GLM_FUNC_DECL constexpr T cross(vec< 2, T, Q > const &v, vec< 2, T, Q > const &u)
Returns the cross product of x and y.
Generated by   diff --git a/doc/api/a00653_source.html b/doc/api/a00653_source.html index ac51d6a86..93a0d55a9 100644 --- a/doc/api/a00653_source.html +++ b/doc/api/a00653_source.html @@ -88,58 +88,58 @@ $(function() {
25 namespace glm
26 {
29  template<length_t L,typename T,qualifier Q>
-
30  GLM_FUNC_DECL GLM_CONSTEXPR T* begin(vec<L, T, Q>& v);
+
30  GLM_FUNC_DECL constexpr T* begin(vec<L, T, Q>& v);
31  template<length_t C,length_t R,typename T,qualifier Q>
-
32  GLM_FUNC_DECL GLM_CONSTEXPR T* begin(mat<C, R, T, Q>& m);
+
32  GLM_FUNC_DECL constexpr T* begin(mat<C, R, T, Q>& m);
33  template<typename T,qualifier Q>
-
34  GLM_FUNC_DECL GLM_CONSTEXPR T* begin(qua<T, Q>& q);
+
34  GLM_FUNC_DECL constexpr T* begin(qua<T, Q>& q);
35  template<length_t L,typename T,qualifier Q>
-
36  GLM_FUNC_DECL GLM_CONSTEXPR const T* begin(const vec<L, T, Q>& v);
+
36  GLM_FUNC_DECL constexpr const T* begin(const vec<L, T, Q>& v);
37  template<length_t C,length_t R,typename T,qualifier Q>
-
38  GLM_FUNC_DECL GLM_CONSTEXPR const T* begin(const mat<C, R, T, Q>& m);
+
38  GLM_FUNC_DECL constexpr const T* begin(const mat<C, R, T, Q>& m);
39  template<typename T,qualifier Q>
-
40  GLM_FUNC_DECL GLM_CONSTEXPR const T* begin(const qua<T, Q>& q);
+
40  GLM_FUNC_DECL constexpr const T* begin(const qua<T, Q>& q);
41 
42  template<length_t L,typename T,qualifier Q>
-
43  GLM_FUNC_DECL GLM_CONSTEXPR T* end(vec<L, T, Q>& v);
+
43  GLM_FUNC_DECL constexpr T* end(vec<L, T, Q>& v);
44  template<length_t C,length_t R,typename T,qualifier Q>
-
45  GLM_FUNC_DECL GLM_CONSTEXPR T* end(mat<C, R, T, Q>& m);
+
45  GLM_FUNC_DECL constexpr T* end(mat<C, R, T, Q>& m);
46  template<typename T,qualifier Q>
-
47  GLM_FUNC_DECL GLM_CONSTEXPR T* end(qua<T, Q>& q);
+
47  GLM_FUNC_DECL constexpr T* end(qua<T, Q>& q);
48  template<length_t L,typename T,qualifier Q>
-
49  GLM_FUNC_DECL GLM_CONSTEXPR const T* end(const vec<L, T, Q>& v);
+
49  GLM_FUNC_DECL constexpr const T* end(const vec<L, T, Q>& v);
50  template<length_t C,length_t R,typename T,qualifier Q>
-
51  GLM_FUNC_DECL GLM_CONSTEXPR const T* end(const mat<C, R, T, Q>& m);
+
51  GLM_FUNC_DECL constexpr const T* end(const mat<C, R, T, Q>& m);
52  template<typename T,qualifier Q>
-
53  GLM_FUNC_DECL GLM_CONSTEXPR const T* end(const qua<T, Q>& q);
+
53  GLM_FUNC_DECL constexpr const T* end(const qua<T, Q>& q);
54 
55  // Reverse iteration
56  // rbegin,rend
57  template<length_t L,typename T,qualifier Q>
-
58  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<T*> rbegin(vec<L, T, Q>& v);
+
58  GLM_FUNC_DECL constexpr std::reverse_iterator<T*> rbegin(vec<L, T, Q>& v);
59  template<length_t C,length_t R,typename T,qualifier Q>
-
60  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<T*> rbegin(mat<C, R, T, Q>& m);
+
60  GLM_FUNC_DECL constexpr std::reverse_iterator<T*> rbegin(mat<C, R, T, Q>& m);
61  template<typename T,qualifier Q>
-
62  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<T*> rbegin(qua<T, Q>& q);
+
62  GLM_FUNC_DECL constexpr std::reverse_iterator<T*> rbegin(qua<T, Q>& q);
63  template<length_t L,typename T,qualifier Q>
-
64  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<const T*> rbegin(const vec<L, T, Q>& v);
+
64  GLM_FUNC_DECL constexpr std::reverse_iterator<const T*> rbegin(const vec<L, T, Q>& v);
65  template<length_t C,length_t R,typename T,qualifier Q>
-
66  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<const T*> rbegin(const mat<C, R, T, Q>& m);
+
66  GLM_FUNC_DECL constexpr std::reverse_iterator<const T*> rbegin(const mat<C, R, T, Q>& m);
67  template<typename T,qualifier Q>
-
68  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<const T*> rbegin(const qua<T, Q>& q);
+
68  GLM_FUNC_DECL constexpr std::reverse_iterator<const T*> rbegin(const qua<T, Q>& q);
69 
70  template<length_t L,typename T,qualifier Q>
-
71  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<T*> rend(vec<L, T, Q>& v);
+
71  GLM_FUNC_DECL constexpr std::reverse_iterator<T*> rend(vec<L, T, Q>& v);
72  template<length_t C,length_t R,typename T,qualifier Q>
-
73  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<T*> rend(mat<C, R, T, Q>& m);
+
73  GLM_FUNC_DECL constexpr std::reverse_iterator<T*> rend(mat<C, R, T, Q>& m);
74  template<typename T,qualifier Q>
-
75  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<T*> rend(qua<T, Q>& q);
+
75  GLM_FUNC_DECL constexpr std::reverse_iterator<T*> rend(qua<T, Q>& q);
76  template<length_t L,typename T,qualifier Q>
-
77  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<const T*> rend(const vec<L, T, Q>& v);
+
77  GLM_FUNC_DECL constexpr std::reverse_iterator<const T*> rend(const vec<L, T, Q>& v);
78  template<length_t C,length_t R,typename T,qualifier Q>
-
79  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<const T*> rend(const mat<C, R, T, Q>& m);
+
79  GLM_FUNC_DECL constexpr std::reverse_iterator<const T*> rend(const mat<C, R, T, Q>& m);
80  template<typename T,qualifier Q>
-
81  GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator<const T*> rend(const qua<T, Q>& q);
+
81  GLM_FUNC_DECL constexpr std::reverse_iterator<const T*> rend(const qua<T, Q>& q);
82 
83 
85 }//namespace glm
diff --git a/doc/api/a00677_source.html b/doc/api/a00677_source.html index e928dfb51..fd7a13720 100644 --- a/doc/api/a00677_source.html +++ b/doc/api/a00677_source.html @@ -118,7 +118,7 @@ $(function() {
glm::isIdentity
GLM_FUNC_DECL bool isIdentity(matType< C, R, T, Q > const &m, T const &epsilon)
Return whether a matrix is an identity matrix.
glm::isOrthogonal
GLM_FUNC_DECL bool isOrthogonal(matType< C, R, T, Q > const &m, T const &epsilon)
Return whether a matrix is an orthonormalized matrix.
glm::isNormalized
GLM_FUNC_DECL bool isNormalized(mat< 4, 4, T, Q > const &m, T const &epsilon)
Return whether a matrix is a normalized matrix.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
glm::isNull
GLM_FUNC_DECL bool isNull(mat< 4, 4, T, Q > const &m, T const &epsilon)
Return whether a matrix is a null matrix.
diff --git a/doc/api/a00704_source.html b/doc/api/a00704_source.html index abe2c0d5f..9fa0ae9fb 100644 --- a/doc/api/a00704_source.html +++ b/doc/api/a00704_source.html @@ -120,7 +120,7 @@ $(function() {
glm::sortEigenvalues
GLM_FUNC_DISCARD_DECL void sortEigenvalues(vec< 4, T, Q > &eigenvalues, mat< 4, 4, T, Q > &eigenvectors)
Sorts a group of Eigenvalues&Eigenvectors, for largest Eigenvalue to smallest Eigenvalue.
glm::computeCovarianceMatrix
GLM_FUNC_DECL mat< D, D, T, Q > computeCovarianceMatrix(I const &b, I const &e, vec< D, T, Q > const &c)
Compute a covariance matrix form a pair of iterators b (begin) and e (end) of a container with absolu...
-
glm::e
GLM_FUNC_DECL GLM_CONSTEXPR genType e()
Return e constant.
+
glm::e
GLM_FUNC_DECL constexpr genType e()
Return e constant.
glm::findEigenvaluesSymReal
GLM_FUNC_DECL unsigned int findEigenvaluesSymReal(mat< D, D, T, Q > const &covarMat, vec< D, T, Q > &outEigenvalues, mat< D, D, T, Q > &outEigenvectors)
Assuming the provided covariance matrix covarMat is symmetric and real-valued, this function find the...
diff --git a/doc/api/a00740_source.html b/doc/api/a00740_source.html index fbf09be38..333e7f5b1 100644 --- a/doc/api/a00740_source.html +++ b/doc/api/a00740_source.html @@ -97,19 +97,19 @@ $(function() {
32  template<std::size_t I,glm::length_t L,typename T,glm::qualifier Q>
33  struct tuple_element<I, glm::vec<L,T,Q>>
34  {
-
35  GLM_STATIC_ASSERT(I < L,"Index out of bounds");
+
35  static_assert(I < L,"Index out of bounds");
36  typedef T type;
37  };
38  template<std::size_t I, glm::length_t C, glm::length_t R, typename T, glm::qualifier Q>
39  struct tuple_element<I, glm::mat<C,R, T, Q>>
40  {
-
41  GLM_STATIC_ASSERT(I < C, "Index out of bounds");
+
41  static_assert(I < C, "Index out of bounds");
42  typedef glm::vec<R,T,Q> type;
43  };
44  template<std::size_t I, typename T, glm::qualifier Q>
45  struct tuple_element<I, glm::qua<T, Q>>
46  {
-
47  GLM_STATIC_ASSERT(I < 4, "Index out of bounds");
+
47  static_assert(I < 4, "Index out of bounds");
48  typedef T type;
49  };
50 
@@ -127,27 +127,27 @@ $(function() {
62 {
65 
66  template<length_t I, length_t L, typename T, qualifier Q>
-
67  GLM_FUNC_DECL GLM_CONSTEXPR T& get(vec<L, T, Q>& v);
+
67  GLM_FUNC_DECL constexpr T& get(vec<L, T, Q>& v);
68  template<length_t I, length_t L, typename T, qualifier Q>
-
69  GLM_FUNC_DECL GLM_CONSTEXPR T const& get(vec<L, T, Q> const& v);
+
69  GLM_FUNC_DECL constexpr T const& get(vec<L, T, Q> const& v);
70 
71  template<length_t I, length_t C, length_t R, typename T, qualifier Q>
-
72  GLM_FUNC_DECL GLM_CONSTEXPR vec<R, T, Q>& get(mat<C, R, T, Q>& m);
+
72  GLM_FUNC_DECL constexpr vec<R, T, Q>& get(mat<C, R, T, Q>& m);
73  template<length_t I, length_t C, length_t R, typename T, qualifier Q>
-
74  GLM_FUNC_DECL GLM_CONSTEXPR vec<R, T, Q> const& get(mat<C, R, T, Q> const& m);
+
74  GLM_FUNC_DECL constexpr vec<R, T, Q> const& get(mat<C, R, T, Q> const& m);
75 
76  template<length_t I, typename T, qualifier Q>
-
77  GLM_FUNC_DECL GLM_CONSTEXPR T& get(qua<T, Q>& q);
+
77  GLM_FUNC_DECL constexpr T& get(qua<T, Q>& q);
78  template<length_t I, typename T, qualifier Q>
-
79  GLM_FUNC_DECL GLM_CONSTEXPR T const& get(qua<T, Q> const& q);
+
79  GLM_FUNC_DECL constexpr T const& get(qua<T, Q> const& q);
80 
81 #if GLM_HAS_RVALUE_REFERENCES
82  template<length_t I, length_t L,typename T, qualifier Q>
-
83  GLM_FUNC_DECL GLM_CONSTEXPR T get(vec<L,T, Q> const&& v);
+
83  GLM_FUNC_DECL constexpr T get(vec<L,T, Q> const&& v);
84  template<length_t I,length_t C,length_t R, typename T, qualifier Q>
-
85  GLM_FUNC_DECL GLM_CONSTEXPR vec<R,T,Q> get(mat<C,R,T, Q> const&& m);
+
85  GLM_FUNC_DECL constexpr vec<R,T,Q> get(mat<C,R,T, Q> const&& m);
86  template<length_t I, typename T, qualifier Q>
-
87  GLM_FUNC_DECL GLM_CONSTEXPR T get(qua<T, Q> const&& q);
+
87  GLM_FUNC_DECL constexpr T get(qua<T, Q> const&& q);
88 #endif
89 }//namespace glm
91 
diff --git a/doc/api/a00761_source.html b/doc/api/a00761_source.html index ece23c669..5864f3b9b 100644 --- a/doc/api/a00761_source.html +++ b/doc/api/a00761_source.html @@ -114,7 +114,7 @@ $(function() {
glm::areOrthogonal
GLM_FUNC_DECL bool areOrthogonal(vec< L, T, Q > const &v0, vec< L, T, Q > const &v1, T const &epsilon)
Check whether two vectors are orthogonals.
glm::areCollinear
GLM_FUNC_DECL bool areCollinear(vec< L, T, Q > const &v0, vec< L, T, Q > const &v1, T const &epsilon)
Check whether two vectors are collinears.
glm::isCompNull
GLM_FUNC_DECL vec< L, bool, Q > isCompNull(vec< L, T, Q > const &v, T const &epsilon)
Check whether a each component of a vector is null.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
glm::isNormalized
GLM_FUNC_DECL bool isNormalized(vec< L, T, Q > const &v, T const &epsilon)
Check whether a vector is normalized.
diff --git a/doc/api/a00797.html b/doc/api/a00797.html index bd6b732da..759fbc6a5 100644 --- a/doc/api/a00797.html +++ b/doc/api/a00797.html @@ -117,11 +117,11 @@ Functions  Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > degrees (vec< L, T, Q > const &radians) +GLM_FUNC_DECL constexpr vec< L, T, Q > degrees (vec< L, T, Q > const &radians)  Converts radians to degrees and returns the result. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > radians (vec< L, T, Q > const &degrees) +GLM_FUNC_DECL constexpr vec< L, T, Q > radians (vec< L, T, Q > const &degrees)  Converts degrees to radians and returns the result. More...
  template<length_t L, typename T , qualifier Q> diff --git a/doc/api/a00797_source.html b/doc/api/a00797_source.html index 5b10936b7..2ef87f961 100644 --- a/doc/api/a00797_source.html +++ b/doc/api/a00797_source.html @@ -80,10 +80,10 @@ $(function() {
25 {
28 
37  template<length_t L, typename T, qualifier Q>
-
38  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> radians(vec<L, T, Q> const& degrees);
+
38  GLM_FUNC_DECL constexpr vec<L, T, Q> radians(vec<L, T, Q> const& degrees);
39 
48  template<length_t L, typename T, qualifier Q>
-
49  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> degrees(vec<L, T, Q> const& radians);
+
49  GLM_FUNC_DECL constexpr vec<L, T, Q> degrees(vec<L, T, Q> const& radians);
50 
60  template<length_t L, typename T, qualifier Q>
61  GLM_FUNC_DECL vec<L, T, Q> sin(vec<L, T, Q> const& angle);
@@ -131,7 +131,7 @@ $(function() {
glm::sinh
GLM_FUNC_DECL vec< L, T, Q > sinh(vec< L, T, Q > const &angle)
Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2.
glm::cosh
GLM_FUNC_DECL vec< L, T, Q > cosh(vec< L, T, Q > const &angle)
Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2.
glm::cos
GLM_FUNC_DECL vec< L, T, Q > cos(vec< L, T, Q > const &angle)
The standard trigonometric cosine function.
-
glm::radians
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > radians(vec< L, T, Q > const &degrees)
Converts degrees to radians and returns the result.
+
glm::radians
GLM_FUNC_DECL constexpr vec< L, T, Q > radians(vec< L, T, Q > const &degrees)
Converts degrees to radians and returns the result.
glm::acosh
GLM_FUNC_DECL vec< L, T, Q > acosh(vec< L, T, Q > const &x)
Arc hyperbolic cosine; returns the non-negative inverse of cosh.
glm::atan
GLM_FUNC_DECL vec< L, T, Q > atan(vec< L, T, Q > const &y_over_x)
Arc tangent.
glm::angle
GLM_FUNC_DECL T angle(qua< T, Q > const &x)
Returns the quaternion rotation angle.
@@ -139,7 +139,7 @@ $(function() {
glm::tanh
GLM_FUNC_DECL vec< L, T, Q > tanh(vec< L, T, Q > const &angle)
Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
glm::sin
GLM_FUNC_DECL vec< L, T, Q > sin(vec< L, T, Q > const &angle)
The standard trigonometric sine function.
glm::atanh
GLM_FUNC_DECL vec< L, T, Q > atanh(vec< L, T, Q > const &x)
Arc hyperbolic tangent; returns the inverse of tanh.
-
glm::degrees
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > degrees(vec< L, T, Q > const &radians)
Converts radians to degrees and returns the result.
+
glm::degrees
GLM_FUNC_DECL constexpr vec< L, T, Q > degrees(vec< L, T, Q > const &radians)
Converts radians to degrees and returns the result.
glm::asin
GLM_FUNC_DECL vec< L, T, Q > asin(vec< L, T, Q > const &x)
Arc sine.
glm::acos
GLM_FUNC_DECL vec< L, T, Q > acos(vec< L, T, Q > const &x)
Arc cosine.
glm::tan
GLM_FUNC_DECL vec< L, T, Q > tan(vec< L, T, Q > const &angle)
The standard trigonometric tangent function.
diff --git a/doc/api/a00812.html b/doc/api/a00812.html index 6bf157258..5f81d84e5 100644 --- a/doc/api/a00812.html +++ b/doc/api/a00812.html @@ -72,11 +72,11 @@ $(function() {

Functions

template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType abs (genType x) +GLM_FUNC_DECL constexpr genType abs (genType x)  Returns x if x >= 0; otherwise, it returns -x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > abs (vec< L, T, Q > const &x) +GLM_FUNC_DECL constexpr vec< L, T, Q > abs (vec< L, T, Q > const &x)  Returns x if x >= 0; otherwise, it returns -x. More...
  template<length_t L, typename T , qualifier Q> @@ -84,15 +84,15 @@ Functions  Returns a value equal to the nearest integer that is greater than or equal to x. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType clamp (genType x, genType minVal, genType maxVal) +GLM_FUNC_DECL constexpr genType clamp (genType x, genType minVal, genType maxVal)  Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal and maxVal. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > clamp (vec< L, T, Q > const &x, T minVal, T maxVal) +GLM_FUNC_DECL constexpr vec< L, T, Q > clamp (vec< L, T, Q > const &x, T minVal, T maxVal)  Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal and maxVal. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > clamp (vec< L, T, Q > const &x, vec< L, T, Q > const &minVal, vec< L, T, Q > const &maxVal) +GLM_FUNC_DECL constexpr vec< L, T, Q > clamp (vec< L, T, Q > const &x, vec< L, T, Q > const &minVal, vec< L, T, Q > const &maxVal)  Returns min(max(x, minVal), maxVal) for each component in x using the floating-point values minVal and maxVal. More...
  GLM_FUNC_DECL int floatBitsToInt (float v) @@ -149,31 +149,31 @@ Functions  Builds a floating-point number from x and the corresponding integral exponent of two in exp, returning: significand * exp(2, exponent) More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType max (genType x, genType y) +GLM_FUNC_DECL constexpr genType max (genType x, genType y)  Returns y if x < y; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, T y) +GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, T y)  Returns y if x < y; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns y if x < y; otherwise, it returns x. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR genType min (genType x, genType y) +GLM_FUNC_DECL constexpr genType min (genType x, genType y)  Returns y if y < x; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &x, T y) +GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &x, T y)  Returns y if y < x; otherwise, it returns x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &x, vec< L, T, Q > const &y) +GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &x, vec< L, T, Q > const &y)  Returns y if y < x; otherwise, it returns x. More...
  template<typename genTypeT , typename genTypeU > -GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix (genTypeT x, genTypeT y, genTypeU a) +GLM_FUNC_DECL constexpr genTypeT mix (genTypeT x, genTypeT y, genTypeU a)  If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. More...
  template<length_t L, typename T , qualifier Q> @@ -193,7 +193,7 @@ Functions  Returns a value equal to the nearest integer to x. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > sign (vec< L, T, Q > const &x) +GLM_FUNC_DECL constexpr vec< L, T, Q > sign (vec< L, T, Q > const &x)  Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. More...
  template<typename genType > @@ -236,7 +236,7 @@ Functions
- + @@ -265,7 +265,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::abs GLM_FUNC_DECL constexpr genType glm::abs ( genType  x)
- + @@ -327,7 +327,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::abs GLM_FUNC_DECL constexpr vec<L, T, Q> glm::abs ( vec< L, T, Q > const &  x)
- + @@ -374,7 +374,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::clamp GLM_FUNC_DECL constexpr genType glm::clamp ( genType  x,
- + @@ -421,7 +421,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::clamp GLM_FUNC_DECL constexpr vec<L, T, Q> glm::clamp ( vec< L, T, Q > const &  x,
- + @@ -914,7 +914,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::clamp GLM_FUNC_DECL constexpr vec<L, T, Q> glm::clamp ( vec< L, T, Q > const &  x,
- + @@ -953,7 +953,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::max GLM_FUNC_DECL constexpr genType glm::max ( genType  x,
- + @@ -994,7 +994,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::max GLM_FUNC_DECL constexpr vec<L, T, Q> glm::max ( vec< L, T, Q > const &  x,
- + @@ -1035,7 +1035,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::max GLM_FUNC_DECL constexpr vec<L, T, Q> glm::max ( vec< L, T, Q > const &  x,
- + @@ -1074,7 +1074,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::min GLM_FUNC_DECL constexpr genType glm::min ( genType  x,
- + @@ -1115,7 +1115,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::min GLM_FUNC_DECL constexpr vec<L, T, Q> glm::min ( vec< L, T, Q > const &  x,
- + @@ -1156,7 +1156,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::min GLM_FUNC_DECL constexpr vec<L, T, Q> glm::min ( vec< L, T, Q > const &  x,
- + @@ -1375,7 +1375,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genTypeT glm::mix GLM_FUNC_DECL constexpr genTypeT glm::mix ( genTypeT  x,
- + @@ -1647,8 +1647,8 @@ Functions -
glm::e
GLM_FUNC_DECL GLM_CONSTEXPR genType e()
Return e constant.
-
glm::mix
GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
+
glm::e
GLM_FUNC_DECL constexpr genType e()
Return e constant.
+
glm::mix
GLM_FUNC_DECL constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a)
If genTypeU is a floating scalar or vector: Returns x * (1.0 - a) + y * a, i.e., the linear blend of ...
glm::vec4
vec< 4, float, defaultp > vec4
4 components vector of single-precision floating-point numbers.
Definition: vector_float4.hpp:15
glm::dvec3
vec< 3, double, defaultp > dvec3
3 components vector of double-precision floating-point numbers.
Definition: vector_double3.hpp:15
diff --git a/doc/api/a00836.html b/doc/api/a00836.html index e9976c9b2..2b6350542 100644 --- a/doc/api/a00836.html +++ b/doc/api/a00836.html @@ -72,43 +72,43 @@ $(function() { - + - + - + - + - + - + - + - + - + - +
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::sign GLM_FUNC_DECL constexpr vec<L, T, Q> glm::sign ( vec< L, T, Q > const &  x)

Functions

template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y)
 Perform a component-wise equal-to comparison of two matrices. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs)
GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon)
GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon)
 Returns the component-wise comparison of |x - y| < epsilon. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon)
GLM_FUNC_DECL constexpr vec< C, bool, Q > equal (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon)
 Returns the component-wise comparison of |x - y| < epsilon. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y)
 Perform a component-wise not-equal-to comparison of two matrices. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs)
GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, int ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon)
GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, T epsilon)
 Returns the component-wise comparison of |x - y| < epsilon. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, int, Q > const &ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t C, length_t R, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon)
GLM_FUNC_DECL constexpr vec< C, bool, Q > notEqual (mat< C, R, T, Q > const &x, mat< C, R, T, Q > const &y, vec< C, T, Q > const &epsilon)
 Returns the component-wise comparison of |x - y| >= epsilon. More...
 
@@ -128,7 +128,7 @@ Functions
- + @@ -168,7 +168,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::equal ( mat< C, R, T, Q > const &  x,
- + @@ -214,7 +214,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::equal ( mat< C, R, T, Q > const &  x,
- + @@ -260,7 +260,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::equal ( mat< C, R, T, Q > const &  x,
- + @@ -306,7 +306,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::equal ( mat< C, R, T, Q > const &  x,
- + @@ -352,7 +352,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::equal ( mat< C, R, T, Q > const &  x,
- + @@ -392,7 +392,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::notEqual ( mat< C, R, T, Q > const &  x,
- + @@ -438,7 +438,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::notEqual ( mat< C, R, T, Q > const &  x,
- + @@ -484,7 +484,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::notEqual ( mat< C, R, T, Q > const &  x,
- + @@ -530,7 +530,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::notEqual ( mat< C, R, T, Q > const &  x,
- + diff --git a/doc/api/a00837.html b/doc/api/a00837.html index bb24d8a51..946acc3de 100644 --- a/doc/api/a00837.html +++ b/doc/api/a00837.html @@ -73,7 +73,7 @@ $(function() { Functions - + @@ -101,7 +101,7 @@ template<typename genType > - +
GLM_FUNC_DECL GLM_CONSTEXPR vec<C, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<C, bool, Q> glm::notEqual ( mat< C, R, T, Q > const &  x,
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType identity ()
GLM_FUNC_DECL constexpr genType identity ()
 Builds an identity matrix.
 
template<typename T , qualifier Q>
 Builds a scale 4 * 4 matrix created from point referent 3 shearers. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR mat< 4, 4, T, Q > translate (mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
GLM_FUNC_DECL constexpr mat< 4, 4, T, Q > translate (mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
 Builds a translation 4 * 4 matrix created from a vector of 3 components. More...
 
@@ -460,7 +460,7 @@ no resource...
- + @@ -514,7 +514,7 @@ no resource...
glm::mat4
mat< 4, 4, float, defaultp > mat4
4 columns of 4 components matrix of single-precision floating-point numbers.
Definition: matrix_float4x4.hpp:20
matrix_transform.hpp
GLM_GTC_matrix_transform
glm::vec3
vec< 3, float, defaultp > vec3
3 components vector of single-precision floating-point numbers.
Definition: vector_float3.hpp:15
-
glm::translate
GLM_FUNC_DECL GLM_CONSTEXPR mat< 4, 4, T, Q > translate(mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
Builds a translation 4 * 4 matrix created from a vector of 3 components.
+
glm::translate
GLM_FUNC_DECL constexpr mat< 4, 4, T, Q > translate(mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
Builds a translation 4 * 4 matrix created from a vector of 3 components.
Generated by   diff --git a/doc/api/a00856.html b/doc/api/a00856.html index 4cbc56966..dddefc16b 100644 --- a/doc/api/a00856.html +++ b/doc/api/a00856.html @@ -72,11 +72,11 @@ $(function() {
- + - + @@ -88,7 +88,7 @@ Functions - + @@ -132,7 +132,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> glm::translate GLM_FUNC_DECL constexpr mat<4, 4, T, Q> glm::translate ( mat< 4, 4, T, Q > const &  m,

Functions

template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > conjugate (qua< T, Q > const &q)
GLM_FUNC_DECL constexpr qua< T, Q > conjugate (qua< T, Q > const &q)
 Returns the q conjugate. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > inverse (qua< T, Q > const &q)
GLM_FUNC_DECL constexpr qua< T, Q > inverse (qua< T, Q > const &q)
 Returns the q inverse. More...
 
template<typename T , qualifier Q>
 Returns true if x holds a NaN (not a number) representation in the underlying implementation's set of floating point representations. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > lerp (qua< T, Q > const &x, qua< T, Q > const &y, T a)
GLM_FUNC_DECL constexpr qua< T, Q > lerp (qua< T, Q > const &x, qua< T, Q > const &y, T a)
 Linear interpolation of two quaternions. More...
 
template<typename T , qualifier Q>
- + @@ -159,7 +159,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> glm::conjugate GLM_FUNC_DECL constexpr qua<T, Q> glm::conjugate ( qua< T, Q > const &  q)
- + @@ -243,7 +243,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> glm::inverse GLM_FUNC_DECL constexpr qua<T, Q> glm::inverse ( qua< T, Q > const &  q)
- + diff --git a/doc/api/a00862.html b/doc/api/a00862.html index babf8dcc5..33b9d829b 100644 --- a/doc/api/a00862.html +++ b/doc/api/a00862.html @@ -72,11 +72,11 @@ $(function() { - + - + @@ -84,7 +84,7 @@ Functions - +
GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> glm::lerp GLM_FUNC_DECL constexpr qua<T, Q> glm::lerp ( qua< T, Q > const &  x,

Functions

template<typename T , qualifier Q>
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua< T, Q > cross (qua< T, Q > const &q1, qua< T, Q > const &q2)
GLM_FUNC_QUALIFIER constexpr qua< T, Q > cross (qua< T, Q > const &q1, qua< T, Q > const &q2)
 Compute a cross product. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR T dot (qua< T, Q > const &x, qua< T, Q > const &y)
GLM_FUNC_DECL constexpr T dot (qua< T, Q > const &x, qua< T, Q > const &y)
 Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... More...
 
template<typename T , qualifier Q>
 Returns the norm of a quaternions. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > normalize (qua< T, Q > const &q)
GLM_FUNC_DECL constexpr qua< T, Q > normalize (qua< T, Q > const &q)
 Returns the normalized quaternion. More...
 
@@ -104,7 +104,7 @@ Functions
- + @@ -142,7 +142,7 @@ Functions
GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua<T, Q> glm::cross GLM_FUNC_QUALIFIER constexpr qua<T, Q> glm::cross ( qua< T, Q > const &  q1,
- + @@ -208,7 +208,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR T glm::dot GLM_FUNC_DECL constexpr T glm::dot ( qua< T, Q > const &  x,
- + diff --git a/doc/api/a00867.html b/doc/api/a00867.html index ca3ba840d..f354b685f 100644 --- a/doc/api/a00867.html +++ b/doc/api/a00867.html @@ -73,17 +73,17 @@ $(function() { Functions - + - + - +
GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> glm::normalize GLM_FUNC_DECL constexpr qua<T, Q> glm::normalize ( qua< T, Q > const &  q)
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType cos_one_over_two ()
GLM_FUNC_DECL constexpr genType cos_one_over_two ()
 Return the value of cos(1 / 2) for floating point types.
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon ()
GLM_FUNC_DECL constexpr genType epsilon ()
 Return the epsilon constant for floating point types.
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType pi ()
GLM_FUNC_DECL constexpr genType pi ()
 Return the pi constant for floating point types.
 
diff --git a/doc/api/a00872.html b/doc/api/a00872.html index 8e4efcb00..8ee060b48 100644 --- a/doc/api/a00872.html +++ b/doc/api/a00872.html @@ -72,19 +72,19 @@ $(function() {

Functions

template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool equal (genType const &x, genType const &y, genType const &epsilon) +GLM_FUNC_DECL constexpr bool equal (genType const &x, genType const &y, genType const &epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool equal (genType const &x, genType const &y, int ULPs) +GLM_FUNC_DECL constexpr bool equal (genType const &x, genType const &y, int ULPs)  Returns the component-wise comparison between two scalars in term of ULPs. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual (genType const &x, genType const &y, genType const &epsilon) +GLM_FUNC_DECL constexpr bool notEqual (genType const &x, genType const &y, genType const &epsilon)  Returns the component-wise comparison of |x - y| >= epsilon. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual (genType const &x, genType const &y, int ULPs) +GLM_FUNC_DECL constexpr bool notEqual (genType const &x, genType const &y, int ULPs)  Returns the component-wise comparison between two scalars in term of ULPs. More...
  @@ -104,7 +104,7 @@ Functions
- + @@ -147,7 +147,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR bool glm::equal GLM_FUNC_DECL constexpr bool glm::equal ( genType const &  x,
- + @@ -198,7 +198,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR bool glm::equal GLM_FUNC_DECL constexpr bool glm::equal ( genType const &  x,
- + @@ -241,7 +241,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR bool glm::notEqual GLM_FUNC_DECL constexpr bool glm::notEqual ( genType const &  x,
- + diff --git a/doc/api/a00877.html b/doc/api/a00877.html index e57874b32..60440e57a 100644 --- a/doc/api/a00877.html +++ b/doc/api/a00877.html @@ -120,19 +120,19 @@ Functions - + - + - + - + @@ -679,7 +679,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR bool glm::notEqual GLM_FUNC_DECL constexpr bool glm::notEqual ( genType const &  x,
 Returns a value equal to the nearest integer to x. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z)
GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z)
 Return the maximum component-wise values of 3 inputs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z, vec< L, T, Q > const &w)
GLM_FUNC_DECL constexpr vec< L, T, Q > max (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &z, vec< L, T, Q > const &w)
 Return the maximum component-wise values of 4 inputs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c)
GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c)
 Return the minimum component-wise values of 3 inputs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d)
GLM_FUNC_DECL constexpr vec< L, T, Q > min (vec< L, T, Q > const &a, vec< L, T, Q > const &b, vec< L, T, Q > const &c, vec< L, T, Q > const &d)
 Return the minimum component-wise values of 4 inputs. More...
 
template<length_t L, typename T , qualifier Q>
- + @@ -723,7 +723,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::max GLM_FUNC_DECL constexpr vec<L, T, Q> glm::max ( vec< L, T, Q > const &  x,
- + @@ -773,7 +773,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::max GLM_FUNC_DECL constexpr vec<L, T, Q> glm::max ( vec< L, T, Q > const &  x,
- + @@ -817,7 +817,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::min GLM_FUNC_DECL constexpr vec<L, T, Q> glm::min ( vec< L, T, Q > const &  a,
- + diff --git a/doc/api/a00890.html b/doc/api/a00890.html index 36255e920..4ff70a8fe 100644 --- a/doc/api/a00890.html +++ b/doc/api/a00890.html @@ -72,35 +72,35 @@ $(function() { - + - + - + - + - + - + - + - +
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::min GLM_FUNC_DECL constexpr vec<L, T, Q> glm::min ( vec< L, T, Q > const &  a,

Functions

template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs)
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon)
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon)
 Returns the component-wise comparison of |x - y| < epsilon. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon)
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon)
 Returns the component-wise comparison of |x - y| < epsilon. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs)
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon)
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon)
 Returns the component-wise comparison of |x - y| >= epsilon. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
 Returns the component-wise comparison between two vectors in term of ULPs. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon)
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon)
 Returns the component-wise comparison of |x - y| >= epsilon. More...
 
@@ -120,7 +120,7 @@ Functions
- + @@ -165,7 +165,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::equal ( vec< L, T, Q > const &  x,
- + @@ -210,7 +210,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::equal ( vec< L, T, Q > const &  x,
- + @@ -255,7 +255,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::equal ( vec< L, T, Q > const &  x,
- + @@ -300,7 +300,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::equal ( vec< L, T, Q > const &  x,
- + @@ -345,7 +345,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::notEqual ( vec< L, T, Q > const &  x,
- + @@ -390,7 +390,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::notEqual ( vec< L, T, Q > const &  x,
- + @@ -435,7 +435,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::notEqual ( vec< L, T, Q > const &  x,
- + diff --git a/doc/api/a00897.html b/doc/api/a00897.html index 91191dadf..6452c5067 100644 --- a/doc/api/a00897.html +++ b/doc/api/a00897.html @@ -72,7 +72,7 @@ $(function() { - + @@ -80,7 +80,7 @@ Functions - + @@ -115,7 +115,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::notEqual ( vec< L, T, Q > const &  x,

Functions

template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross (vec< 3, T, Q > const &x, vec< 3, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< 3, T, Q > cross (vec< 3, T, Q > const &x, vec< 3, T, Q > const &y)
 Returns the cross product of x and y. More...
 
template<length_t L, typename T , qualifier Q>
 Returns the distance between p0 and p1, i.e., length(p0 - p1). More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR T dot (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr T dot (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the dot product of x and y, i.e., result = x * y. More...
 
template<length_t L, typename T , qualifier Q>
- + @@ -194,7 +194,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> glm::cross GLM_FUNC_DECL constexpr vec<3, T, Q> glm::cross ( vec< 3, T, Q > const &  x,
- + diff --git a/doc/api/a00908.html b/doc/api/a00908.html index b91fadf1b..69f1545c6 100644 --- a/doc/api/a00908.html +++ b/doc/api/a00908.html @@ -72,115 +72,115 @@ $(function() { - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
GLM_FUNC_DECL GLM_CONSTEXPR T glm::dot GLM_FUNC_DECL constexpr T glm::dot ( vec< L, T, Q > const &  x,

Functions

template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType e ()
GLM_FUNC_DECL constexpr genType e ()
 Return e constant. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType euler ()
GLM_FUNC_DECL constexpr genType euler ()
 Return Euler's constant. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType four_over_pi ()
GLM_FUNC_DECL constexpr genType four_over_pi ()
 Return 4 / pi. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType golden_ratio ()
GLM_FUNC_DECL constexpr genType golden_ratio ()
 Return the golden ratio constant. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType half_pi ()
GLM_FUNC_DECL constexpr genType half_pi ()
 Return pi / 2. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ln_two ()
GLM_FUNC_DECL constexpr genType ln_ln_two ()
 Return ln(ln(2)). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ten ()
GLM_FUNC_DECL constexpr genType ln_ten ()
 Return ln(10). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType ln_two ()
GLM_FUNC_DECL constexpr genType ln_two ()
 Return ln(2). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType one ()
GLM_FUNC_DECL constexpr genType one ()
 Return 1. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_pi ()
GLM_FUNC_DECL constexpr genType one_over_pi ()
 Return 1 / pi. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_root_two ()
GLM_FUNC_DECL constexpr genType one_over_root_two ()
 Return 1 / sqrt(2). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_two_pi ()
GLM_FUNC_DECL constexpr genType one_over_two_pi ()
 Return 1 / (pi * 2). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType quarter_pi ()
GLM_FUNC_DECL constexpr genType quarter_pi ()
 Return pi / 4. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_five ()
GLM_FUNC_DECL constexpr genType root_five ()
 Return sqrt(5). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_half_pi ()
GLM_FUNC_DECL constexpr genType root_half_pi ()
 Return sqrt(pi / 2). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_ln_four ()
GLM_FUNC_DECL constexpr genType root_ln_four ()
 Return sqrt(ln(4)). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_pi ()
GLM_FUNC_DECL constexpr genType root_pi ()
 Return square root of pi. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_three ()
GLM_FUNC_DECL constexpr genType root_three ()
 Return sqrt(3). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_two ()
GLM_FUNC_DECL constexpr genType root_two ()
 Return sqrt(2). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType root_two_pi ()
GLM_FUNC_DECL constexpr genType root_two_pi ()
 Return sqrt(2 * pi). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType tau ()
GLM_FUNC_DECL constexpr genType tau ()
 Return unit-circle circumference, or pi * 2. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType third ()
GLM_FUNC_DECL constexpr genType third ()
 Return 1 / 3. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType three_over_two_pi ()
GLM_FUNC_DECL constexpr genType three_over_two_pi ()
 Return pi / 2 * 3. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_pi ()
GLM_FUNC_DECL constexpr genType two_over_pi ()
 Return 2 / pi. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_root_pi ()
GLM_FUNC_DECL constexpr genType two_over_root_pi ()
 Return 2 / sqrt(pi). More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType two_pi ()
GLM_FUNC_DECL constexpr genType two_pi ()
 Return pi * 2. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType two_thirds ()
GLM_FUNC_DECL constexpr genType two_thirds ()
 Return 2 / 3. More...
 
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType zero ()
GLM_FUNC_DECL constexpr genType zero ()
 Return 0. More...
 
@@ -195,7 +195,7 @@ Functions
- + @@ -215,7 +215,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::e GLM_FUNC_DECL constexpr genType glm::e ( )
- + @@ -235,7 +235,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::euler GLM_FUNC_DECL constexpr genType glm::euler ( )
- + @@ -255,7 +255,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::four_over_pi GLM_FUNC_DECL constexpr genType glm::four_over_pi ( )
- + @@ -275,7 +275,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::golden_ratio GLM_FUNC_DECL constexpr genType glm::golden_ratio ( )
- + @@ -295,7 +295,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::half_pi GLM_FUNC_DECL constexpr genType glm::half_pi ( )
- + @@ -315,7 +315,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::ln_ln_two GLM_FUNC_DECL constexpr genType glm::ln_ln_two ( )
- + @@ -335,7 +335,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::ln_ten GLM_FUNC_DECL constexpr genType glm::ln_ten ( )
- + @@ -355,7 +355,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::ln_two GLM_FUNC_DECL constexpr genType glm::ln_two ( )
- + @@ -375,7 +375,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::one GLM_FUNC_DECL constexpr genType glm::one ( )
- + @@ -395,7 +395,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::one_over_pi GLM_FUNC_DECL constexpr genType glm::one_over_pi ( )
- + @@ -415,7 +415,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::one_over_root_two GLM_FUNC_DECL constexpr genType glm::one_over_root_two ( )
- + @@ -435,7 +435,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::one_over_two_pi GLM_FUNC_DECL constexpr genType glm::one_over_two_pi ( )
- + @@ -455,7 +455,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::quarter_pi GLM_FUNC_DECL constexpr genType glm::quarter_pi ( )
- + @@ -475,7 +475,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_five GLM_FUNC_DECL constexpr genType glm::root_five ( )
- + @@ -495,7 +495,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_half_pi GLM_FUNC_DECL constexpr genType glm::root_half_pi ( )
- + @@ -515,7 +515,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_ln_four GLM_FUNC_DECL constexpr genType glm::root_ln_four ( )
- + @@ -535,7 +535,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_pi GLM_FUNC_DECL constexpr genType glm::root_pi ( )
- + @@ -555,7 +555,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_three GLM_FUNC_DECL constexpr genType glm::root_three ( )
- + @@ -575,7 +575,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_two GLM_FUNC_DECL constexpr genType glm::root_two ( )
- + @@ -595,7 +595,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::root_two_pi GLM_FUNC_DECL constexpr genType glm::root_two_pi ( )
- + @@ -615,7 +615,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::tau GLM_FUNC_DECL constexpr genType glm::tau ( )
- + @@ -635,7 +635,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::third GLM_FUNC_DECL constexpr genType glm::third ( )
- + @@ -655,7 +655,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::three_over_two_pi GLM_FUNC_DECL constexpr genType glm::three_over_two_pi ( )
- + @@ -675,7 +675,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::two_over_pi GLM_FUNC_DECL constexpr genType glm::two_over_pi ( )
- + @@ -695,7 +695,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::two_over_root_pi GLM_FUNC_DECL constexpr genType glm::two_over_root_pi ( )
- + @@ -715,7 +715,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::two_pi GLM_FUNC_DECL constexpr genType glm::two_pi ( )
- + @@ -735,7 +735,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::two_thirds GLM_FUNC_DECL constexpr genType glm::two_thirds ( )
- + diff --git a/doc/api/a00917.html b/doc/api/a00917.html index a1997b95c..6b5410d80 100644 --- a/doc/api/a00917.html +++ b/doc/api/a00917.html @@ -76,19 +76,19 @@ Functions - + - + - + - + @@ -171,7 +171,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR genType glm::zero GLM_FUNC_DECL constexpr genType glm::zero ( )
 Returns euler angles, pitch as x, yaw as y, roll as z. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > greaterThan (qua< T, Q > const &x, qua< T, Q > const &y)
GLM_FUNC_DECL constexpr vec< 4, bool, Q > greaterThan (qua< T, Q > const &x, qua< T, Q > const &y)
 Returns the component-wise comparison of result x > y. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > greaterThanEqual (qua< T, Q > const &x, qua< T, Q > const &y)
GLM_FUNC_DECL constexpr vec< 4, bool, Q > greaterThanEqual (qua< T, Q > const &x, qua< T, Q > const &y)
 Returns the component-wise comparison of result x >= y. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > lessThan (qua< T, Q > const &x, qua< T, Q > const &y)
GLM_FUNC_DECL constexpr vec< 4, bool, Q > lessThan (qua< T, Q > const &x, qua< T, Q > const &y)
 Returns the component-wise comparison result of x < y. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > lessThanEqual (qua< T, Q > const &x, qua< T, Q > const &y)
GLM_FUNC_DECL constexpr vec< 4, bool, Q > lessThanEqual (qua< T, Q > const &x, qua< T, Q > const &y)
 Returns the component-wise comparison of result x <= y. More...
 
template<typename T , qualifier Q>
- + @@ -209,7 +209,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> glm::greaterThan GLM_FUNC_DECL constexpr vec<4, bool, Q> glm::greaterThan ( qua< T, Q > const &  x,
- + @@ -247,7 +247,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> glm::greaterThanEqual GLM_FUNC_DECL constexpr vec<4, bool, Q> glm::greaterThanEqual ( qua< T, Q > const &  x,
- + @@ -285,7 +285,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> glm::lessThan GLM_FUNC_DECL constexpr vec<4, bool, Q> glm::lessThan ( qua< T, Q > const &  x,
- + diff --git a/doc/api/a00940.html b/doc/api/a00940.html index 9b7ad955d..d35c1cb5c 100644 --- a/doc/api/a00940.html +++ b/doc/api/a00940.html @@ -75,7 +75,7 @@ $(function() { - +
GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> glm::lessThanEqual GLM_FUNC_DECL constexpr vec<4, bool, Q> glm::lessThanEqual ( qua< T, Q > const &  x,

Functions

template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR T cross (vec< 2, T, Q > const &v, vec< 2, T, Q > const &u)
GLM_FUNC_DECL constexpr T cross (vec< 2, T, Q > const &v, vec< 2, T, Q > const &u)
 Returns the cross product of x and y. More...
 
@@ -90,7 +90,7 @@ Functions
- + diff --git a/doc/api/a00972.html b/doc/api/a00972.html index f41fd4fd3..dd7ca4cd0 100644 --- a/doc/api/a00972.html +++ b/doc/api/a00972.html @@ -72,11 +72,11 @@ $(function() { - + - + @@ -92,11 +92,11 @@ Functions - + - + @@ -147,7 +147,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR T glm::cross GLM_FUNC_DECL constexpr T glm::cross ( vec< 2, T, Q > const &  v,

Functions

template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross (qua< T, Q > const &q, vec< 3, T, Q > const &v)
GLM_FUNC_DECL constexpr vec< 3, T, Q > cross (qua< T, Q > const &q, vec< 3, T, Q > const &v)
 Compute a cross product between a quaternion and a vector. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross (vec< 3, T, Q > const &v, qua< T, Q > const &q)
GLM_FUNC_DECL constexpr vec< 3, T, Q > cross (vec< 3, T, Q > const &v, qua< T, Q > const &q)
 Compute a cross product between a vector and a quaternion. More...
 
template<typename T , qualifier Q>
 Returns an intermediate control point for squad interpolation. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR T length2 (qua< T, Q > const &q)
GLM_FUNC_DECL constexpr T length2 (qua< T, Q > const &q)
 Returns the squared length of x. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > quat_identity ()
GLM_FUNC_DECL constexpr qua< T, Q > quat_identity ()
 Create an identity quaternion. More...
 
template<typename T , qualifier Q>
- + @@ -178,7 +178,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> glm::cross GLM_FUNC_DECL constexpr vec<3, T, Q> glm::cross ( qua< T, Q > const &  q,
- + @@ -304,7 +304,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> glm::cross GLM_FUNC_DECL constexpr vec<3, T, Q> glm::cross ( vec< 3, T, Q > const &  v,
- + @@ -325,7 +325,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR T glm::length2 GLM_FUNC_DECL constexpr T glm::length2 ( qua< T, Q > const &  q)
- + diff --git a/doc/api/a00995.html b/doc/api/a00995.html index dfffdf9c6..250e970a2 100644 --- a/doc/api/a00995.html +++ b/doc/api/a00995.html @@ -108,11 +108,11 @@ Functions - + - + @@ -443,7 +443,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> glm::quat_identity GLM_FUNC_DECL constexpr qua<T, Q> glm::quat_identity ( )
 Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > degrees (vec< L, T, Q > const &radians)
GLM_FUNC_DECL constexpr vec< L, T, Q > degrees (vec< L, T, Q > const &radians)
 Converts radians to degrees and returns the result. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, T, Q > radians (vec< L, T, Q > const &degrees)
GLM_FUNC_DECL constexpr vec< L, T, Q > radians (vec< L, T, Q > const &degrees)
 Converts degrees to radians and returns the result. More...
 
template<length_t L, typename T , qualifier Q>
- + @@ -474,7 +474,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::degrees GLM_FUNC_DECL constexpr vec<L, T, Q> glm::degrees ( vec< L, T, Q > const &  radians)
- + diff --git a/doc/api/a00996.html b/doc/api/a00996.html index 1c1a8cf88..2c87f247d 100644 --- a/doc/api/a00996.html +++ b/doc/api/a00996.html @@ -72,39 +72,39 @@ $(function() { - + - + - + - + - + - + - + - + - +
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, T, Q> glm::radians GLM_FUNC_DECL constexpr vec<L, T, Q> glm::radians ( vec< L, T, Q > const &  degrees)

Functions

template<length_t L, qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR bool all (vec< L, bool, Q > const &v)
GLM_FUNC_DECL constexpr bool all (vec< L, bool, Q > const &v)
 Returns true if all components of x are true. More...
 
template<length_t L, qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR bool any (vec< L, bool, Q > const &v)
GLM_FUNC_DECL constexpr bool any (vec< L, bool, Q > const &v)
 Returns true if any component of x is true. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the component-wise comparison of result x == y. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > greaterThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< L, bool, Q > greaterThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the component-wise comparison of result x > y. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > greaterThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< L, bool, Q > greaterThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the component-wise comparison of result x >= y. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > lessThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< L, bool, Q > lessThan (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the component-wise comparison result of x < y. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > lessThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< L, bool, Q > lessThanEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the component-wise comparison of result x <= y. More...
 
template<length_t L, qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > not_ (vec< L, bool, Q > const &v)
GLM_FUNC_DECL constexpr vec< L, bool, Q > not_ (vec< L, bool, Q > const &v)
 Returns the component-wise logical complement of x. More...
 
template<length_t L, typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y)
 Returns the component-wise comparison of result x != y. More...
 
@@ -121,7 +121,7 @@ Functions
- + @@ -150,7 +150,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR bool glm::all GLM_FUNC_DECL constexpr bool glm::all ( vec< L, bool, Q > const &  v)
- + @@ -179,7 +179,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR bool glm::any GLM_FUNC_DECL constexpr bool glm::any ( vec< L, bool, Q > const &  v)
- + @@ -219,7 +219,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::equal GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::equal ( vec< L, T, Q > const &  x,
- + @@ -259,7 +259,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::greaterThan GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::greaterThan ( vec< L, T, Q > const &  x,
- + @@ -299,7 +299,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::greaterThanEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::greaterThanEqual ( vec< L, T, Q > const &  x,
- + @@ -339,7 +339,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::lessThan GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::lessThan ( vec< L, T, Q > const &  x,
- + @@ -379,7 +379,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::lessThanEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::lessThanEqual ( vec< L, T, Q > const &  x,
- + @@ -409,7 +409,7 @@ Functions
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::not_ GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::not_ ( vec< L, bool, Q > const &  v)
- + diff --git a/doc/api/a01702.html b/doc/api/a01702.html index 618c24c2b..27303aa2c 100644 --- a/doc/api/a01702.html +++ b/doc/api/a01702.html @@ -82,7 +82,7 @@ $(function() { Functions - + @@ -110,7 +110,7 @@ template<typename genType > - +
GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> glm::notEqual GLM_FUNC_DECL constexpr vec<L, bool, Q> glm::notEqual ( vec< L, T, Q > const &  x,
template<typename genType >
GLM_FUNC_DECL GLM_CONSTEXPR genType identity ()
GLM_FUNC_DECL constexpr genType identity ()
 Builds an identity matrix.
 
template<typename T , qualifier Q>
 Builds a scale 4 * 4 matrix created from point referent 3 shearers. More...
 
template<typename T , qualifier Q>
GLM_FUNC_DECL GLM_CONSTEXPR mat< 4, 4, T, Q > translate (mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
GLM_FUNC_DECL constexpr mat< 4, 4, T, Q > translate (mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
 Builds a translation 4 * 4 matrix created from a vector of 3 components. More...
 
diff --git a/doc/api/a01702_source.html b/doc/api/a01702_source.html index bc1817bd2..e9b62d5d5 100644 --- a/doc/api/a01702_source.html +++ b/doc/api/a01702_source.html @@ -87,10 +87,10 @@ $(function() {
33 {
36 
38  template<typename genType>
-
39  GLM_FUNC_DECL GLM_CONSTEXPR genType identity();
+
39  GLM_FUNC_DECL constexpr genType identity();
40 
63  template<typename T, qualifier Q>
-
64  GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> translate(
+
64  GLM_FUNC_DECL constexpr mat<4, 4, T, Q> translate(
65  mat<4, 4, T, Q> const& m, vec<3, T, Q> const& v);
66 
79  template<typename T, qualifier Q>
@@ -126,9 +126,9 @@ $(function() {
glm::scale
GLM_FUNC_DECL mat< 4, 4, T, Q > scale(mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
Builds a scale 4 * 4 matrix created from 3 scalars.
glm::shear
GLM_FUNC_QUALIFIER mat< 4, 4, T, Q > shear(mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &p, vec< 2, T, Q > const &l_x, vec< 2, T, Q > const &l_y, vec< 2, T, Q > const &l_z)
Builds a scale 4 * 4 matrix created from point referent 3 shearers.
glm::lookAtLH
GLM_FUNC_DECL mat< 4, 4, T, Q > lookAtLH(vec< 3, T, Q > const &eye, vec< 3, T, Q > const &center, vec< 3, T, Q > const &up)
Build a left handed look at view matrix.
-
glm::identity
GLM_FUNC_DECL GLM_CONSTEXPR genType identity()
Builds an identity matrix.
+
glm::identity
GLM_FUNC_DECL constexpr genType identity()
Builds an identity matrix.
glm::angle
GLM_FUNC_DECL T angle(qua< T, Q > const &x)
Returns the quaternion rotation angle.
-
glm::translate
GLM_FUNC_DECL GLM_CONSTEXPR mat< 4, 4, T, Q > translate(mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
Builds a translation 4 * 4 matrix created from a vector of 3 components.
+
glm::translate
GLM_FUNC_DECL constexpr mat< 4, 4, T, Q > translate(mat< 4, 4, T, Q > const &m, vec< 3, T, Q > const &v)
Builds a translation 4 * 4 matrix created from a vector of 3 components.
glm::lookAtRH
GLM_FUNC_DECL mat< 4, 4, T, Q > lookAtRH(vec< 3, T, Q > const &eye, vec< 3, T, Q > const &center, vec< 3, T, Q > const &up)
Build a right handed look at view matrix.
glm::axis
GLM_FUNC_DECL vec< 3, T, Q > axis(qua< T, Q > const &x)
Returns the q rotation axis.
diff --git a/doc/api/a01711.html b/doc/api/a01711.html index b98b3c6ef..910666a92 100644 --- a/doc/api/a01711.html +++ b/doc/api/a01711.html @@ -85,19 +85,19 @@ Functions  Returns euler angles, pitch as x, yaw as y, roll as z. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > greaterThan (qua< T, Q > const &x, qua< T, Q > const &y) +GLM_FUNC_DECL constexpr vec< 4, bool, Q > greaterThan (qua< T, Q > const &x, qua< T, Q > const &y)  Returns the component-wise comparison of result x > y. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > greaterThanEqual (qua< T, Q > const &x, qua< T, Q > const &y) +GLM_FUNC_DECL constexpr vec< 4, bool, Q > greaterThanEqual (qua< T, Q > const &x, qua< T, Q > const &y)  Returns the component-wise comparison of result x >= y. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > lessThan (qua< T, Q > const &x, qua< T, Q > const &y) +GLM_FUNC_DECL constexpr vec< 4, bool, Q > lessThan (qua< T, Q > const &x, qua< T, Q > const &y)  Returns the component-wise comparison result of x < y. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > lessThanEqual (qua< T, Q > const &x, qua< T, Q > const &y) +GLM_FUNC_DECL constexpr vec< 4, bool, Q > lessThanEqual (qua< T, Q > const &x, qua< T, Q > const &y)  Returns the component-wise comparison of result x <= y. More...
  template<typename T , qualifier Q> diff --git a/doc/api/a01711_source.html b/doc/api/a01711_source.html index d490638dc..748ea542e 100644 --- a/doc/api/a01711_source.html +++ b/doc/api/a01711_source.html @@ -123,16 +123,16 @@ $(function() {
106  GLM_FUNC_DECL qua<T, Q> quat_cast(mat<4, 4, T, Q> const& x);
107 
114  template<typename T, qualifier Q>
-
115  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> lessThan(qua<T, Q> const& x, qua<T, Q> const& y);
+
115  GLM_FUNC_DECL constexpr vec<4, bool, Q> lessThan(qua<T, Q> const& x, qua<T, Q> const& y);
116 
123  template<typename T, qualifier Q>
-
124  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> lessThanEqual(qua<T, Q> const& x, qua<T, Q> const& y);
+
124  GLM_FUNC_DECL constexpr vec<4, bool, Q> lessThanEqual(qua<T, Q> const& x, qua<T, Q> const& y);
125 
132  template<typename T, qualifier Q>
-
133  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> greaterThan(qua<T, Q> const& x, qua<T, Q> const& y);
+
133  GLM_FUNC_DECL constexpr vec<4, bool, Q> greaterThan(qua<T, Q> const& x, qua<T, Q> const& y);
134 
141  template<typename T, qualifier Q>
-
142  GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> greaterThanEqual(qua<T, Q> const& x, qua<T, Q> const& y);
+
142  GLM_FUNC_DECL constexpr vec<4, bool, Q> greaterThanEqual(qua<T, Q> const& x, qua<T, Q> const& y);
143 
148  template<typename T, qualifier Q>
149  GLM_FUNC_DECL qua<T, Q> quatLookAt(
@@ -154,15 +154,15 @@ $(function() {
glm::roll
GLM_FUNC_DECL T roll(qua< T, Q > const &x)
Returns roll value of euler angles expressed in radians.
glm::mat3_cast
GLM_FUNC_DECL mat< 3, 3, T, Q > mat3_cast(qua< T, Q > const &x)
Converts a quaternion to a 3 * 3 matrix.
-
glm::greaterThanEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > greaterThanEqual(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison of result x >= y.
-
glm::lessThan
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > lessThan(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison result of x < y.
+
glm::greaterThanEqual
GLM_FUNC_DECL constexpr vec< 4, bool, Q > greaterThanEqual(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison of result x >= y.
+
glm::lessThan
GLM_FUNC_DECL constexpr vec< 4, bool, Q > lessThan(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison result of x < y.
glm::quat_cast
GLM_FUNC_DECL qua< T, Q > quat_cast(mat< 4, 4, T, Q > const &x)
Converts a pure rotation 4 * 4 matrix to a quaternion.
-
glm::greaterThan
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > greaterThan(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison of result x > y.
+
glm::greaterThan
GLM_FUNC_DECL constexpr vec< 4, bool, Q > greaterThan(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison of result x > y.
glm::quatLookAtRH
GLM_FUNC_DECL qua< T, Q > quatLookAtRH(vec< 3, T, Q > const &direction, vec< 3, T, Q > const &up)
Build a right-handed look at quaternion.
glm::quatLookAtLH
GLM_FUNC_DECL qua< T, Q > quatLookAtLH(vec< 3, T, Q > const &direction, vec< 3, T, Q > const &up)
Build a left-handed look at quaternion.
glm::quatLookAt
GLM_FUNC_DECL qua< T, Q > quatLookAt(vec< 3, T, Q > const &direction, vec< 3, T, Q > const &up)
Build a look at quaternion based on the default handedness.
glm::pitch
GLM_FUNC_DECL T pitch(qua< T, Q > const &x)
Returns pitch value of euler angles expressed in radians.
-
glm::lessThanEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< 4, bool, Q > lessThanEqual(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison of result x <= y.
+
glm::lessThanEqual
GLM_FUNC_DECL constexpr vec< 4, bool, Q > lessThanEqual(qua< T, Q > const &x, qua< T, Q > const &y)
Returns the component-wise comparison of result x <= y.
glm::eulerAngles
GLM_FUNC_DECL vec< 3, T, Q > eulerAngles(qua< T, Q > const &x)
Returns euler angles, pitch as x, yaw as y, roll as z.
glm::mat4_cast
GLM_FUNC_DECL mat< 4, 4, T, Q > mat4_cast(qua< T, Q > const &x)
Converts a quaternion to a 4 * 4 matrix.
glm::yaw
GLM_FUNC_DECL T yaw(qua< T, Q > const &x)
Returns yaw value of euler angles expressed in radians.
diff --git a/doc/api/a01714.html b/doc/api/a01714.html index cce2b3525..0817bfe69 100644 --- a/doc/api/a01714.html +++ b/doc/api/a01714.html @@ -81,11 +81,11 @@ $(function() {

Functions

template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross (qua< T, Q > const &q, vec< 3, T, Q > const &v) +GLM_FUNC_DECL constexpr vec< 3, T, Q > cross (qua< T, Q > const &q, vec< 3, T, Q > const &v)  Compute a cross product between a quaternion and a vector. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross (vec< 3, T, Q > const &v, qua< T, Q > const &q) +GLM_FUNC_DECL constexpr vec< 3, T, Q > cross (vec< 3, T, Q > const &v, qua< T, Q > const &q)  Compute a cross product between a vector and a quaternion. More...
  template<typename T , qualifier Q> @@ -101,11 +101,11 @@ Functions  Returns an intermediate control point for squad interpolation. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR T length2 (qua< T, Q > const &q) +GLM_FUNC_DECL constexpr T length2 (qua< T, Q > const &q)  Returns the squared length of x. More...
  template<typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > quat_identity () +GLM_FUNC_DECL constexpr qua< T, Q > quat_identity ()  Create an identity quaternion. More...
  template<typename T , qualifier Q> diff --git a/doc/api/a01714_source.html b/doc/api/a01714_source.html index 4d56046ca..73ede0005 100644 --- a/doc/api/a01714_source.html +++ b/doc/api/a01714_source.html @@ -90,15 +90,15 @@ $(function() {
30 {
33 
37  template<typename T, qualifier Q>
-
38  GLM_FUNC_DECL GLM_CONSTEXPR qua<T, Q> quat_identity();
+
38  GLM_FUNC_DECL constexpr qua<T, Q> quat_identity();
39 
43  template<typename T, qualifier Q>
-
44  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> cross(
+
44  GLM_FUNC_DECL constexpr vec<3, T, Q> cross(
45  qua<T, Q> const& q,
46  vec<3, T, Q> const& v);
47 
51  template<typename T, qualifier Q>
-
52  GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> cross(
+
52  GLM_FUNC_DECL constexpr vec<3, T, Q> cross(
53  vec<3, T, Q> const& v,
54  qua<T, Q> const& q);
55 
@@ -168,7 +168,7 @@ $(function() {
161  vec<3, T, Q> const& dest);
162 
166  template<typename T, qualifier Q>
-
167  GLM_FUNC_DECL GLM_CONSTEXPR T length2(qua<T, Q> const& q);
+
167  GLM_FUNC_DECL constexpr T length2(qua<T, Q> const& q);
168 
170 }//namespace glm
171 
@@ -177,15 +177,15 @@ $(function() {
glm::quat_cast
GLM_FUNC_DECL qua< T, Q > quat_cast(mat< 3, 3, T, Q > const &x)
Converts a pure rotation 3 * 3 matrix to a quaternion.
glm::fastMix
GLM_FUNC_DECL qua< T, Q > fastMix(qua< T, Q > const &x, qua< T, Q > const &y, T const &a)
Quaternion normalized linear interpolation.
glm::mat3_cast
GLM_FUNC_DECL mat< 3, 3, T, Q > mat3_cast(qua< T, Q > const &x)
Converts a quaternion to a 3 * 3 matrix.
-
glm::quat_identity
GLM_FUNC_DECL GLM_CONSTEXPR qua< T, Q > quat_identity()
Create an identity quaternion.
+
glm::quat_identity
GLM_FUNC_DECL constexpr qua< T, Q > quat_identity()
Create an identity quaternion.
glm::extractRealComponent
GLM_FUNC_DECL T extractRealComponent(qua< T, Q > const &q)
Extract the real component of a quaternion.
glm::rotation
GLM_FUNC_DECL qua< T, Q > rotation(vec< 3, T, Q > const &orig, vec< 3, T, Q > const &dest)
Compute the rotation between two vectors.
glm::toMat4
GLM_FUNC_QUALIFIER mat< 4, 4, T, Q > toMat4(qua< T, Q > const &x)
Converts a quaternion to a 4 * 4 matrix.
Definition: gtx/quaternion.hpp:118
glm::squad
GLM_FUNC_DECL qua< T, Q > squad(qua< T, Q > const &q1, qua< T, Q > const &q2, qua< T, Q > const &s1, qua< T, Q > const &s2, T const &h)
Compute a point on a path according squad equation.
glm::rotate
GLM_FUNC_DECL vec< 4, T, Q > rotate(qua< T, Q > const &q, vec< 4, T, Q > const &v)
Rotates a 4 components vector by a quaternion.
-
glm::cross
GLM_FUNC_DECL GLM_CONSTEXPR vec< 3, T, Q > cross(vec< 3, T, Q > const &v, qua< T, Q > const &q)
Compute a cross product between a vector and a quaternion.
+
glm::cross
GLM_FUNC_DECL constexpr vec< 3, T, Q > cross(vec< 3, T, Q > const &v, qua< T, Q > const &q)
Compute a cross product between a vector and a quaternion.
glm::toQuat
GLM_FUNC_QUALIFIER qua< T, Q > toQuat(mat< 4, 4, T, Q > const &x)
Converts a 4 * 4 matrix to a quaternion.
Definition: gtx/quaternion.hpp:132
-
glm::length2
GLM_FUNC_DECL GLM_CONSTEXPR T length2(qua< T, Q > const &q)
Returns the squared length of x.
+
glm::length2
GLM_FUNC_DECL constexpr T length2(qua< T, Q > const &q)
Returns the squared length of x.
glm::toMat3
GLM_FUNC_QUALIFIER mat< 3, 3, T, Q > toMat3(qua< T, Q > const &x)
Converts a quaternion to a 3 * 3 matrix.
Definition: gtx/quaternion.hpp:111
glm::mat4_cast
GLM_FUNC_DECL mat< 4, 4, T, Q > mat4_cast(qua< T, Q > const &x)
Converts a quaternion to a 4 * 4 matrix.
glm::shortMix
GLM_FUNC_DECL qua< T, Q > shortMix(qua< T, Q > const &x, qua< T, Q > const &y, T const &a)
Quaternion interpolation using the rotation short path.
diff --git a/doc/api/a01717.html b/doc/api/a01717.html index e723b1f3f..e110c9a25 100644 --- a/doc/api/a01717.html +++ b/doc/api/a01717.html @@ -81,19 +81,19 @@ $(function() {

Functions

template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool equal (genType const &x, genType const &y, genType const &epsilon) +GLM_FUNC_DECL constexpr bool equal (genType const &x, genType const &y, genType const &epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool equal (genType const &x, genType const &y, int ULPs) +GLM_FUNC_DECL constexpr bool equal (genType const &x, genType const &y, int ULPs)  Returns the component-wise comparison between two scalars in term of ULPs. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual (genType const &x, genType const &y, genType const &epsilon) +GLM_FUNC_DECL constexpr bool notEqual (genType const &x, genType const &y, genType const &epsilon)  Returns the component-wise comparison of |x - y| >= epsilon. More...
  template<typename genType > -GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual (genType const &x, genType const &y, int ULPs) +GLM_FUNC_DECL constexpr bool notEqual (genType const &x, genType const &y, int ULPs)  Returns the component-wise comparison between two scalars in term of ULPs. More...
  diff --git a/doc/api/a01717_source.html b/doc/api/a01717_source.html index a53008955..489451735 100644 --- a/doc/api/a01717_source.html +++ b/doc/api/a01717_source.html @@ -84,24 +84,24 @@ $(function() {
25 {
28 
33  template<typename genType>
-
34  GLM_FUNC_DECL GLM_CONSTEXPR bool equal(genType const& x, genType const& y, genType const& epsilon);
+
34  GLM_FUNC_DECL constexpr bool equal(genType const& x, genType const& y, genType const& epsilon);
35 
40  template<typename genType>
-
41  GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, genType const& epsilon);
+
41  GLM_FUNC_DECL constexpr bool notEqual(genType const& x, genType const& y, genType const& epsilon);
42 
51  template<typename genType>
-
52  GLM_FUNC_DECL GLM_CONSTEXPR bool equal(genType const& x, genType const& y, int ULPs);
+
52  GLM_FUNC_DECL constexpr bool equal(genType const& x, genType const& y, int ULPs);
53 
62  template<typename genType>
-
63  GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, int ULPs);
+
63  GLM_FUNC_DECL constexpr bool notEqual(genType const& x, genType const& y, int ULPs);
64 
66 }//namespace glm
67 
68 #include "scalar_relational.inl"
-
glm::notEqual
GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual(genType const &x, genType const &y, int ULPs)
Returns the component-wise comparison between two scalars in term of ULPs.
-
glm::equal
GLM_FUNC_DECL GLM_CONSTEXPR bool equal(genType const &x, genType const &y, int ULPs)
Returns the component-wise comparison between two scalars in term of ULPs.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::notEqual
GLM_FUNC_DECL constexpr bool notEqual(genType const &x, genType const &y, int ULPs)
Returns the component-wise comparison between two scalars in term of ULPs.
+
glm::equal
GLM_FUNC_DECL constexpr bool equal(genType const &x, genType const &y, int ULPs)
Returns the component-wise comparison between two scalars in term of ULPs.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
Generated by   diff --git a/doc/api/a01729.html b/doc/api/a01729.html index 56e405516..cc19ef9e1 100644 --- a/doc/api/a01729.html +++ b/doc/api/a01729.html @@ -81,35 +81,35 @@ $(function() {

Functions

template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs) +GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon) +GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs) +GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon) +GLM_FUNC_DECL constexpr vec< L, bool, Q > equal (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon)  Returns the component-wise comparison of |x - y| < epsilon. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs) +GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, int ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon) +GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, T epsilon)  Returns the component-wise comparison of |x - y| >= epsilon. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs) +GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)  Returns the component-wise comparison between two vectors in term of ULPs. More...
  template<length_t L, typename T , qualifier Q> -GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon) +GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual (vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, T, Q > const &epsilon)  Returns the component-wise comparison of |x - y| >= epsilon. More...
  diff --git a/doc/api/a01729_source.html b/doc/api/a01729_source.html index 6d4e24b8e..a6b0954f2 100644 --- a/doc/api/a01729_source.html +++ b/doc/api/a01729_source.html @@ -84,36 +84,36 @@ $(function() {
28 {
31 
38  template<length_t L, typename T, qualifier Q>
-
39  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, T epsilon);
+
39  GLM_FUNC_DECL constexpr vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, T epsilon);
40 
47  template<length_t L, typename T, qualifier Q>
-
48  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& epsilon);
+
48  GLM_FUNC_DECL constexpr vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& epsilon);
49 
56  template<length_t L, typename T, qualifier Q>
-
57  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, T epsilon);
+
57  GLM_FUNC_DECL constexpr vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, T epsilon);
58 
65  template<length_t L, typename T, qualifier Q>
-
66  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& epsilon);
+
66  GLM_FUNC_DECL constexpr vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, T, Q> const& epsilon);
67 
74  template<length_t L, typename T, qualifier Q>
-
75  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, int ULPs);
+
75  GLM_FUNC_DECL constexpr vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, int ULPs);
76 
83  template<length_t L, typename T, qualifier Q>
-
84  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, int, Q> const& ULPs);
+
84  GLM_FUNC_DECL constexpr vec<L, bool, Q> equal(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, int, Q> const& ULPs);
85 
92  template<length_t L, typename T, qualifier Q>
-
93  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, int ULPs);
+
93  GLM_FUNC_DECL constexpr vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, int ULPs);
94 
101  template<length_t L, typename T, qualifier Q>
-
102  GLM_FUNC_DECL GLM_CONSTEXPR vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, int, Q> const& ULPs);
+
102  GLM_FUNC_DECL constexpr vec<L, bool, Q> notEqual(vec<L, T, Q> const& x, vec<L, T, Q> const& y, vec<L, int, Q> const& ULPs);
103 
105 }//namespace glm
106 
107 #include "vector_relational.inl"
-
glm::notEqual
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > notEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
-
glm::equal
GLM_FUNC_DECL GLM_CONSTEXPR vec< L, bool, Q > equal(vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
-
glm::epsilon
GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon()
Return the epsilon constant for floating point types.
+
glm::notEqual
GLM_FUNC_DECL constexpr vec< L, bool, Q > notEqual(vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
+
glm::equal
GLM_FUNC_DECL constexpr vec< L, bool, Q > equal(vec< L, T, Q > const &x, vec< L, T, Q > const &y, vec< L, int, Q > const &ULPs)
Returns the component-wise comparison between two vectors in term of ULPs.
+
glm::epsilon
GLM_FUNC_DECL constexpr genType epsilon()
Return the epsilon constant for floating point types.
Generated by   diff --git a/glm/common.hpp b/glm/common.hpp index b59657d54..5fcbbfd0c 100644 --- a/glm/common.hpp +++ b/glm/common.hpp @@ -29,7 +29,7 @@ namespace glm /// @see GLSL abs man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR genType abs(genType x); + GLM_FUNC_DECL constexpr genType abs(genType x); /// Returns x if x >= 0; otherwise, it returns -x. /// @@ -40,7 +40,7 @@ namespace glm /// @see GLSL abs man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec abs(vec const& x); + GLM_FUNC_DECL constexpr vec abs(vec const& x); /// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. /// @@ -51,7 +51,7 @@ namespace glm /// @see GLSL sign man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec sign(vec const& x); + GLM_FUNC_DECL constexpr vec sign(vec const& x); /// Returns a value equal to the nearest integer that is less then or equal to x. /// @@ -174,7 +174,7 @@ namespace glm /// @see GLSL min man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR genType min(genType x, genType y); + GLM_FUNC_DECL constexpr genType min(genType x, genType y); /// Returns y if y < x; otherwise, it returns x. /// @@ -185,7 +185,7 @@ namespace glm /// @see GLSL min man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec min(vec const& x, T y); + GLM_FUNC_DECL constexpr vec min(vec const& x, T y); /// Returns y if y < x; otherwise, it returns x. /// @@ -196,7 +196,7 @@ namespace glm /// @see GLSL min man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec min(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec min(vec const& x, vec const& y); /// Returns y if x < y; otherwise, it returns x. /// @@ -205,7 +205,7 @@ namespace glm /// @see GLSL max man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR genType max(genType x, genType y); + GLM_FUNC_DECL constexpr genType max(genType x, genType y); /// Returns y if x < y; otherwise, it returns x. /// @@ -216,7 +216,7 @@ namespace glm /// @see GLSL max man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec max(vec const& x, T y); + GLM_FUNC_DECL constexpr vec max(vec const& x, T y); /// Returns y if x < y; otherwise, it returns x. /// @@ -227,7 +227,7 @@ namespace glm /// @see GLSL max man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec max(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec max(vec const& x, vec const& y); /// Returns min(max(x, minVal), maxVal) for each component in x /// using the floating-point values minVal and maxVal. @@ -237,7 +237,7 @@ namespace glm /// @see GLSL clamp man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR genType clamp(genType x, genType minVal, genType maxVal); + GLM_FUNC_DECL constexpr genType clamp(genType x, genType minVal, genType maxVal); /// Returns min(max(x, minVal), maxVal) for each component in x /// using the floating-point values minVal and maxVal. @@ -249,7 +249,7 @@ namespace glm /// @see GLSL clamp man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec clamp(vec const& x, T minVal, T maxVal); + GLM_FUNC_DECL constexpr vec clamp(vec const& x, T minVal, T maxVal); /// Returns min(max(x, minVal), maxVal) for each component in x /// using the floating-point values minVal and maxVal. @@ -261,7 +261,7 @@ namespace glm /// @see GLSL clamp man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec clamp(vec const& x, vec const& minVal, vec const& maxVal); + GLM_FUNC_DECL constexpr vec clamp(vec const& x, vec const& minVal, vec const& maxVal); /// If genTypeU is a floating scalar or vector: /// Returns x * (1.0 - a) + y * a, i.e., the linear blend of @@ -306,13 +306,13 @@ namespace glm /// glm::vec4 u = glm::mix(g, h, r); // Interpolations can be perform per component with a vector for the last parameter. /// @endcode template - GLM_FUNC_DECL GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a); + GLM_FUNC_DECL constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a); template - GLM_FUNC_DECL GLM_CONSTEXPR vec mix(vec const& x, vec const& y, vec const& a); + GLM_FUNC_DECL constexpr vec mix(vec const& x, vec const& y, vec const& a); template - GLM_FUNC_DECL GLM_CONSTEXPR vec mix(vec const& x, vec const& y, U a); + GLM_FUNC_DECL constexpr vec mix(vec const& x, vec const& y, U a); /// Returns 0.0 if x < edge, otherwise it returns 1.0 for each component of a genType. /// diff --git a/glm/detail/_vectorize.hpp b/glm/detail/_vectorize.hpp index 807b1b1de..382666e4d 100644 --- a/glm/detail/_vectorize.hpp +++ b/glm/detail/_vectorize.hpp @@ -9,7 +9,7 @@ namespace detail template class vec, typename R, typename T, qualifier Q> struct functor1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, R, Q> call(R (*Func) (T x), vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr static vec<1, R, Q> call(R (*Func) (T x), vec<1, T, Q> const& v) { return vec<1, R, Q>(Func(v.x)); } @@ -18,7 +18,7 @@ namespace detail template class vec, typename R, typename T, qualifier Q> struct functor1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, R, Q> call(R (*Func) (T x), vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr static vec<2, R, Q> call(R (*Func) (T x), vec<2, T, Q> const& v) { return vec<2, R, Q>(Func(v.x), Func(v.y)); } @@ -27,7 +27,7 @@ namespace detail template class vec, typename R, typename T, qualifier Q> struct functor1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, R, Q> call(R (*Func) (T x), vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr static vec<3, R, Q> call(R (*Func) (T x), vec<3, T, Q> const& v) { return vec<3, R, Q>(Func(v.x), Func(v.y), Func(v.z)); } @@ -36,7 +36,7 @@ namespace detail template class vec, typename R, typename T, qualifier Q> struct functor1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, R, Q> call(R (*Func) (T x), vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr static vec<4, R, Q> call(R (*Func) (T x), vec<4, T, Q> const& v) { return vec<4, R, Q>(Func(v.x), Func(v.y), Func(v.z), Func(v.w)); } @@ -54,7 +54,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, T, Q> const& b) { return vec<1, T, Q>(Func(a.x, b.x)); } @@ -69,7 +69,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, T, Q> const& b) { return vec<2, T, Q>(Func(a.x, b.x), Func(a.y, b.y)); } @@ -84,7 +84,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, T, Q> const& b) { return vec<3, T, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z)); } @@ -99,7 +99,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, T, Q> const& b) { return vec<4, T, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z), Func(a.w, b.w)); } @@ -116,7 +116,7 @@ namespace detail return vec<1, T, Q>(Func(a.x, b)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, T b) + GLM_FUNC_QUALIFIER constexpr static vec<1, T, Q> call(Fct Func, vec<1, T, Q> const& a, T b) { return vec<1, T, Q>(Func(a.x, b)); } @@ -131,7 +131,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, T b) + GLM_FUNC_QUALIFIER constexpr static vec<2, T, Q> call(Fct Func, vec<2, T, Q> const& a, T b) { return vec<2, T, Q>(Func(a.x, b), Func(a.y, b)); } @@ -146,7 +146,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, T b) + GLM_FUNC_QUALIFIER constexpr static vec<3, T, Q> call(Fct Func, vec<3, T, Q> const& a, T b) { return vec<3, T, Q>(Func(a.x, b), Func(a.y, b), Func(a.z, b)); } @@ -160,7 +160,7 @@ namespace detail return vec<4, T, Q>(Func(a.x, b), Func(a.y, b), Func(a.z, b), Func(a.w, b)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, T b) + GLM_FUNC_QUALIFIER constexpr static vec<4, T, Q> call(Fct Func, vec<4, T, Q> const& a, T b) { return vec<4, T, Q>(Func(a.x, b), Func(a.y, b), Func(a.z, b), Func(a.w, b)); } @@ -178,7 +178,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<1, int, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, int, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<1, int, Q> call(Fct Func, vec<1, T, Q> const& a, vec<1, int, Q> const& b) { return vec<1, int, Q>(Func(a.x, b.x)); } @@ -192,7 +192,7 @@ namespace detail return vec<2, int, Q>(Func(a.x, b.x), Func(a.y, b.y)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<2, int, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, int, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<2, int, Q> call(Fct Func, vec<2, T, Q> const& a, vec<2, int, Q> const& b) { return vec<2, int, Q>(Func(a.x, b.x), Func(a.y, b.y)); } @@ -206,7 +206,7 @@ namespace detail return vec<3, int, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, int, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, int, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<3, int, Q> call(Fct Func, vec<3, T, Q> const& a, vec<3, int, Q> const& b) { return vec<3, int, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z)); } @@ -221,7 +221,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, int, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, int, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static vec<4, int, Q> call(Fct Func, vec<4, T, Q> const& a, vec<4, int, Q> const& b) { return vec<4, int, Q>(Func(a.x, b.x), Func(a.y, b.y), Func(a.z, b.z), Func(a.w, b.w)); } diff --git a/glm/detail/compute_common.hpp b/glm/detail/compute_common.hpp index 83362bc7b..be8b65f58 100644 --- a/glm/detail/compute_common.hpp +++ b/glm/detail/compute_common.hpp @@ -13,9 +13,9 @@ namespace detail template struct compute_abs { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genFIType call(genFIType x) + GLM_FUNC_QUALIFIER constexpr static genFIType call(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_signed, "'abs' only accept floating-point and integer scalar or vector inputs"); @@ -38,9 +38,9 @@ namespace detail template struct compute_abs { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genFIType call(genFIType x) + GLM_FUNC_QUALIFIER constexpr static genFIType call(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( (!std::numeric_limits::is_signed && std::numeric_limits::is_integer), "'abs' only accept floating-point and integer scalar or vector inputs"); return x; diff --git a/glm/detail/compute_vector_decl.hpp b/glm/detail/compute_vector_decl.hpp index 709f8e4af..a460a7d57 100644 --- a/glm/detail/compute_vector_decl.hpp +++ b/glm/detail/compute_vector_decl.hpp @@ -51,7 +51,7 @@ namespace glm { template struct compute_vec_add { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { return detail::functor2::call(std::plus(), a, b); } @@ -60,7 +60,7 @@ namespace glm { template struct compute_vec_sub { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { return detail::functor2::call(std::minus(), a, b); } @@ -69,7 +69,7 @@ namespace glm { template struct compute_vec_mul { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { return detail::functor2::call(std::multiplies(), a, b); } @@ -78,7 +78,7 @@ namespace glm { template struct compute_vec_div { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { return detail::functor2::call(std::divides(), a, b); } @@ -87,7 +87,7 @@ namespace glm { template struct compute_vec_mod { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { return detail::functor2::call(std::modulus(), a, b); } @@ -96,7 +96,7 @@ namespace glm { template struct compute_vec_and { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { vec v(a); for (length_t i = 0; i < L; ++i) @@ -108,7 +108,7 @@ namespace glm { template struct compute_vec_or { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { vec v(a); for (length_t i = 0; i < L; ++i) @@ -120,7 +120,7 @@ namespace glm { template struct compute_vec_xor { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { vec v(a); for (length_t i = 0; i < L; ++i) @@ -132,7 +132,7 @@ namespace glm { template struct compute_vec_shift_left { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { vec v(a); for (length_t i = 0; i < L; ++i) @@ -144,7 +144,7 @@ namespace glm { template struct compute_vec_shift_right { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a, vec const& b) { vec v(a); for (length_t i = 0; i < L; ++i) @@ -156,7 +156,7 @@ namespace glm { template struct compute_vec_equal { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec const& v1, vec const& v2) + GLM_FUNC_QUALIFIER constexpr static bool call(vec const& v1, vec const& v2) { bool b = true; for (length_t i = 0; b && i < L; ++i) @@ -168,7 +168,7 @@ namespace glm { template struct compute_vec_nequal { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr static bool call(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return !compute_vec_equal::value, sizeof(T) * 8, detail::is_aligned::value>::call(v1, v2); } @@ -177,7 +177,7 @@ namespace glm { template struct compute_vec_bitwise_not { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec v(a); for (length_t i = 0; i < L; ++i) diff --git a/glm/detail/compute_vector_relational.hpp b/glm/detail/compute_vector_relational.hpp index 167b6345d..fcd2a3f98 100644 --- a/glm/detail/compute_vector_relational.hpp +++ b/glm/detail/compute_vector_relational.hpp @@ -10,7 +10,7 @@ namespace detail template struct compute_equal { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T a, T b) + GLM_FUNC_QUALIFIER constexpr static bool call(T a, T b) { return a == b; } @@ -19,7 +19,7 @@ namespace detail template struct compute_equal { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(T a, T b) + GLM_FUNC_QUALIFIER constexpr static bool call(T a, T b) { return detail::compute_abs::is_signed>::call(b - a) <= static_cast(0); //return std::memcmp(&a, &b, sizeof(T)) == 0; diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index 32b7bac78..d2f44317a 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -14,9 +14,9 @@ namespace glm { // min template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType min(genType x, genType y) + GLM_FUNC_QUALIFIER constexpr genType min(genType x, genType y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); return (y < x) ? y : x; } @@ -27,9 +27,9 @@ namespace glm // max template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType max(genType x, genType y) + GLM_FUNC_QUALIFIER constexpr genType max(genType x, genType y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); return (x < y) ? y : x; } @@ -41,7 +41,7 @@ namespace glm // abs template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR int abs(int x) + GLM_FUNC_QUALIFIER constexpr int abs(int x) { int const y = x >> (sizeof(int) * 8 - 1); return (x ^ y) - y; @@ -59,7 +59,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType round(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'round' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'round' only accept floating-point inputs"); return x < static_cast(0) ? static_cast(int(x - static_cast(0.5))) : static_cast(int(x + static_cast(0.5))); } @@ -77,7 +77,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType trunc(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'trunc' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'trunc' only accept floating-point inputs"); return x < static_cast(0) ? -std::floor(-x) : std::floor(x); } @@ -101,7 +101,7 @@ namespace detail template struct compute_abs_vector { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& x) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& x) { return detail::functor1::call(abs, x); } @@ -112,7 +112,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x, vec const& y, vec const& a) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a"); return vec(vec(x) * (static_cast(1) - a) + vec(y) * a); } @@ -135,7 +135,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x, vec const& y, U const& a) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a"); return vec(vec(x) * (static_cast(1) - a) + vec(y) * a); } @@ -155,7 +155,7 @@ namespace detail { GLM_FUNC_QUALIFIER static T call(T const& x, T const& y, U const& a) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'mix' only accept floating-point inputs for the interpolator a"); return static_cast(static_cast(x) * (static_cast(1) - a) + static_cast(y) * a); } @@ -243,7 +243,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& a, vec const& b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'mod' only accept floating-point inputs. Include for integer inputs."); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'mod' only accept floating-point inputs. Include for integer inputs."); return a - b * floor(a / b); } }; @@ -298,7 +298,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& edge0, vec const& edge1, vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'smoothstep' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'smoothstep' only accept floating-point inputs"); vec const tmp(clamp((x - edge0) / (edge1 - edge0), static_cast(0), static_cast(1))); return tmp * tmp * (static_cast(3) - static_cast(2) * tmp); } @@ -343,7 +343,7 @@ namespace detail template struct convert_splat { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec v(0); for (int i = 0; i < L; ++i) @@ -356,13 +356,13 @@ namespace detail }//namespace detail template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genFIType abs(genFIType x) + GLM_FUNC_QUALIFIER constexpr genFIType abs(genFIType x) { return detail::compute_abs::is_signed>::call(x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec abs(vec const& x) + GLM_FUNC_QUALIFIER constexpr vec abs(vec const& x) { return detail::compute_abs_vector::value>::call(x); } @@ -370,9 +370,9 @@ namespace detail // sign // fast and works for any type template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genFIType sign(genFIType x) + GLM_FUNC_QUALIFIER constexpr genFIType sign(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || (std::numeric_limits::is_signed && std::numeric_limits::is_integer), "'sign' only accept signed inputs"); @@ -381,9 +381,9 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec sign(vec const& x) + GLM_FUNC_QUALIFIER constexpr vec sign(vec const& x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || (std::numeric_limits::is_signed && std::numeric_limits::is_integer), "'sign' only accept signed inputs"); @@ -395,21 +395,21 @@ namespace detail template GLM_FUNC_QUALIFIER vec floor(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'floor' only accept floating-point inputs."); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'floor' only accept floating-point inputs."); return detail::compute_floor::value>::call(x); } template GLM_FUNC_QUALIFIER vec trunc(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'trunc' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'trunc' only accept floating-point inputs"); return detail::compute_trunc::value>::call(x); } template GLM_FUNC_QUALIFIER vec round(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'round' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'round' only accept floating-point inputs"); return detail::compute_round::value>::call(x); } @@ -418,7 +418,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType roundEven(genType const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'roundEven' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'roundEven' only accept floating-point inputs"); return genType(int(x + genType(int(x) % 2))); } @@ -428,7 +428,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType roundEven(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'roundEven' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'roundEven' only accept floating-point inputs"); int Integer = static_cast(x); genType IntegerPart = static_cast(Integer); @@ -459,7 +459,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec roundEven(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'roundEven' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'roundEven' only accept floating-point inputs"); return detail::functor1::call(roundEven, x); } @@ -468,7 +468,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec ceil(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ceil' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ceil' only accept floating-point inputs"); return detail::compute_ceil::value>::call(x); } @@ -482,7 +482,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec fract(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fract' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fract' only accept floating-point inputs"); return detail::compute_fract::value>::call(x); } @@ -570,7 +570,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType modf(genType x, genType & i) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'modf' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'modf' only accept floating-point inputs"); return std::modf(x, &i); } @@ -618,68 +618,68 @@ namespace detail // min template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec min(vec const& a, T b) + GLM_FUNC_QUALIFIER constexpr vec min(vec const& a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); return detail::compute_min_vector::value>::call(a, vec(b)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec min(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr vec min(vec const& a, vec const& b) { return detail::compute_min_vector::value>::call(a, b); } // max template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec max(vec const& a, T b) + GLM_FUNC_QUALIFIER constexpr vec max(vec const& a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); return detail::compute_max_vector::value>::call(a, vec(b)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec max(vec const& a, vec const& b) + GLM_FUNC_QUALIFIER constexpr vec max(vec const& a, vec const& b) { return detail::compute_max_vector::value>::call(a, b); } // clamp template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType clamp(genType x, genType minVal, genType maxVal) + GLM_FUNC_QUALIFIER constexpr genType clamp(genType x, genType minVal, genType maxVal) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'clamp' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'clamp' only accept floating-point or integer inputs"); return min(max(x, minVal), maxVal); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec clamp(vec const& x, T minVal, T maxVal) + GLM_FUNC_QUALIFIER constexpr vec clamp(vec const& x, T minVal, T maxVal) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'clamp' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'clamp' only accept floating-point or integer inputs"); return detail::compute_clamp_vector::value>::call(x, vec(minVal), vec(maxVal)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec clamp(vec const& x, vec const& minVal, vec const& maxVal) + GLM_FUNC_QUALIFIER constexpr vec clamp(vec const& x, vec const& minVal, vec const& maxVal) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'clamp' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || std::numeric_limits::is_integer, "'clamp' only accept floating-point or integer inputs"); return detail::compute_clamp_vector::value>::call(x, minVal, maxVal); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genTypeT mix(genTypeT x, genTypeT y, genTypeU a) + GLM_FUNC_QUALIFIER constexpr genTypeT mix(genTypeT x, genTypeT y, genTypeU a) { return detail::compute_mix::call(x, y, a); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec mix(vec const& x, vec const& y, U a) + GLM_FUNC_QUALIFIER constexpr vec mix(vec const& x, vec const& y, U a) { return detail::compute_mix_scalar::value>::call(x, y, a); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec mix(vec const& x, vec const& y, vec const& a) + GLM_FUNC_QUALIFIER constexpr vec mix(vec const& x, vec const& y, vec const& a) { return detail::compute_mix_vector::value>::call(x, y, a); } @@ -707,7 +707,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType smoothstep(genType edge0, genType edge1, genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'smoothstep' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'smoothstep' only accept floating-point inputs"); genType const tmp(clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1))); return tmp * tmp * (genType(3) - genType(2) * tmp); @@ -731,7 +731,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isnan(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isnan' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isnan' only accept floating-point inputs"); # if GLM_HAS_CXX11_STL return std::isnan(x); @@ -756,7 +756,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec isnan(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isnan' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isnan' only accept floating-point inputs"); vec Result(0); for (length_t l = 0; l < v.length(); ++l) @@ -770,7 +770,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isinf(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isinf' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isinf' only accept floating-point inputs"); # if GLM_HAS_CXX11_STL return std::isinf(x); @@ -798,7 +798,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec isinf(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isinf' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isinf' only accept floating-point inputs"); vec Result(0); for (length_t l = 0; l < v.length(); ++l) @@ -895,7 +895,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType frexp(genType x, int& exp) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'frexp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'frexp' only accept floating-point inputs"); return std::frexp(x, &exp); } @@ -903,7 +903,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec frexp(vec const& v, vec& exp) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'frexp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'frexp' only accept floating-point inputs"); vec Result(0); for (length_t l = 0; l < v.length(); ++l) @@ -914,7 +914,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType ldexp(genType const& x, int const& exp) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ldexp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ldexp' only accept floating-point inputs"); return std::ldexp(x, exp); } @@ -922,7 +922,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec ldexp(vec const& v, vec const& exp) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ldexp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ldexp' only accept floating-point inputs"); vec Result(0); for (length_t l = 0; l < v.length(); ++l) diff --git a/glm/detail/func_common_simd.inl b/glm/detail/func_common_simd.inl index 79c102f77..762887af4 100644 --- a/glm/detail/func_common_simd.inl +++ b/glm/detail/func_common_simd.inl @@ -402,7 +402,7 @@ namespace detail template struct convert_splat { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; const int s = _MM_SHUFFLE(c, c, c, c); @@ -427,7 +427,7 @@ namespace detail template struct detailSSE { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; glm_f64vec2 r0 = _mm_shuffle_pd(a.data.getv(0), a.data.getv(0), c | c << 1); @@ -440,7 +440,7 @@ namespace detail template struct detailSSE { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; const unsigned int d = static_cast(c - 2); @@ -459,7 +459,7 @@ namespace detail template struct detailAVX { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; __m256d t1 = _mm256_permute2f128_pd(a.data, a.data, 0x0); @@ -471,7 +471,7 @@ namespace detail template struct detailAVX { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; __m256d t1 = _mm256_permute2f128_pd(a.data, a.data, 0x0); @@ -483,7 +483,7 @@ namespace detail template struct detailAVX { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; __m256d t2 = _mm256_permute2f128_pd(a.data, a.data, 0x11); @@ -495,7 +495,7 @@ namespace detail template struct detailAVX { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { vec Result; __m256d t2 = _mm256_permute2f128_pd(a.data, a.data, 0x11); @@ -506,7 +506,7 @@ namespace detail #endif //GLM_ARCH & GLM_ARCH_AVX_BIT template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec call(vec const& a) + GLM_FUNC_QUALIFIER constexpr static vec call(vec const& a) { //return compute_splat::call(a); vec Result; diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index 7b91f140d..1c5b50299 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -25,7 +25,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'log2' only accept floating-point inputs. Include for integer inputs."); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'log2' only accept floating-point inputs. Include for integer inputs."); return detail::functor1::call(log2, v); } @@ -97,7 +97,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType exp2(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'exp2' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'exp2' only accept floating-point inputs"); return std::exp(static_cast(0.69314718055994530941723212145818) * x); } @@ -127,7 +127,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec sqrt(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sqrt' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sqrt' only accept floating-point inputs"); return detail::compute_sqrt::value>::call(x); } @@ -141,7 +141,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec inversesqrt(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'inversesqrt' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'inversesqrt' only accept floating-point inputs"); return detail::compute_inversesqrt::value>::call(x); } }//namespace glm diff --git a/glm/detail/func_geometric.inl b/glm/detail/func_geometric.inl index 8f3cc7734..a8624ea02 100644 --- a/glm/detail/func_geometric.inl +++ b/glm/detail/func_geometric.inl @@ -28,7 +28,7 @@ namespace detail template struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static T call(vec<1, T, Q> const& a, vec<1, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static T call(vec<1, T, Q> const& a, vec<1, T, Q> const& b) { return a.x * b.x; } @@ -37,7 +37,7 @@ namespace detail template struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static T call(vec<2, T, Q> const& a, vec<2, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static T call(vec<2, T, Q> const& a, vec<2, T, Q> const& b) { vec<2, T, Q> tmp(a * b); return tmp.x + tmp.y; @@ -47,7 +47,7 @@ namespace detail template struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static T call(vec<3, T, Q> const& a, vec<3, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static T call(vec<3, T, Q> const& a, vec<3, T, Q> const& b) { vec<3, T, Q> tmp(a * b); return tmp.x + tmp.y + tmp.z; @@ -57,7 +57,7 @@ namespace detail template struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static T call(vec<4, T, Q> const& a, vec<4, T, Q> const& b) + GLM_FUNC_QUALIFIER constexpr static T call(vec<4, T, Q> const& a, vec<4, T, Q> const& b) { // VS 17.7.4 generates longer assembly (~20 instructions vs 11 instructions) #if defined(_MSC_VER) @@ -72,9 +72,9 @@ namespace detail template struct compute_cross { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<3, T, Q> call(vec<3, T, Q> const& x, vec<3, T, Q> const& y) + GLM_FUNC_QUALIFIER constexpr static vec<3, T, Q> call(vec<3, T, Q> const& x, vec<3, T, Q> const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'cross' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'cross' accepts only floating-point inputs"); return vec<3, T, Q>( x.y * y.z - y.y * x.z, @@ -82,9 +82,9 @@ namespace detail x.x * y.y - y.x * x.y); } - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, T, Q> call(vec<4, T, Q> const& x, vec<4, T, Q> const& y) + GLM_FUNC_QUALIFIER constexpr static vec<4, T, Q> call(vec<4, T, Q> const& x, vec<4, T, Q> const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'cross' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'cross' accepts only floating-point inputs"); return vec<4, T, Q>( x.y * y.z - y.y * x.z, @@ -99,7 +99,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); return v * inversesqrt(dot(v, v)); } @@ -110,7 +110,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& N, vec const& I, vec const& Nref) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); return dot(Nref, I) < static_cast(0) ? N : -N; } @@ -143,7 +143,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType length(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'length' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'length' accepts only floating-point inputs"); return abs(x); } @@ -151,7 +151,7 @@ namespace detail template GLM_FUNC_QUALIFIER T length(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'length' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'length' accepts only floating-point inputs"); return detail::compute_length::value>::call(v); } @@ -160,7 +160,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType distance(genType const& p0, genType const& p1) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'distance' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'distance' accepts only floating-point inputs"); return length(p1 - p0); } @@ -173,22 +173,22 @@ namespace detail // dot template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T dot(T x, T y) + GLM_FUNC_QUALIFIER constexpr T dot(T x, T y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'dot' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'dot' accepts only floating-point inputs"); return x * y; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T dot(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr T dot(vec const& x, vec const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'dot' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'dot' accepts only floating-point inputs"); return detail::compute_dot, T, detail::is_aligned::value>::call(x, y); } // cross template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> cross(vec<3, T, Q> const& x, vec<3, T, Q> const& y) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> cross(vec<3, T, Q> const& x, vec<3, T, Q> const& y) { return detail::compute_cross::value>::call(x, y); } @@ -197,7 +197,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType normalize(genType const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); return x < genType(0) ? genType(-1) : genType(1); } @@ -205,7 +205,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec normalize(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'normalize' accepts only floating-point inputs"); return detail::compute_normalize::value>::call(x); } @@ -240,7 +240,7 @@ namespace detail template GLM_FUNC_QUALIFIER genType refract(genType const& I, genType const& N, genType eta) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'refract' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'refract' accepts only floating-point inputs"); genType const dotValue(dot(N, I)); genType const k(static_cast(1) - eta * eta * (static_cast(1) - dotValue * dotValue)); return (eta * I - (eta * dotValue + sqrt(k)) * N) * static_cast(k >= static_cast(0)); @@ -249,7 +249,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec refract(vec const& I, vec const& N, T eta) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'refract' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'refract' accepts only floating-point inputs"); return detail::compute_refract::value>::call(I, N, eta); } }//namespace glm diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index d0f6a84d5..739606db9 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -253,7 +253,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec bitfieldExtract(vec const& Value, int Offset, int Bits) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldExtract' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'bitfieldExtract' only accept integer inputs"); return (Value >> static_cast(Offset)) & static_cast(detail::mask(Bits)); } @@ -262,7 +262,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType bitfieldInsert(genIUType const& Base, genIUType const& Insert, int Offset, int Bits) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldInsert' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldInsert' only accept integer values"); return bitfieldInsert(vec<1, genIUType>(Base), vec<1, genIUType>(Insert), Offset, Bits).x; } @@ -270,7 +270,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec bitfieldInsert(vec const& Base, vec const& Insert, int Offset, int Bits) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldInsert' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldInsert' only accept integer values"); T const Mask = detail::mask(static_cast(Bits)) << Offset; return (Base & ~Mask) | ((Insert << static_cast(Offset)) & Mask); @@ -285,7 +285,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType bitfieldReverse(genIUType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldReverse' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldReverse' only accept integer values"); return bitfieldReverse(glm::vec<1, genIUType, glm::defaultp>(x)).x; } @@ -293,7 +293,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec bitfieldReverse(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldReverse' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldReverse' only accept integer values"); vec x(v); x = detail::compute_bitfieldReverseStep::value, sizeof(T) * 8>= 2>::call(x, static_cast(0x5555555555555555ull), static_cast( 1)); @@ -313,7 +313,7 @@ namespace detail template GLM_FUNC_QUALIFIER int bitCount(genIUType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); return bitCount(glm::vec<1, genIUType, glm::defaultp>(x)).x; } @@ -321,7 +321,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec bitCount(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); # if GLM_COMPILER & GLM_COMPILER_VC # pragma warning(push) @@ -346,7 +346,7 @@ namespace detail template GLM_FUNC_QUALIFIER int findLSB(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); return detail::compute_findLSB::call(Value); } @@ -354,7 +354,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec findLSB(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); return detail::functor1::call(findLSB, x); } @@ -363,7 +363,7 @@ namespace detail template GLM_FUNC_QUALIFIER int findMSB(genIUType v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); return findMSB(vec<1, genIUType>(v)).x; } @@ -371,7 +371,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec findMSB(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); return detail::compute_findMSB_vec(sizeof(T) * 8)>::call(v); } diff --git a/glm/detail/func_matrix.inl b/glm/detail/func_matrix.inl index 9c7f7eb76..d44f0a30a 100644 --- a/glm/detail/func_matrix.inl +++ b/glm/detail/func_matrix.inl @@ -20,7 +20,7 @@ namespace detail struct compute_matrixCompMult_type { GLM_FUNC_QUALIFIER static mat call(mat const& x, mat const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'matrixCompMult' only accept floating-point inputs, include to discard this restriction."); return detail::compute_matrixCompMult::value>::call(x, y); } @@ -41,7 +41,7 @@ namespace detail struct compute_outerProduct_type { GLM_FUNC_QUALIFIER static typename detail::outerProduct_trait::type call(vec const& c, vec const& r) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'outerProduct' only accept floating-point inputs, include to discard this restriction."); return detail::compute_outerProduct::call(c, r); @@ -231,7 +231,7 @@ namespace detail struct compute_transpose_type { GLM_FUNC_QUALIFIER static mat call(mat const& m) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'transpose' only accept floating-point inputs, include to discard this restriction."); return detail::compute_transpose::value>::call(m); } @@ -290,7 +290,7 @@ namespace detail GLM_FUNC_QUALIFIER static T call(mat const& m) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'determinant' only accept floating-point inputs, include to discard this restriction."); return detail::compute_determinant::value>::call(m); } @@ -473,7 +473,7 @@ namespace detail template GLM_FUNC_QUALIFIER mat inverse(mat const& m) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'inverse' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_GENTYPE, "'inverse' only accept floating-point inputs"); return detail::compute_inverse::value>::call(m); } }//namespace glm diff --git a/glm/detail/func_matrix_simd.inl b/glm/detail/func_matrix_simd.inl index 9e47bf707..1db701b55 100644 --- a/glm/detail/func_matrix_simd.inl +++ b/glm/detail/func_matrix_simd.inl @@ -12,7 +12,7 @@ namespace detail template struct compute_matrixCompMult<4, 4, float, Q, true> { - GLM_STATIC_ASSERT(detail::is_aligned::value, "Specialization requires aligned"); + static_assert(detail::is_aligned::value, "Specialization requires aligned"); GLM_FUNC_QUALIFIER static mat<4, 4, float, Q> call(mat<4, 4, float, Q> const& x, mat<4, 4, float, Q> const& y) { diff --git a/glm/detail/func_trigonometric.inl b/glm/detail/func_trigonometric.inl index 9e6d9cfb1..573e009d5 100644 --- a/glm/detail/func_trigonometric.inl +++ b/glm/detail/func_trigonometric.inl @@ -6,30 +6,30 @@ namespace glm { // radians template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType radians(genType degrees) + GLM_FUNC_QUALIFIER constexpr genType radians(genType degrees) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'radians' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'radians' only accept floating-point input"); return degrees * static_cast(0.01745329251994329576923690768489); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec radians(vec const& v) + GLM_FUNC_QUALIFIER constexpr vec radians(vec const& v) { return detail::functor1::call(radians, v); } // degrees template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType degrees(genType radians) + GLM_FUNC_QUALIFIER constexpr genType degrees(genType radians) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'degrees' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'degrees' only accept floating-point input"); return radians * static_cast(57.295779513082320876798154814105); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec degrees(vec const& v) + GLM_FUNC_QUALIFIER constexpr vec degrees(vec const& v) { return detail::functor1::call(degrees, v); } @@ -83,7 +83,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType atan(genType y, genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'atan' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'atan' only accept floating-point input"); return ::std::atan2(y, x); } @@ -136,7 +136,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType asinh(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asinh' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asinh' only accept floating-point input"); return (x < static_cast(0) ? static_cast(-1) : (x > static_cast(0) ? static_cast(1) : static_cast(0))) * log(std::abs(x) + sqrt(static_cast(1) + x * x)); } @@ -155,7 +155,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType acosh(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acosh' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acosh' only accept floating-point input"); if(x < static_cast(1)) return static_cast(0); @@ -176,7 +176,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType atanh(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'atanh' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'atanh' only accept floating-point input"); if(std::abs(x) >= static_cast(1)) return 0; diff --git a/glm/detail/func_vector_relational.inl b/glm/detail/func_vector_relational.inl index 80c9e87fc..f7c5c8a34 100644 --- a/glm/detail/func_vector_relational.inl +++ b/glm/detail/func_vector_relational.inl @@ -1,7 +1,7 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec lessThan(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr vec lessThan(vec const& x, vec const& y) { vec Result(true); for(length_t i = 0; i < L; ++i) @@ -10,7 +10,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec lessThanEqual(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr vec lessThanEqual(vec const& x, vec const& y) { vec Result(true); for(length_t i = 0; i < L; ++i) @@ -19,7 +19,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec greaterThan(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr vec greaterThan(vec const& x, vec const& y) { vec Result(true); for(length_t i = 0; i < L; ++i) @@ -28,7 +28,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec greaterThanEqual(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr vec greaterThanEqual(vec const& x, vec const& y) { vec Result(true); for(length_t i = 0; i < L; ++i) @@ -37,7 +37,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr vec equal(vec const& x, vec const& y) { vec Result(true); for(length_t i = 0; i < L; ++i) @@ -46,7 +46,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y) + GLM_FUNC_QUALIFIER constexpr vec notEqual(vec const& x, vec const& y) { vec Result(true); for(length_t i = 0; i < L; ++i) @@ -55,7 +55,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool any(vec const& v) + GLM_FUNC_QUALIFIER constexpr bool any(vec const& v) { bool Result = false; for(length_t i = 0; i < L; ++i) @@ -64,7 +64,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool all(vec const& v) + GLM_FUNC_QUALIFIER constexpr bool all(vec const& v) { bool Result = true; for(length_t i = 0; i < L; ++i) @@ -73,7 +73,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec not_(vec const& v) + GLM_FUNC_QUALIFIER constexpr vec not_(vec const& v) { vec Result(true); for(length_t i = 0; i < L; ++i) diff --git a/glm/detail/qualifier.hpp b/glm/detail/qualifier.hpp index 08ee5a5c6..58dd13df2 100644 --- a/glm/detail/qualifier.hpp +++ b/glm/detail/qualifier.hpp @@ -178,10 +178,10 @@ namespace detail struct type { glm_f64vec2 data[2]; - GLM_CONSTEXPR glm_f64vec2 getv(int i) const { + constexpr glm_f64vec2 getv(int i) const { return data[i]; } - GLM_CONSTEXPR void setv(int i, const glm_f64vec2& v) { + constexpr void setv(int i, const glm_f64vec2& v) { data[i] = v; } }; @@ -240,15 +240,12 @@ namespace detail struct storage<3, unsigned int, true> : public storage<4, unsigned int, true> {}; -# if GLM_HAS_ALIGNOF - template<> struct storage<3, double, true> { typedef struct alignas(4 * sizeof(double)) type { double data[4]; } type; }; -# endif//GLM_HAS_ALIGNOF # endif @@ -277,7 +274,7 @@ namespace detail template struct init_gentype { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genType identity() + GLM_FUNC_QUALIFIER constexpr static genType identity() { return genType(1, 0, 0, 0); } @@ -286,7 +283,7 @@ namespace detail template struct init_gentype { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static genType identity() + GLM_FUNC_QUALIFIER constexpr static genType identity() { return genType(1); } diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index c6d32f298..61f43a48a 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -93,16 +93,12 @@ # define GLM_LANG 0 #elif defined(GLM_FORCE_CXX20) # define GLM_LANG (GLM_LANG_CXX20 | GLM_LANG_EXT) -# define GLM_LANG_STL11_FORCED #elif defined(GLM_FORCE_CXX17) # define GLM_LANG (GLM_LANG_CXX17 | GLM_LANG_EXT) -# define GLM_LANG_STL11_FORCED #elif defined(GLM_FORCE_CXX14) # define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_EXT) -# define GLM_LANG_STL11_FORCED #elif defined(GLM_FORCE_CXX11) # define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_EXT) -# define GLM_LANG_STL11_FORCED #elif defined(GLM_FORCE_CXX03) # define GLM_LANG (GLM_LANG_CXX03 | GLM_LANG_EXT) #elif defined(GLM_FORCE_CXX98) @@ -148,152 +144,9 @@ // http://gcc.gnu.org/projects/cxx0x.html // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx -#if (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC -# define GLM_HAS_CXX11_STL 0 -#elif (GLM_COMPILER & GLM_COMPILER_HIP) -# define GLM_HAS_CXX11_STL 0 -#elif GLM_COMPILER & GLM_COMPILER_CLANG -# if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED)) -# define GLM_HAS_CXX11_STL 1 -# else -# define GLM_HAS_CXX11_STL 0 -# endif -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_CXX11_STL 1 -#else -# define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ - ((GLM_PLATFORM != GLM_PLATFORM_WINDOWS) && (GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15)))) -#endif - -// N1720 -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_STATIC_ASSERT __has_feature(cxx_static_assert) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_STATIC_ASSERT 1 -#else -# define GLM_HAS_STATIC_ASSERT ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_VC)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - -// N1988 -#if GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_EXTENDED_INTEGER_TYPE 1 -#else -# define GLM_HAS_EXTENDED_INTEGER_TYPE (\ - ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC)) || \ - ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CLANG)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP))) -#endif - -// N2672 Initializer lists http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2672.htm -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_INITIALIZER_LISTS __has_feature(cxx_generalized_initializers) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_INITIALIZER_LISTS 1 -#else -# define GLM_HAS_INITIALIZER_LISTS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15)) || \ - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - -// N2544 Unrestricted unions http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_UNRESTRICTED_UNIONS __has_feature(cxx_unrestricted_unions) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_UNRESTRICTED_UNIONS 1 -#else -# define GLM_HAS_UNRESTRICTED_UNIONS (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - (GLM_COMPILER & GLM_COMPILER_VC) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP))) -#endif - -// N2346 -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_DEFAULTED_FUNCTIONS __has_feature(cxx_defaulted_functions) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_DEFAULTED_FUNCTIONS 1 -#else -# define GLM_HAS_DEFAULTED_FUNCTIONS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ - ((GLM_COMPILER & GLM_COMPILER_INTEL)) || \ - (GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP))) -#endif - -// N2118 -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_RVALUE_REFERENCES __has_feature(cxx_rvalue_references) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_RVALUE_REFERENCES 1 -#else -# define GLM_HAS_RVALUE_REFERENCES ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - -// N2437 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2437.pdf -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS __has_feature(cxx_explicit_conversions) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS 1 -#else -# define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - -// N2258 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2258.pdf -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_TEMPLATE_ALIASES __has_feature(cxx_alias_templates) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_TEMPLATE_ALIASES 1 -#else -# define GLM_HAS_TEMPLATE_ALIASES ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_INTEL)) || \ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - -// N2930 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2930.html -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_RANGE_FOR __has_feature(cxx_range_for) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_RANGE_FOR 1 -#else -# define GLM_HAS_RANGE_FOR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_INTEL)) || \ - ((GLM_COMPILER & GLM_COMPILER_VC)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - -// N2341 http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf -#if GLM_COMPILER & GLM_COMPILER_CLANG -# define GLM_HAS_ALIGNOF __has_feature(cxx_alignas) -#elif GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_ALIGNOF 1 -#else -# define GLM_HAS_ALIGNOF ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15)) || \ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC14)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) -#endif - // N2235 Generalized Constant Expressions http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf // N3652 Extended Constant Expressions http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3652.html +/* #if (GLM_ARCH & GLM_ARCH_SIMD_BIT) // Compiler SIMD intrinsics don't support constexpr... # define GLM_HAS_CONSTEXPR 0 #elif (GLM_COMPILER & GLM_COMPILER_CLANG) @@ -307,62 +160,11 @@ #endif #if GLM_HAS_CONSTEXPR -# define GLM_CONSTEXPR constexpr +# define constexpr constexpr #else -# define GLM_CONSTEXPR -#endif - -// -#if GLM_HAS_CONSTEXPR -# if (GLM_COMPILER & GLM_COMPILER_CLANG) -# if __has_feature(cxx_if_constexpr) -# define GLM_HAS_IF_CONSTEXPR 1 -# else -# define GLM_HAS_IF_CONSTEXPR 0 -# endif -# elif (GLM_LANG & GLM_LANG_CXX17_FLAG) -# define GLM_HAS_IF_CONSTEXPR 1 -# else -# define GLM_HAS_IF_CONSTEXPR 0 -# endif -#else -# define GLM_HAS_IF_CONSTEXPR 0 -#endif - -#if GLM_HAS_IF_CONSTEXPR -# define GLM_IF_CONSTEXPR if constexpr -#else -# define GLM_IF_CONSTEXPR if -#endif - -// [nodiscard] -#if GLM_LANG & GLM_LANG_CXX17_FLAG -# define GLM_NODISCARD [[nodiscard]] -#else -# define GLM_NODISCARD -#endif - -// -#if GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_ASSIGNABLE 1 -#else -# define GLM_HAS_ASSIGNABLE ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15)) || \ - ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC49)))) -#endif - -// -#define GLM_HAS_TRIVIAL_QUERIES 0 - -// -#if GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_MAKE_SIGNED 1 -#else -# define GLM_HAS_MAKE_SIGNED ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC12)) || \ - ((GLM_COMPILER & GLM_COMPILER_CUDA)) || \ - ((GLM_COMPILER & GLM_COMPILER_HIP)))) +# define constexpr #endif +*/ // #if defined(GLM_FORCE_INTRINSICS) @@ -373,23 +175,11 @@ # define GLM_HAS_BITSCAN_WINDOWS 0 #endif -#if GLM_LANG & GLM_LANG_CXX11_FLAG -# define GLM_HAS_NOEXCEPT 1 -#else -# define GLM_HAS_NOEXCEPT 0 -#endif - -#if GLM_HAS_NOEXCEPT -# define GLM_NOEXCEPT noexcept -#else -# define GLM_NOEXCEPT -#endif - /////////////////////////////////////////////////////////////////////////////////// // OpenMP #ifdef _OPENMP # if GLM_COMPILER & GLM_COMPILER_GCC -# if GLM_COMPILER >= GLM_COMPILER_GCC61 +# if GLM_COMPILER >= GLM_COMPILER_GCC15 # define GLM_HAS_OPENMP 45 # elif GLM_COMPILER >= GLM_COMPILER_GCC49 # define GLM_HAS_OPENMP 40 @@ -399,7 +189,11 @@ # define GLM_HAS_OPENMP 0 # endif # elif GLM_COMPILER & GLM_COMPILER_CLANG -# if GLM_COMPILER >= GLM_COMPILER_CLANG38 +# if GLM_COMPILER >= GLM_COMPILER_CLANG11 +# define GLM_HAS_OPENMP 50 +# elif GLM_COMPILER >= GLM_COMPILER_CLANG39 +# define GLM_HAS_OPENMP 45 +# elif GLM_COMPILER >= GLM_COMPILER_CLANG38 # define GLM_HAS_OPENMP 31 # else # define GLM_HAS_OPENMP 0 @@ -408,6 +202,8 @@ # define GLM_HAS_OPENMP 20 # elif GLM_COMPILER & GLM_COMPILER_INTEL # if GLM_COMPILER >= GLM_COMPILER_INTEL16 +# define GLM_HAS_OPENMP 45 +# elif GLM_COMPILER >= GLM_COMPILER_INTEL15 # define GLM_HAS_OPENMP 40 # else # define GLM_HAS_OPENMP 0 @@ -419,32 +215,6 @@ # define GLM_HAS_OPENMP 0 #endif -/////////////////////////////////////////////////////////////////////////////////// -// nullptr - -#if GLM_LANG & GLM_LANG_CXX0X_FLAG -# define GLM_CONFIG_NULLPTR GLM_ENABLE -#else -# define GLM_CONFIG_NULLPTR GLM_DISABLE -#endif - -#if GLM_CONFIG_NULLPTR == GLM_ENABLE -# define GLM_NULLPTR nullptr -#else -# define GLM_NULLPTR 0 -#endif - -/////////////////////////////////////////////////////////////////////////////////// -// Static assert - -#if GLM_HAS_STATIC_ASSERT -# define GLM_STATIC_ASSERT(x, message) static_assert(x, message) -#elif GLM_COMPILER & GLM_COMPILER_VC -# define GLM_STATIC_ASSERT(x, message) typedef char __CASSERT__##__LINE__[(x) ? 1 : -1] -#else -# define GLM_STATIC_ASSERT(x, message) assert(x) -#endif//GLM_LANG - /////////////////////////////////////////////////////////////////////////////////// // Qualifiers @@ -489,9 +259,9 @@ # define GLM_NEVER_INLINE #endif//defined(GLM_FORCE_INLINE) -#define GLM_CTOR_DECL GLM_CUDA_FUNC_DECL GLM_CONSTEXPR +#define GLM_CTOR_DECL GLM_CUDA_FUNC_DECL constexpr #define GLM_FUNC_DISCARD_DECL GLM_CUDA_FUNC_DECL -#define GLM_FUNC_DECL GLM_NODISCARD GLM_CUDA_FUNC_DECL +#define GLM_FUNC_DECL [[nodiscard]] GLM_CUDA_FUNC_DECL #define GLM_FUNC_QUALIFIER GLM_CUDA_FUNC_DEF GLM_INLINE // Do not use CUDA function qualifiers on CUDA compiler when functions are made default @@ -591,11 +361,7 @@ # define GLM_DEPRECATED __declspec(deprecated) # define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name #elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG | GLM_COMPILER_INTEL) -# if GLM_LANG & GLM_LANG_CXX14_FLAG -# define GLM_DEPRECATED [[deprecated]] -# else -# define GLM_DEPRECATED __attribute__((__deprecated__)) -# endif +# define GLM_DEPRECATED __attribute__((__deprecated__)) # define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment))) #elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP) # define GLM_DEPRECATED @@ -639,31 +405,6 @@ namespace glm # endif }//namespace glm -/////////////////////////////////////////////////////////////////////////////////// -// constexpr - -#if GLM_HAS_CONSTEXPR -# define GLM_CONFIG_CONSTEXP GLM_ENABLE - - namespace glm - { - template - constexpr std::size_t countof(T const (&)[N]) - { - return N; - } - }//namespace glm -# define GLM_COUNTOF(arr) glm::countof(arr) -#elif defined(_MSC_VER) -# define GLM_CONFIG_CONSTEXP GLM_DISABLE - -# define GLM_COUNTOF(arr) _countof(arr) -#else -# define GLM_CONFIG_CONSTEXP GLM_DISABLE - -# define GLM_COUNTOF(arr) sizeof(arr) / sizeof(arr[0]) -#endif - /////////////////////////////////////////////////////////////////////////////////// // uint @@ -695,42 +436,20 @@ namespace detail /////////////////////////////////////////////////////////////////////////////////// // 64-bit int -#if GLM_HAS_EXTENDED_INTEGER_TYPE -# include -#endif +#include namespace glm{ namespace detail { -# if GLM_HAS_EXTENDED_INTEGER_TYPE - typedef std::uint64_t uint64; - typedef std::int64_t int64; -# elif (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) // C99 detected, 64 bit types available - typedef uint64_t uint64; - typedef int64_t int64; -# elif GLM_COMPILER & GLM_COMPILER_VC - typedef unsigned __int64 uint64; - typedef signed __int64 int64; -# elif GLM_COMPILER & GLM_COMPILER_GCC -# pragma GCC diagnostic ignored "-Wlong-long" - __extension__ typedef unsigned long long uint64; - __extension__ typedef signed long long int64; -# elif (GLM_COMPILER & GLM_COMPILER_CLANG) -# pragma clang diagnostic ignored "-Wc++11-long-long" - typedef unsigned long long uint64; - typedef signed long long int64; -# else//unknown compiler - typedef unsigned long long uint64; - typedef signed long long int64; -# endif + typedef std::uint64_t uint64; + typedef std::int64_t int64; }//namespace detail }//namespace glm /////////////////////////////////////////////////////////////////////////////////// // make_unsigned -#if GLM_HAS_MAKE_SIGNED -# include +#include namespace glm{ namespace detail @@ -739,82 +458,6 @@ namespace detail }//namespace detail }//namespace glm -#else - -namespace glm{ -namespace detail -{ - template - struct make_unsigned - {}; - - template<> - struct make_unsigned - { - typedef unsigned char type; - }; - - template<> - struct make_unsigned - { - typedef unsigned char type; - }; - - template<> - struct make_unsigned - { - typedef unsigned short type; - }; - - template<> - struct make_unsigned - { - typedef unsigned int type; - }; - - template<> - struct make_unsigned - { - typedef unsigned long type; - }; - - template<> - struct make_unsigned - { - typedef uint64 type; - }; - - template<> - struct make_unsigned - { - typedef unsigned char type; - }; - - template<> - struct make_unsigned - { - typedef unsigned short type; - }; - - template<> - struct make_unsigned - { - typedef unsigned int type; - }; - - template<> - struct make_unsigned - { - typedef unsigned long type; - }; - - template<> - struct make_unsigned - { - typedef uint64 type; - }; -}//namespace detail -}//namespace glm #endif /////////////////////////////////////////////////////////////////////////////////// @@ -853,17 +496,9 @@ namespace detail /////////////////////////////////////////////////////////////////////////////////// // Configure the use of defaulted function -#if GLM_HAS_DEFAULTED_FUNCTIONS -# define GLM_CONFIG_DEFAULTED_FUNCTIONS GLM_ENABLE -# define GLM_DEFAULT = default -#else -# define GLM_CONFIG_DEFAULTED_FUNCTIONS GLM_DISABLE -# define GLM_DEFAULT -#endif - -#if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INIT_DISABLE && GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_ENABLE +#if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INIT_DISABLE # define GLM_CONFIG_DEFAULTED_DEFAULT_CTOR GLM_ENABLE -# define GLM_DEFAULT_CTOR GLM_DEFAULT +# define GLM_DEFAULT_CTOR = default #else # define GLM_CONFIG_DEFAULTED_DEFAULT_CTOR GLM_DISABLE # define GLM_DEFAULT_CTOR @@ -963,11 +598,11 @@ namespace detail /////////////////////////////////////////////////////////////////////////////////// // Check inclusions of different versions of GLM - +/* #elif ((GLM_SETUP_INCLUDED != GLM_VERSION) && !defined(GLM_FORCE_IGNORE_VERSION)) # error "GLM error: A different version of GLM is already included. Define GLM_FORCE_IGNORE_VERSION before including GLM headers to ignore this error." #elif GLM_SETUP_INCLUDED == GLM_VERSION - +*/ /////////////////////////////////////////////////////////////////////////////////// // Messages diff --git a/glm/detail/type_float.hpp b/glm/detail/type_float.hpp index c8037ebd7..1df63ec67 100644 --- a/glm/detail/type_float.hpp +++ b/glm/detail/type_float.hpp @@ -21,18 +21,18 @@ namespace detail typedef int int_type; typedef float float_type; - GLM_CONSTEXPR float_t(float_type Num = 0.0f) : f(Num) {} + constexpr float_t(float_type Num = 0.0f) : f(Num) {} - GLM_CONSTEXPR float_t& operator=(float_t const& x) + constexpr float_t& operator=(float_t const& x) { f = x.f; return *this; } // Portable extraction of components. - GLM_CONSTEXPR bool negative() const { return i < 0; } - GLM_CONSTEXPR int_type mantissa() const { return i & ((1 << 23) - 1); } - GLM_CONSTEXPR int_type exponent() const { return (i >> 23) & ((1 << 8) - 1); } + constexpr bool negative() const { return i < 0; } + constexpr int_type mantissa() const { return i & ((1 << 23) - 1); } + constexpr int_type exponent() const { return (i >> 23) & ((1 << 8) - 1); } int_type i; float_type f; @@ -44,18 +44,18 @@ namespace detail typedef detail::int64 int_type; typedef double float_type; - GLM_CONSTEXPR float_t(float_type Num = static_cast(0)) : f(Num) {} + constexpr float_t(float_type Num = static_cast(0)) : f(Num) {} - GLM_CONSTEXPR float_t& operator=(float_t const& x) + constexpr float_t& operator=(float_t const& x) { f = x.f; return *this; } // Portable extraction of components. - GLM_CONSTEXPR bool negative() const { return i < 0; } - GLM_CONSTEXPR int_type mantissa() const { return i & ((int_type(1) << 52) - 1); } - GLM_CONSTEXPR int_type exponent() const { return (i >> 52) & ((int_type(1) << 11) - 1); } + constexpr bool negative() const { return i < 0; } + constexpr int_type mantissa() const { return i & ((int_type(1) << 52) - 1); } + constexpr int_type exponent() const { return (i >> 52) & ((int_type(1) << 11) - 1); } int_type i; float_type f; diff --git a/glm/detail/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp index 82e9f66cd..8374fe512 100644 --- a/glm/detail/type_mat2x2.hpp +++ b/glm/detail/type_mat2x2.hpp @@ -25,14 +25,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 2; } + GLM_FUNC_DECL static constexpr length_type length() { return 2; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<2, 2, T, P> const& m); @@ -73,103 +73,103 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator=(mat<2, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator=(mat<2, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator+=(mat<2, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator+=(mat<2, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator-=(mat<2, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator-=(mat<2, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator*=(mat<2, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator*=(mat<2, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator/=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator/=(mat<2, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator/=(mat<2, 2, U, Q> const& m); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator++ (); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 2, T, Q> & operator-- (); - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator++ (); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 2, T, Q> & operator-- (); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(T scalar, mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(T scalar, mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(T scalar, mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(T scalar, mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(T scalar, mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(T scalar, mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type operator*(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::col_type operator*(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::row_type operator*(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::row_type operator*(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator/(T scalar, mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator/(T scalar, mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type operator/(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::col_type operator/(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 2, T, Q>::row_type operator/(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<2, 2, T, Q>::row_type operator/(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2); } //namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat2x2.inl b/glm/detail/type_mat2x2.inl index afb2b31e5..08d17881a 100644 --- a/glm/detail/type_mat2x2.inl +++ b/glm/detail/type_mat2x2.inl @@ -6,225 +6,114 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat() -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST - : value{col_type(1, 0), col_type(0, 1)} -# endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - this->value[0] = col_type(1, 0); - this->value[1] = col_type(0, 1); -# endif - } + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<2, 2, T, Q>::mat() + : value{col_type(1, 0), col_type(0, 1)} + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<2, 2, T, P> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<2, 2, T, P> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(T scalar) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(scalar, 0), col_type(0, scalar)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(scalar, 0); - this->value[1] = col_type(0, scalar); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(T scalar) + : value{col_type(scalar, 0), col_type(0, scalar)} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat ( T const& x0, T const& y0, T const& x1, T const& y1 ) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(x0, y0), col_type(x1, y1)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0); - this->value[1] = col_type(x1, y1); -# endif - } + : value{col_type(x0, y0), col_type(x1, y1)} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(col_type const& v0, col_type const& v1) -# if GLM_HAS_INITIALIZER_LISTS - : value{v0, v1} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(col_type const& v0, col_type const& v1) + : value{v0, v1} + {} // -- Conversion constructors -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat ( X1 const& x1, Y1 const& y1, X2 const& x2, Y2 const& y2 ) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(static_cast(x1), value_type(y1)), col_type(static_cast(x2), value_type(y2)) } -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(static_cast(x1), value_type(y1)); - this->value[1] = col_type(static_cast(x2), value_type(y2)); -# endif - } + : value{col_type(static_cast(x1), value_type(y1)), col_type(static_cast(x2), value_type(y2)) } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(vec<2, V1, Q> const& v1, vec<2, V2, Q> const& v2) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(v1), col_type(v2)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(vec<2, V1, Q> const& v1, vec<2, V2, Q> const& v2) + : value{col_type(v1), col_type(v2)} + {} // -- mat2x2 matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<2, 2, U, P> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<2, 2, U, P> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<3, 3, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<3, 3, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<4, 4, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<4, 4, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<2, 3, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<2, 3, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<3, 2, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<3, 2, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<2, 4, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<2, 4, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<4, 2, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<4, 2, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<3, 4, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<3, 4, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>::mat(mat<4, 3, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>::mat(mat<4, 3, T, Q> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<2, 2, T, Q>::col_type& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type const& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<2, 2, T, Q>::col_type const& mat<2, 2, T, Q>::operator[](typename mat<2, 2, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -234,7 +123,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator=(mat<2, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator=(mat<2, 2, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -243,7 +132,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator+=(U scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator+=(U scalar) { this->value[0] += scalar; this->value[1] += scalar; @@ -252,7 +141,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator+=(mat<2, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator+=(mat<2, 2, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -261,7 +150,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator-=(U scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator-=(U scalar) { this->value[0] -= scalar; this->value[1] -= scalar; @@ -270,7 +159,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator-=(mat<2, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator-=(mat<2, 2, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -279,7 +168,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator*=(U scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator*=(U scalar) { this->value[0] *= scalar; this->value[1] *= scalar; @@ -288,14 +177,14 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator*=(mat<2, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator*=(mat<2, 2, U, Q> const& m) { return (*this = *this * m); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator/=(U scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator/=(U scalar) { this->value[0] /= scalar; this->value[1] /= scalar; @@ -304,7 +193,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator/=(mat<2, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator/=(mat<2, 2, U, Q> const& m) { return *this *= inverse(m); } @@ -312,7 +201,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -320,7 +209,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q>& mat<2, 2, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -328,7 +217,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> mat<2, 2, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> mat<2, 2, T, Q>::operator++(int) { mat<2, 2, T, Q> Result(*this); ++*this; @@ -336,7 +225,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> mat<2, 2, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> mat<2, 2, T, Q>::operator--(int) { mat<2, 2, T, Q> Result(*this); --*this; @@ -346,13 +235,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m) { return mat<2, 2, T, Q>( -m[0], @@ -362,7 +251,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m, T scalar) { return mat<2, 2, T, Q>( m[0] + scalar, @@ -370,7 +259,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator+(T scalar, mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator+(T scalar, mat<2, 2, T, Q> const& m) { return mat<2, 2, T, Q>( m[0] + scalar, @@ -378,7 +267,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator+(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return mat<2, 2, T, Q>( m1[0] + m2[0], @@ -386,7 +275,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m, T scalar) { return mat<2, 2, T, Q>( m[0] - scalar, @@ -394,7 +283,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator-(T scalar, mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator-(T scalar, mat<2, 2, T, Q> const& m) { return mat<2, 2, T, Q>( scalar - m[0], @@ -402,7 +291,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator-(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return mat<2, 2, T, Q>( m1[0] - m2[0], @@ -410,7 +299,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m, T scalar) { return mat<2, 2, T, Q>( m[0] * scalar, @@ -418,7 +307,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator*(T scalar, mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator*(T scalar, mat<2, 2, T, Q> const& m) { return mat<2, 2, T, Q>( m[0] * scalar, @@ -426,7 +315,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<2, 2, T, Q>::col_type operator* ( mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v @@ -438,7 +327,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::row_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<2, 2, T, Q>::row_type operator* ( typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m @@ -450,7 +339,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return mat<2, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -460,7 +349,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return mat<3, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -472,7 +361,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator*(mat<2, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return mat<4, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -486,7 +375,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m, T scalar) { return mat<2, 2, T, Q>( m[0] / scalar, @@ -494,7 +383,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator/(T scalar, mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator/(T scalar, mat<2, 2, T, Q> const& m) { return mat<2, 2, T, Q>( scalar / m[0], @@ -502,19 +391,19 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::col_type operator/(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v) + GLM_FUNC_QUALIFIER constexpr typename mat<2, 2, T, Q>::col_type operator/(mat<2, 2, T, Q> const& m, typename mat<2, 2, T, Q>::row_type const& v) { return inverse(m) * v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 2, T, Q>::row_type operator/(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr typename mat<2, 2, T, Q>::row_type operator/(typename mat<2, 2, T, Q>::col_type const& v, mat<2, 2, T, Q> const& m) { return v * inverse(m); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator/(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { mat<2, 2, T, Q> m1_copy(m1); return m1_copy /= m2; @@ -523,13 +412,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<2, 2, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]); } diff --git a/glm/detail/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp index b65d1c5c4..71b400657 100644 --- a/glm/detail/type_mat2x3.hpp +++ b/glm/detail/type_mat2x3.hpp @@ -26,14 +26,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 2; } + GLM_FUNC_DECL static constexpr length_type length() { return 2; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<2, 3, T, P> const& m); @@ -74,84 +74,84 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator=(mat<2, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator=(mat<2, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator+=(mat<2, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator+=(mat<2, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator-=(mat<2, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator-=(mat<2, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator/=(U s); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator++ (); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 3, T, Q> & operator-- (); - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator++ (); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 3, T, Q> & operator-- (); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(T scalar, mat<2, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(T scalar, mat<2, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type operator*(mat<2, 3, T, Q> const& m, typename mat<2, 3, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<2, 3, T, Q>::col_type operator*(mat<2, 3, T, Q> const& m, typename mat<2, 3, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 3, T, Q>::row_type operator*(typename mat<2, 3, T, Q>::col_type const& v, mat<2, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<2, 3, T, Q>::row_type operator*(typename mat<2, 3, T, Q>::col_type const& v, mat<2, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<2, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<3, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<4, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator/(mat<2, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator/(mat<2, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator/(T scalar, mat<2, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator/(T scalar, mat<2, 3, T, Q> const& m); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat2x3.inl b/glm/detail/type_mat2x3.inl index c29666c3b..c082c3d2d 100644 --- a/glm/detail/type_mat2x3.inl +++ b/glm/detail/type_mat2x3.inl @@ -4,45 +4,24 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat() -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST - : value{col_type(1, 0, 0), col_type(0, 1, 0)} -# endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - this->value[0] = col_type(1, 0, 0); - this->value[1] = col_type(0, 1, 0); -# endif - } + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<2, 3, T, Q>::mat() + : value{col_type(1, 0, 0), col_type(0, 1, 0)} + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<2, 3, T, P> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m.value[0]; - this->value[1] = m.value[1]; -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<2, 3, T, P> const& m) + : value{col_type(m[0]), col_type(m[1])} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(T scalar) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(scalar, 0, 0), col_type(0, scalar, 0)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(scalar, 0, 0); - this->value[1] = col_type(0, scalar, 0); -# endif - } + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(T scalar) + : value{col_type(scalar, 0, 0), col_type(0, scalar, 0)} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat ( T x0, T y0, T z0, T x1, T y1, T z1 @@ -50,24 +29,14 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0, z0), col_type(x1, y1, z1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0); - this->value[1] = col_type(x1, y1, z1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(col_type const& v0, col_type const& v1) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(col_type const& v0, col_type const& v1) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v0); - this->value[1] = col_type(v1); -# endif - } + {} // -- Conversion constructors -- @@ -75,7 +44,7 @@ namespace glm template< typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat ( X1 x1, Y1 y1, Z1 z1, X2 x2, Y2 y2, Z2 z2 @@ -83,148 +52,93 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x1, y1, z1), col_type(x2, y2, z2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x1, y1, z1); - this->value[1] = col_type(x2, y2, z2); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); -# endif - } + {} // -- Matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<2, 3, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<2, 3, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<3, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<3, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type & mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<2, 3, T, Q>::col_type & mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type const& mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<2, 3, T, Q>::col_type const& mat<2, 3, T, Q>::operator[](typename mat<2, 3, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -234,7 +148,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator=(mat<2, 3, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -243,7 +157,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -252,7 +166,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator+=(mat<2, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator+=(mat<2, 3, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -261,7 +175,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -270,7 +184,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator-=(mat<2, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator-=(mat<2, 3, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -279,7 +193,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q>& mat<2, 3, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -288,7 +202,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -298,7 +212,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -306,7 +220,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> & mat<2, 3, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -314,7 +228,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> mat<2, 3, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> mat<2, 3, T, Q>::operator++(int) { mat<2, 3, T, Q> Result(*this); ++*this; @@ -322,7 +236,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> mat<2, 3, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> mat<2, 3, T, Q>::operator--(int) { mat<2, 3, T, Q> Result(*this); --*this; @@ -332,13 +246,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m) { return mat<2, 3, T, Q>( -m[0], @@ -348,7 +262,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m, T scalar) { return mat<2, 3, T, Q>( m[0] + scalar, @@ -356,7 +270,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator+(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return mat<2, 3, T, Q>( m1[0] + m2[0], @@ -364,7 +278,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m, T scalar) { return mat<2, 3, T, Q>( m[0] - scalar, @@ -372,7 +286,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator-(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return mat<2, 3, T, Q>( m1[0] - m2[0], @@ -380,7 +294,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m, T scalar) { return mat<2, 3, T, Q>( m[0] * scalar, @@ -388,7 +302,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator*(T scalar, mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator*(T scalar, mat<2, 3, T, Q> const& m) { return mat<2, 3, T, Q>( m[0] * scalar, @@ -396,7 +310,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::col_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<2, 3, T, Q>::col_type operator* ( mat<2, 3, T, Q> const& m, typename mat<2, 3, T, Q>::row_type const& v) @@ -408,7 +322,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 3, T, Q>::row_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<2, 3, T, Q>::row_type operator* ( typename mat<2, 3, T, Q>::col_type const& v, mat<2, 3, T, Q> const& m) @@ -419,7 +333,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return mat<2, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -431,7 +345,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return mat<3, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -446,7 +360,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator*(mat<2, 3, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return mat<4, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -464,7 +378,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator/(mat<2, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator/(mat<2, 3, T, Q> const& m, T scalar) { return mat<2, 3, T, Q>( m[0] / scalar, @@ -472,7 +386,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator/(T scalar, mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator/(T scalar, mat<2, 3, T, Q> const& m) { return mat<2, 3, T, Q>( scalar / m[0], @@ -482,13 +396,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<2, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]); } diff --git a/glm/detail/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp index 7ca43e59a..e0fa42dc9 100644 --- a/glm/detail/type_mat2x4.hpp +++ b/glm/detail/type_mat2x4.hpp @@ -26,14 +26,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 2; } + GLM_FUNC_DECL static constexpr length_type length() { return 2; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<2, 4, T, P> const& m); @@ -76,84 +76,84 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator=(mat<2, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator=(mat<2, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator+=(mat<2, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator+=(mat<2, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator-=(mat<2, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator-=(mat<2, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator/=(U s); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator++ (); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<2, 4, T, Q> & operator-- (); - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator++ (); + GLM_FUNC_DISCARD_DECL constexpr mat<2, 4, T, Q> & operator-- (); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(T scalar, mat<2, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(T scalar, mat<2, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type operator*(mat<2, 4, T, Q> const& m, typename mat<2, 4, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<2, 4, T, Q>::col_type operator*(mat<2, 4, T, Q> const& m, typename mat<2, 4, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<2, 4, T, Q>::row_type operator*(typename mat<2, 4, T, Q>::col_type const& v, mat<2, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<2, 4, T, Q>::row_type operator*(typename mat<2, 4, T, Q>::col_type const& v, mat<2, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<4, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<2, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<2, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<3, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator/(mat<2, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator/(mat<2, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator/(T scalar, mat<2, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator/(T scalar, mat<2, 4, T, Q> const& m); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat2x4.inl b/glm/detail/type_mat2x4.inl index bde07ced0..7e31066f5 100644 --- a/glm/detail/type_mat2x4.inl +++ b/glm/detail/type_mat2x4.inl @@ -4,45 +4,30 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<2, 4, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0)} # endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - this->value[0] = col_type(1, 0, 0, 0); - this->value[1] = col_type(0, 1, 0, 0); -# endif - } + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<2, 4, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<2, 4, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0, 0, 0), col_type(0, s, 0, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0, 0, 0); - this->value[1] = col_type(0, s, 0, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat ( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1 @@ -50,24 +35,14 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0, z0, w0), col_type(x1, y1, z1, w1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0, w0); - this->value[1] = col_type(x1, y1, z1, w1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(col_type const& v0, col_type const& v1) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(col_type const& v0, col_type const& v1) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; -# endif - } + {} // -- Conversion constructors -- @@ -75,7 +50,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 mat<2, 4, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat ( X1 x1, Y1 y1, Z1 z1, W1 w1, X2 x2, Y2 y2, Z2 z2, W2 w2 @@ -85,31 +60,42 @@ namespace glm col_type(x1, y1, z1, w1), col_type(x2, y2, z2, w2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x1, y1, z1, w1); - this->value[1] = col_type(x2, y2, z2, w2); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(vec<4, V1, Q> const& v1, vec<4, V2, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(vec<4, V1, Q> const& v1, vec<4, V2, Q> const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); -# endif - } + {} // -- Matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<2, 4, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<2, 4, U, P> const& m) +# if GLM_HAS_INITIALIZER_LISTS + : value{col_type(m[0]), col_type(m[1])} +# endif + {} + + template + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<2, 2, T, Q> const& m) +# if GLM_HAS_INITIALIZER_LISTS + : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0)} +# endif + {} + + template + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<3, 3, T, Q> const& m) +# if GLM_HAS_INITIALIZER_LISTS + : value{col_type(m[0], 0), col_type(m[1], 0)} +# endif + {} + + template + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif @@ -121,112 +107,51 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<2, 2, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0, 0); - this->value[1] = col_type(m[1], 0, 0); -# endif - } - - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<3, 2, T, Q> const& m) +# if GLM_HAS_INITIALIZER_LISTS + : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0)} +# endif + {} + + template + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<2, 3, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0], 0), col_type(m[1], 0)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); -# endif - } - - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0, 0); - this->value[1] = col_type(m[1], 0, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<3, 4, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0]), col_type(m[1])} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); -# endif - } - - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<4, 2, T, Q> const& m) -# if GLM_HAS_INITIALIZER_LISTS - : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0, 0); - this->value[1] = col_type(m[1], 0, 0); -# endif - } - - template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type & mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<2, 4, T, Q>::col_type & mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type const& mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<2, 4, T, Q>::col_type const& mat<2, 4, T, Q>::operator[](typename mat<2, 4, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -236,7 +161,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator=(mat<2, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator=(mat<2, 4, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -245,7 +170,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -254,7 +179,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator+=(mat<2, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator+=(mat<2, 4, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -263,7 +188,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -272,7 +197,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator-=(mat<2, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator-=(mat<2, 4, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -281,7 +206,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -290,7 +215,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> & mat<2, 4, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> & mat<2, 4, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -300,7 +225,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -308,7 +233,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q>& mat<2, 4, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -316,7 +241,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> mat<2, 4, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> mat<2, 4, T, Q>::operator++(int) { mat<2, 4, T, Q> Result(*this); ++*this; @@ -324,7 +249,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> mat<2, 4, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> mat<2, 4, T, Q>::operator--(int) { mat<2, 4, T, Q> Result(*this); --*this; @@ -334,13 +259,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m) { return mat<2, 4, T, Q>( -m[0], @@ -350,7 +275,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m, T scalar) { return mat<2, 4, T, Q>( m[0] + scalar, @@ -358,7 +283,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator+(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return mat<2, 4, T, Q>( m1[0] + m2[0], @@ -366,7 +291,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m, T scalar) { return mat<2, 4, T, Q>( m[0] - scalar, @@ -374,7 +299,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator-(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return mat<2, 4, T, Q>( m1[0] - m2[0], @@ -382,7 +307,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m, T scalar) { return mat<2, 4, T, Q>( m[0] * scalar, @@ -390,7 +315,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator*(T scalar, mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator*(T scalar, mat<2, 4, T, Q> const& m) { return mat<2, 4, T, Q>( m[0] * scalar, @@ -398,7 +323,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::col_type operator*(mat<2, 4, T, Q> const& m, typename mat<2, 4, T, Q>::row_type const& v) + GLM_FUNC_QUALIFIER constexpr typename mat<2, 4, T, Q>::col_type operator*(mat<2, 4, T, Q> const& m, typename mat<2, 4, T, Q>::row_type const& v) { return typename mat<2, 4, T, Q>::col_type( m[0][0] * v.x + m[1][0] * v.y, @@ -408,7 +333,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<2, 4, T, Q>::row_type operator*(typename mat<2, 4, T, Q>::col_type const& v, mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr typename mat<2, 4, T, Q>::row_type operator*(typename mat<2, 4, T, Q>::col_type const& v, mat<2, 4, T, Q> const& m) { return typename mat<2, 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], @@ -416,7 +341,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return mat<4, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -438,7 +363,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<2, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<2, 2, T, Q> const& m2) { return mat<2, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -452,7 +377,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator*(mat<2, 4, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return mat<3, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1], @@ -470,7 +395,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator/(mat<2, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator/(mat<2, 4, T, Q> const& m, T scalar) { return mat<2, 4, T, Q>( m[0] / scalar, @@ -478,7 +403,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator/(T scalar, mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator/(T scalar, mat<2, 4, T, Q> const& m) { return mat<2, 4, T, Q>( scalar / m[0], @@ -488,13 +413,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<2, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]); } diff --git a/glm/detail/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp index 0249befd4..b43a696f6 100644 --- a/glm/detail/type_mat3x2.hpp +++ b/glm/detail/type_mat3x2.hpp @@ -26,14 +26,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 3; } + GLM_FUNC_DECL static constexpr length_type length() { return 3; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<3, 2, T, P> const& m); @@ -81,84 +81,84 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator=(mat<3, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator=(mat<3, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator+=(mat<3, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator+=(mat<3, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator-=(mat<3, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator-=(mat<3, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator/=(U s); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator++ (); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 2, T, Q> & operator-- (); - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator++ (); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 2, T, Q> & operator-- (); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(T scalar, mat<3, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(T scalar, mat<3, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type operator*(mat<3, 2, T, Q> const& m, typename mat<3, 2, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<3, 2, T, Q>::col_type operator*(mat<3, 2, T, Q> const& m, typename mat<3, 2, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 2, T, Q>::row_type operator*(typename mat<3, 2, T, Q>::col_type const& v, mat<3, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<3, 2, T, Q>::row_type operator*(typename mat<3, 2, T, Q>::col_type const& v, mat<3, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<2, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<3, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<4, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator/(mat<3, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator/(mat<3, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator/(T scalar, mat<3, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator/(T scalar, mat<3, 2, T, Q> const& m); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2); }//namespace glm diff --git a/glm/detail/type_mat3x2.inl b/glm/detail/type_mat3x2.inl index dc7654d1d..bb6603a59 100644 --- a/glm/detail/type_mat3x2.inl +++ b/glm/detail/type_mat3x2.inl @@ -4,48 +4,30 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<3, 2, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0), col_type(0, 1), col_type(0, 0)} # endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - this->value[0] = col_type(1, 0); - this->value[1] = col_type(0, 1); - this->value[2] = col_type(0, 0); -# endif - } + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<3, 2, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<3, 2, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0), col_type(0, s), col_type(0, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0); - this->value[1] = col_type(0, s); - this->value[2] = col_type(0, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat ( T x0, T y0, T x1, T y1, @@ -54,26 +36,14 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0), col_type(x1, y1), col_type(x2, y2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0); - this->value[1] = col_type(x1, y1); - this->value[2] = col_type(x2, y2); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; - this->value[2] = v2; -# endif - } + {} // -- Conversion constructors -- @@ -82,7 +52,7 @@ namespace glm typename X0, typename Y0, typename X1, typename Y1, typename X2, typename Y2> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat ( X0 x0, Y0 y0, X1 x1, Y1 y1, @@ -91,159 +61,93 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0), col_type(x1, y1), col_type(x2, y2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0); - this->value[1] = col_type(x1, y1); - this->value[2] = col_type(x2, y2); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(vec<2, V0, Q> const& v0, vec<2, V1, Q> const& v1, vec<2, V2, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(vec<2, V0, Q> const& v0, vec<2, V1, Q> const& v1, vec<2, V2, Q> const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v0); - this->value[1] = col_type(v1); - this->value[2] = col_type(v2); -# endif - } + {} // -- Matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<3, 2, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<3, 2, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<3, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type & mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<3, 2, T, Q>::col_type & mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type const& mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<3, 2, T, Q>::col_type const& mat<3, 2, T, Q>::operator[](typename mat<3, 2, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -253,7 +157,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator=(mat<3, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator=(mat<3, 2, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -263,7 +167,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -273,7 +177,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator+=(mat<3, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator+=(mat<3, 2, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -283,7 +187,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -293,7 +197,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator-=(mat<3, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator-=(mat<3, 2, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -303,7 +207,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -313,7 +217,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> & mat<3, 2, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> & mat<3, 2, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -324,7 +228,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -333,7 +237,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q>& mat<3, 2, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -342,7 +246,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> mat<3, 2, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> mat<3, 2, T, Q>::operator++(int) { mat<3, 2, T, Q> Result(*this); ++*this; @@ -350,7 +254,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> mat<3, 2, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> mat<3, 2, T, Q>::operator--(int) { mat<3, 2, T, Q> Result(*this); --*this; @@ -360,13 +264,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m) { return mat<3, 2, T, Q>( -m[0], @@ -377,7 +281,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m, T scalar) { return mat<3, 2, T, Q>( m[0] + scalar, @@ -386,7 +290,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator+(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return mat<3, 2, T, Q>( m1[0] + m2[0], @@ -395,7 +299,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m, T scalar) { return mat<3, 2, T, Q>( m[0] - scalar, @@ -404,7 +308,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator-(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return mat<3, 2, T, Q>( m1[0] - m2[0], @@ -413,7 +317,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m, T scalar) { return mat<3, 2, T, Q>( m[0] * scalar, @@ -422,7 +326,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator*(T scalar, mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator*(T scalar, mat<3, 2, T, Q> const& m) { return mat<3, 2, T, Q>( m[0] * scalar, @@ -431,7 +335,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::col_type operator*(mat<3, 2, T, Q> const& m, typename mat<3, 2, T, Q>::row_type const& v) + GLM_FUNC_QUALIFIER constexpr typename mat<3, 2, T, Q>::col_type operator*(mat<3, 2, T, Q> const& m, typename mat<3, 2, T, Q>::row_type const& v) { return typename mat<3, 2, T, Q>::col_type( m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z, @@ -439,7 +343,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 2, T, Q>::row_type operator*(typename mat<3, 2, T, Q>::col_type const& v, mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr typename mat<3, 2, T, Q>::row_type operator*(typename mat<3, 2, T, Q>::col_type const& v, mat<3, 2, T, Q> const& m) { return typename mat<3, 2, T, Q>::row_type( v.x * m[0][0] + v.y * m[0][1], @@ -448,7 +352,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return mat<2, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -458,7 +362,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return mat<3, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -470,7 +374,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator*(mat<3, 2, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return mat<4, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -484,7 +388,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator/(mat<3, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator/(mat<3, 2, T, Q> const& m, T scalar) { return mat<3, 2, T, Q>( m[0] / scalar, @@ -493,7 +397,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator/(T scalar, mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator/(T scalar, mat<3, 2, T, Q> const& m) { return mat<3, 2, T, Q>( scalar / m[0], @@ -504,13 +408,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<3, 2, T, Q> const& m1, mat<3, 2, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]); } diff --git a/glm/detail/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp index e4cbbdced..1eb327916 100644 --- a/glm/detail/type_mat3x3.hpp +++ b/glm/detail/type_mat3x3.hpp @@ -25,14 +25,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 3; } + GLM_FUNC_DECL static constexpr length_type length() { return 3; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<3, 3, T, P> const& m); @@ -80,103 +80,103 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator=(mat<3, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator=(mat<3, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator+=(mat<3, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator+=(mat<3, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator-=(mat<3, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator-=(mat<3, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator*=(mat<3, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator*=(mat<3, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator/=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator/=(mat<3, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator/=(mat<3, 3, U, Q> const& m); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 3, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 3, T, Q> & operator--(); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(T scalar, mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(T scalar, mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(T scalar, mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(T scalar, mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(T scalar, mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(T scalar, mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type operator*(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::col_type operator*(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::row_type operator*(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::row_type operator*(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator/(T scalar, mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator/(T scalar, mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type operator/(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::col_type operator/(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 3, T, Q>::row_type operator/(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<3, 3, T, Q>::row_type operator/(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat3x3.inl b/glm/detail/type_mat3x3.inl index d81bdf299..b97d5f110 100644 --- a/glm/detail/type_mat3x3.inl +++ b/glm/detail/type_mat3x3.inl @@ -7,48 +7,30 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<3, 3, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0, 0), col_type(0, 1, 0), col_type(0, 0, 1)} # endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - this->value[0] = col_type(1, 0, 0); - this->value[1] = col_type(0, 1, 0); - this->value[2] = col_type(0, 0, 1); -# endif - } + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<3, 3, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<3, 3, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0, 0), col_type(0, s, 0), col_type(0, 0, s)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0, 0); - this->value[1] = col_type(0, s, 0); - this->value[2] = col_type(0, 0, s); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat ( T x0, T y0, T z0, T x1, T y1, T z1, @@ -57,26 +39,14 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0, z0), col_type(x1, y1, z1), col_type(x2, y2, z2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0); - this->value[1] = col_type(x1, y1, z1); - this->value[2] = col_type(x2, y2, z2); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v0); - this->value[1] = col_type(v1); - this->value[2] = col_type(v2); -# endif - } + {} // -- Conversion constructors -- @@ -85,7 +55,7 @@ namespace glm typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2, typename X3, typename Y3, typename Z3> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat ( X1 x1, Y1 y1, Z1 z1, X2 x2, Y2 y2, Z2 z2, @@ -94,159 +64,93 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x1, y1, z1), col_type(x2, y2, z2), col_type(x3, y3, z3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x1, y1, z1); - this->value[1] = col_type(x2, y2, z2); - this->value[2] = col_type(x3, y3, z3); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2, vec<3, V3, Q> const& v3) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2, vec<3, V3, Q> const& v3) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v1), col_type(v2), col_type(v3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); - this->value[2] = col_type(v3); -# endif - } + {} // -- Matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<3, 3, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<3, 3, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<3, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type & mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<3, 3, T, Q>::col_type & mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type const& mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<3, 3, T, Q>::col_type const& mat<3, 3, T, Q>::operator[](typename mat<3, 3, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -256,7 +160,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator=(mat<3, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator=(mat<3, 3, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -266,7 +170,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -276,7 +180,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator+=(mat<3, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator+=(mat<3, 3, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -286,7 +190,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -296,7 +200,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator-=(mat<3, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator-=(mat<3, 3, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -306,7 +210,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator*=(U s) { col_type sv(s); this->value[0] *= sv; @@ -317,14 +221,14 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator*=(mat<3, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator*=(mat<3, 3, U, Q> const& m) { return (*this = *this * m); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -334,7 +238,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator/=(mat<3, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator/=(mat<3, 3, U, Q> const& m) { return *this *= inverse(m); } @@ -342,7 +246,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -351,7 +255,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> & mat<3, 3, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -360,7 +264,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> mat<3, 3, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> mat<3, 3, T, Q>::operator++(int) { mat<3, 3, T, Q> Result(*this); ++*this; @@ -368,7 +272,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> mat<3, 3, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> mat<3, 3, T, Q>::operator--(int) { mat<3, 3, T, Q> Result(*this); --*this; @@ -378,13 +282,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m) { return mat<3, 3, T, Q>( -m[0], @@ -395,7 +299,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m, T scalar) { return mat<3, 3, T, Q>( m[0] + scalar, @@ -404,7 +308,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator+(T scalar, mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator+(T scalar, mat<3, 3, T, Q> const& m) { return mat<3, 3, T, Q>( m[0] + scalar, @@ -413,7 +317,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator+(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return mat<3, 3, T, Q>( m1[0] + m2[0], @@ -422,7 +326,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m, T scalar) { return mat<3, 3, T, Q>( m[0] - scalar, @@ -431,7 +335,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator-(T scalar, mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator-(T scalar, mat<3, 3, T, Q> const& m) { return mat<3, 3, T, Q>( scalar - m[0], @@ -440,7 +344,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator-(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return mat<3, 3, T, Q>( m1[0] - m2[0], @@ -449,7 +353,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m, T scalar) { return mat<3, 3, T, Q>( m[0] * scalar, @@ -458,7 +362,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator*(T scalar, mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator*(T scalar, mat<3, 3, T, Q> const& m) { return mat<3, 3, T, Q>( m[0] * scalar, @@ -467,14 +371,14 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type operator*(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v) + GLM_FUNC_QUALIFIER constexpr typename mat<3, 3, T, Q>::col_type operator*(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v) { return typename mat<3, 3, T, Q>::col_type( m[0] * splatX(v) + m[1] * splatY(v) + m[2] * splatZ(v)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::row_type operator*(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr typename mat<3, 3, T, Q>::row_type operator*(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m) { return typename mat<3, 3, T, Q>::row_type( dot(m[0], v), @@ -543,13 +447,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return detail::mul3x3::value>::call(m1, m2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return mat<2, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -561,7 +465,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator*(mat<3, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return mat<4, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -579,7 +483,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m, T scalar) { return mat<3, 3, T, Q>( m[0] / scalar, @@ -588,7 +492,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator/(T scalar, mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator/(T scalar, mat<3, 3, T, Q> const& m) { return mat<3, 3, T, Q>( scalar / m[0], @@ -597,19 +501,19 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::col_type operator/(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v) + GLM_FUNC_QUALIFIER constexpr typename mat<3, 3, T, Q>::col_type operator/(mat<3, 3, T, Q> const& m, typename mat<3, 3, T, Q>::row_type const& v) { return inverse(m) * v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 3, T, Q>::row_type operator/(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr typename mat<3, 3, T, Q>::row_type operator/(typename mat<3, 3, T, Q>::col_type const& v, mat<3, 3, T, Q> const& m) { return v * inverse(m); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator/(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { mat<3, 3, T, Q> m1_copy(m1); return m1_copy /= m2; @@ -618,13 +522,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<3, 3, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]); } diff --git a/glm/detail/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp index f9913d271..4c3cb33f6 100644 --- a/glm/detail/type_mat3x4.hpp +++ b/glm/detail/type_mat3x4.hpp @@ -26,14 +26,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 3; } + GLM_FUNC_DECL static constexpr length_type length() { return 3; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<3, 4, T, P> const& m); @@ -81,84 +81,84 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator=(mat<3, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator=(mat<3, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator+=(mat<3, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator+=(mat<3, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator-=(mat<3, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator-=(mat<3, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator/=(U s); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<3, 4, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr mat<3, 4, T, Q> & operator--(); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type operator*(mat<3, 4, T, Q> const& m, typename mat<3, 4, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<3, 4, T, Q>::col_type operator*(mat<3, 4, T, Q> const& m, typename mat<3, 4, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<3, 4, T, Q>::row_type operator*(typename mat<3, 4, T, Q>::col_type const& v, mat<3, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<3, 4, T, Q>::row_type operator*(typename mat<3, 4, T, Q>::col_type const& v, mat<3, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat3x4.inl b/glm/detail/type_mat3x4.inl index a4afac0da..3e0a2f67f 100644 --- a/glm/detail/type_mat3x4.inl +++ b/glm/detail/type_mat3x4.inl @@ -4,7 +4,7 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<3, 4, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0), col_type(0, 0, 1, 0)} # endif @@ -19,33 +19,21 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<3, 4, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<3, 4, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0, 0, 0), col_type(0, s, 0, 0), col_type(0, 0, s, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0, 0, 0); - this->value[1] = col_type(0, s, 0, 0); - this->value[2] = col_type(0, 0, s, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat ( T x0, T y0, T z0, T w0, T x1, T y1, T z1, T w1, @@ -57,26 +45,14 @@ namespace glm col_type(x1, y1, z1, w1), col_type(x2, y2, z2, w2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0, w0); - this->value[1] = col_type(x1, y1, z1, w1); - this->value[2] = col_type(x2, y2, z2, w2); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; - this->value[2] = v2; -# endif - } + {} // -- Conversion constructors -- @@ -85,7 +61,7 @@ namespace glm typename X0, typename Y0, typename Z0, typename W0, typename X1, typename Y1, typename Z1, typename W1, typename X2, typename Y2, typename Z2, typename W2> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat ( X0 x0, Y0 y0, Z0 z0, W0 w0, X1 x1, Y1 y1, Z1 z1, W1 w1, @@ -97,159 +73,93 @@ namespace glm col_type(x1, y1, z1, w1), col_type(x2, y2, z2, w2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0, w0); - this->value[1] = col_type(x1, y1, z1, w1); - this->value[2] = col_type(x2, y2, z2, w2); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(vec<4, V1, Q> const& v0, vec<4, V2, Q> const& v1, vec<4, V3, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(vec<4, V1, Q> const& v0, vec<4, V2, Q> const& v1, vec<4, V3, Q> const& v2) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v0); - this->value[1] = col_type(v1); - this->value[2] = col_type(v2); -# endif - } + {} // -- Matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<3, 4, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<3, 4, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0), col_type(0, 0, 1, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<3, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(0, 0, 1, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<3, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0), col_type(m[2], 1, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0, 0, 1, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0, 0, 1, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0), col_type(m[2], 1, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 0); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type & mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<3, 4, T, Q>::col_type & mat<3, 4, T, Q>::operator[](typename mat<3, 4, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR 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 GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr 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 noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -259,7 +169,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator=(mat<3, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr 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]; @@ -269,7 +179,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -279,7 +189,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator+=(mat<3, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr 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]; @@ -289,7 +199,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -299,7 +209,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator-=(mat<3, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr 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]; @@ -309,7 +219,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -319,7 +229,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> & mat<3, 4, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> & mat<3, 4, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -330,7 +240,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -339,7 +249,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q>& mat<3, 4, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -348,7 +258,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> mat<3, 4, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> mat<3, 4, T, Q>::operator++(int) { mat<3, 4, T, Q> Result(*this); ++*this; @@ -356,7 +266,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> mat<3, 4, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> mat<3, 4, T, Q>::operator--(int) { mat<3, 4, T, Q> Result(*this); --*this; @@ -366,13 +276,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m) { return mat<3, 4, T, Q>( -m[0], @@ -383,7 +293,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m, T scalar) { return mat<3, 4, T, Q>( m[0] + scalar, @@ -392,7 +302,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator+(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return mat<3, 4, T, Q>( m1[0] + m2[0], @@ -401,7 +311,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m, T scalar) { return mat<3, 4, T, Q>( m[0] - scalar, @@ -410,7 +320,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator-(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return mat<3, 4, T, Q>( m1[0] - m2[0], @@ -419,7 +329,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m, T scalar) { return mat<3, 4, T, Q>( m[0] * scalar, @@ -428,7 +338,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator*(T scalar, mat<3, 4, T, Q> const& m) { return mat<3, 4, T, Q>( m[0] * scalar, @@ -437,7 +347,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::col_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<3, 4, T, Q>::col_type operator* ( mat<3, 4, T, Q> const& m, typename mat<3, 4, T, Q>::row_type const& v @@ -451,7 +361,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<3, 4, T, Q>::row_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<3, 4, T, Q>::row_type operator* ( typename mat<3, 4, T, Q>::col_type const& v, mat<3, 4, T, Q> const& m @@ -464,7 +374,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return mat<4, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -486,7 +396,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<2, 3, T, Q> const& m2) { return mat<2, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -500,7 +410,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator*(mat<3, 4, T, Q> const& m1, mat<3, 3, T, Q> const& m2) { return mat<3, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2], @@ -518,7 +428,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator/(mat<3, 4, T, Q> const& m, T scalar) { return mat<3, 4, T, Q>( m[0] / scalar, @@ -527,7 +437,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator/(T scalar, mat<3, 4, T, Q> const& m) { return mat<3, 4, T, Q>( scalar / m[0], @@ -538,13 +448,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr 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 GLM_CONSTEXPR bool operator!=(mat<3, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr 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]); } diff --git a/glm/detail/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp index 7057d4ce1..c8d9227dd 100644 --- a/glm/detail/type_mat4x2.hpp +++ b/glm/detail/type_mat4x2.hpp @@ -26,14 +26,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 4; } + GLM_FUNC_DECL static constexpr length_type length() { return 4; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<4, 2, T, P> const& m); @@ -86,84 +86,84 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator=(mat<4, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator=(mat<4, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator+=(mat<4, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator+=(mat<4, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator-=(mat<4, 2, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator-=(mat<4, 2, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator/=(U s); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator++ (); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 2, T, Q> & operator-- (); - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator++ (); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 2, T, Q> & operator-- (); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(T scalar, mat<4, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(T scalar, mat<4, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type operator*(mat<4, 2, T, Q> const& m, typename mat<4, 2, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<4, 2, T, Q>::col_type operator*(mat<4, 2, T, Q> const& m, typename mat<4, 2, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 2, T, Q>::row_type operator*(typename mat<4, 2, T, Q>::col_type const& v, mat<4, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<4, 2, T, Q>::row_type operator*(typename mat<4, 2, T, Q>::col_type const& v, mat<4, 2, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<2, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<3, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<4, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator/(mat<4, 2, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator/(mat<4, 2, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 2, T, Q> operator/(T scalar, mat<4, 2, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 2, T, Q> operator/(T scalar, mat<4, 2, T, Q> const& m); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat4x2.inl b/glm/detail/type_mat4x2.inl index 0b7ff048c..b46793755 100644 --- a/glm/detail/type_mat4x2.inl +++ b/glm/detail/type_mat4x2.inl @@ -4,51 +4,30 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<4, 2, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0), col_type(0, 1), col_type(0, 0), col_type(0, 0)} # endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - this->value[0] = col_type(1, 0); - this->value[1] = col_type(0, 1); - this->value[2] = col_type(0, 0); - this->value[3] = col_type(0, 0); -# endif - } + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<4, 2, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<4, 2, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; - this->value[3] = m[3]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0), col_type(0, s), col_type(0, 0), col_type(0, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0); - this->value[1] = col_type(0, s); - this->value[2] = col_type(0, 0); - this->value[3] = col_type(0, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat ( T x0, T y0, T x1, T y1, @@ -58,28 +37,14 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0), col_type(x1, y1), col_type(x2, y2), col_type(x3, y3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0); - this->value[1] = col_type(x1, y1); - this->value[2] = col_type(x2, y2); - this->value[3] = col_type(x3, y3); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2, col_type const& v3) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2, col_type const& v3) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2), col_type(v3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; - this->value[2] = v2; - this->value[3] = v3; -# endif - } + {} // -- Conversion constructors -- @@ -89,7 +54,7 @@ namespace glm typename X1, typename Y1, typename X2, typename Y2, typename X3, typename Y3> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat ( X0 x0, Y0 y0, X1 x1, Y1 y1, @@ -99,170 +64,93 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0), col_type(x1, y1), col_type(x2, y2), col_type(x3, y3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0); - this->value[1] = col_type(x1, y1); - this->value[2] = col_type(x2, y2); - this->value[3] = col_type(x3, y3); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(vec<2, V0, Q> const& v0, vec<2, V1, Q> const& v1, vec<2, V2, Q> const& v2, vec<2, V3, Q> const& v3) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(vec<2, V0, Q> const& v0, vec<2, V1, Q> const& v1, vec<2, V2, Q> const& v2, vec<2, V3, Q> const& v3) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2), col_type(v3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v0); - this->value[1] = col_type(v1); - this->value[2] = col_type(v2); - this->value[3] = col_type(v3); -# endif - } + {} // -- Conversion -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<4, 2, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<4, 2, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(m[3]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<3, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(m[3]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<3, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(m[3]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>::mat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(0); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type & mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<4, 2, T, Q>::col_type & mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type const& mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<4, 2, T, Q>::col_type const& mat<4, 2, T, Q>::operator[](typename mat<4, 2, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -272,7 +160,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q>& mat<4, 2, T, Q>::operator=(mat<4, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q>& mat<4, 2, T, Q>::operator=(mat<4, 2, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -283,7 +171,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -294,7 +182,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator+=(mat<4, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator+=(mat<4, 2, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -305,7 +193,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -316,7 +204,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator-=(mat<4, 2, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator-=(mat<4, 2, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -327,7 +215,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -338,7 +226,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -350,7 +238,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -360,7 +248,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> & mat<4, 2, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -370,7 +258,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> mat<4, 2, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> mat<4, 2, T, Q>::operator++(int) { mat<4, 2, T, Q> Result(*this); ++*this; @@ -378,7 +266,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> mat<4, 2, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> mat<4, 2, T, Q>::operator--(int) { mat<4, 2, T, Q> Result(*this); --*this; @@ -388,13 +276,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m) { return mat<4, 2, T, Q>( -m[0], @@ -406,7 +294,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m, T scalar) { return mat<4, 2, T, Q>( m[0] + scalar, @@ -416,7 +304,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator+(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return mat<4, 2, T, Q>( m1[0] + m2[0], @@ -426,7 +314,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m, T scalar) { return mat<4, 2, T, Q>( m[0] - scalar, @@ -436,7 +324,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator-(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return mat<4, 2, T, Q>( m1[0] - m2[0], @@ -446,7 +334,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m, T scalar) { return mat<4, 2, T, Q>( m[0] * scalar, @@ -456,7 +344,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator*(T scalar, mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator*(T scalar, mat<4, 2, T, Q> const& m) { return mat<4, 2, T, Q>( m[0] * scalar, @@ -466,7 +354,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::col_type operator*(mat<4, 2, T, Q> const& m, typename mat<4, 2, T, Q>::row_type const& v) + GLM_FUNC_QUALIFIER constexpr typename mat<4, 2, T, Q>::col_type operator*(mat<4, 2, T, Q> const& m, typename mat<4, 2, T, Q>::row_type const& v) { return typename mat<4, 2, T, Q>::col_type( m[0][0] * v.x + m[1][0] * v.y + m[2][0] * v.z + m[3][0] * v.w, @@ -474,7 +362,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 2, T, Q>::row_type operator*(typename mat<4, 2, T, Q>::col_type const& v, mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr typename mat<4, 2, T, Q>::row_type operator*(typename mat<4, 2, T, Q>::col_type const& v, mat<4, 2, T, Q> const& m) { return typename mat<4, 2, T, Q>::row_type( v.x * m[0][0] + v.y * m[0][1], @@ -484,7 +372,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return mat<2, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -494,7 +382,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return mat<3, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -506,7 +394,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator*(mat<4, 2, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return mat<4, 2, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -520,7 +408,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator/(mat<4, 2, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator/(mat<4, 2, T, Q> const& m, T scalar) { return mat<4, 2, T, Q>( m[0] / scalar, @@ -530,7 +418,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 2, T, Q> operator/(T scalar, mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 2, T, Q> operator/(T scalar, mat<4, 2, T, Q> const& m) { return mat<4, 2, T, Q>( scalar / m[0], @@ -542,13 +430,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<4, 2, T, Q> const& m1, mat<4, 2, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]); } diff --git a/glm/detail/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp index 52a38d871..f7222b50e 100644 --- a/glm/detail/type_mat4x3.hpp +++ b/glm/detail/type_mat4x3.hpp @@ -26,14 +26,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length() { return 4; } + GLM_FUNC_DECL static constexpr length_type length() { return 4; } - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<4, 3, T, P> const& m); @@ -86,84 +86,84 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator=(mat<4, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator=(mat<4, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator+=(mat<4, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator+=(mat<4, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator-=(mat<4, 3, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator-=(mat<4, 3, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q> & operator/=(U s); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q>& operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 3, T, Q>& operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q>& operator++(); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 3, T, Q>& operator--(); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(T scalar, mat<4, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(T scalar, mat<4, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type operator*(mat<4, 3, T, Q> const& m, typename mat<4, 3, T, Q>::row_type const& v); + GLM_FUNC_DECL constexpr typename mat<4, 3, T, Q>::col_type operator*(mat<4, 3, T, Q> const& m, typename mat<4, 3, T, Q>::row_type const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR typename mat<4, 3, T, Q>::row_type operator*(typename mat<4, 3, T, Q>::col_type const& v, mat<4, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr typename mat<4, 3, T, Q>::row_type operator*(typename mat<4, 3, T, Q>::col_type const& v, mat<4, 3, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<2, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<3, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<4, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator/(mat<4, 3, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator/(mat<4, 3, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 3, T, Q> operator/(T scalar, mat<4, 3, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 3, T, Q> operator/(T scalar, mat<4, 3, T, Q> const& m); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat4x3.inl b/glm/detail/type_mat4x3.inl index ab438ffce..6b6d427af 100644 --- a/glm/detail/type_mat4x3.inl +++ b/glm/detail/type_mat4x3.inl @@ -4,7 +4,7 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<4, 3, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0, 0), col_type(0, 1, 0), col_type(0, 0, 1), col_type(0, 0, 0)} # endif @@ -20,35 +20,21 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<4, 3, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<4, 3, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; - this->value[3] = m[3]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0, 0), col_type(0, s, 0), col_type(0, 0, s), col_type(0, 0, 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0, 0); - this->value[1] = col_type(0, s, 0); - this->value[2] = col_type(0, 0, s); - this->value[3] = col_type(0, 0, 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat ( T const& x0, T const& y0, T const& z0, T const& x1, T const& y1, T const& z1, @@ -58,28 +44,14 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0, z0), col_type(x1, y1, z1), col_type(x2, y2, z2), col_type(x3, y3, z3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0); - this->value[1] = col_type(x1, y1, z1); - this->value[2] = col_type(x2, y2, z2); - this->value[3] = col_type(x3, y3, z3); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2, col_type const& v3) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2, col_type const& v3) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2), col_type(v3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; - this->value[2] = v2; - this->value[3] = v3; -# endif - } + {} // -- Conversion constructors -- @@ -89,7 +61,7 @@ namespace glm typename X1, typename Y1, typename Z1, typename X2, typename Y2, typename Z2, typename X3, typename Y3, typename Z3> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat ( X0 const& x0, Y0 const& y0, Z0 const& z0, X1 const& x1, Y1 const& y1, Z1 const& z1, @@ -99,170 +71,93 @@ namespace glm # if GLM_HAS_INITIALIZER_LISTS : value{col_type(x0, y0, z0), col_type(x1, y1, z1), col_type(x2, y2, z2), col_type(x3, y3, z3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0); - this->value[1] = col_type(x1, y1, z1); - this->value[2] = col_type(x2, y2, z2); - this->value[3] = col_type(x3, y3, z3); -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2, vec<3, V3, Q> const& v3, vec<3, V4, Q> const& v4) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(vec<3, V1, Q> const& v1, vec<3, V2, Q> const& v2, vec<3, V3, Q> const& v3, vec<3, V4, Q> const& v4) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v1), col_type(v2), col_type(v3), col_type(v4)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); - this->value[2] = col_type(v3); - this->value[3] = col_type(v4); -# endif - } + {} // -- Matrix conversions -- template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<4, 3, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<4, 3, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(m[3]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(0, 0, 1), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(0, 0, 1); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<3, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<4, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(m[3]); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0, 0, 1), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0, 0, 1); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<3, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 1), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 1); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0, 0, 1), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(0, 0, 1); - this->value[3] = col_type(0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 1), col_type(m[3], 0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 1); - this->value[3] = col_type(m[3], 0); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>::mat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(0); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type & mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<4, 3, T, Q>::col_type & mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type const& mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<4, 3, T, Q>::col_type const& mat<4, 3, T, Q>::operator[](typename mat<4, 3, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -272,7 +167,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q>& mat<4, 3, T, Q>::operator=(mat<4, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q>& mat<4, 3, T, Q>::operator=(mat<4, 3, U, Q> const& m) { this->value[0] = m[0]; this->value[1] = m[1]; @@ -283,7 +178,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -294,7 +189,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator+=(mat<4, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator+=(mat<4, 3, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -305,7 +200,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -316,7 +211,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator-=(mat<4, 3, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator-=(mat<4, 3, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -327,7 +222,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -338,7 +233,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -350,7 +245,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -360,7 +255,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> & mat<4, 3, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -370,7 +265,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> mat<4, 3, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> mat<4, 3, T, Q>::operator++(int) { mat<4, 3, T, Q> Result(*this); ++*this; @@ -378,7 +273,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> mat<4, 3, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> mat<4, 3, T, Q>::operator--(int) { mat<4, 3, T, Q> Result(*this); --*this; @@ -388,13 +283,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m) { return mat<4, 3, T, Q>( -m[0], @@ -406,7 +301,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m, T scalar) { return mat<4, 3, T, Q>( m[0] + scalar, @@ -416,7 +311,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator+(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return mat<4, 3, T, Q>( m1[0] + m2[0], @@ -426,7 +321,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m, T scalar) { return mat<4, 3, T, Q>( m[0] - scalar, @@ -436,7 +331,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator-(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return mat<4, 3, T, Q>( m1[0] - m2[0], @@ -446,7 +341,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m, T scalar) { return mat<4, 3, T, Q>( m[0] * scalar, @@ -456,7 +351,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator*(T scalar, mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator*(T scalar, mat<4, 3, T, Q> const& m) { return mat<4, 3, T, Q>( m[0] * scalar, @@ -466,7 +361,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::col_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<4, 3, T, Q>::col_type operator* ( mat<4, 3, T, Q> const& m, typename mat<4, 3, T, Q>::row_type const& v) @@ -478,7 +373,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 3, T, Q>::row_type operator* + GLM_FUNC_QUALIFIER constexpr typename mat<4, 3, T, Q>::row_type operator* ( typename mat<4, 3, T, Q>::col_type const& v, mat<4, 3, T, Q> const& m) @@ -491,7 +386,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return mat<2, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -503,7 +398,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return mat<3, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -518,7 +413,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator*(mat<4, 3, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return mat<4, 3, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -536,7 +431,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator/(mat<4, 3, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator/(mat<4, 3, T, Q> const& m, T scalar) { return mat<4, 3, T, Q>( m[0] / scalar, @@ -546,7 +441,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 3, T, Q> operator/(T scalar, mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 3, T, Q> operator/(T scalar, mat<4, 3, T, Q> const& m) { return mat<4, 3, T, Q>( scalar / m[0], @@ -558,13 +453,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<4, 3, T, Q> const& m1, mat<4, 3, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]); } diff --git a/glm/detail/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp index ad7597b8e..bb203a760 100644 --- a/glm/detail/type_mat4x4.hpp +++ b/glm/detail/type_mat4x4.hpp @@ -25,14 +25,14 @@ namespace glm // -- Accesses -- typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;} + GLM_FUNC_DECL static constexpr length_type length(){return 4;} - GLM_FUNC_DECL GLM_CONSTEXPR col_type & operator[](length_type i) GLM_NOEXCEPT; - GLM_FUNC_DECL GLM_CONSTEXPR col_type const& operator[](length_type i) const GLM_NOEXCEPT; + GLM_FUNC_DECL constexpr col_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr col_type const& operator[](length_type i) const noexcept; // -- Constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR mat() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr mat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL mat(mat<4, 4, T, P> const& m); @@ -85,103 +85,103 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator=(mat<4, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator+=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator+=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator+=(mat<4, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator+=(mat<4, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator-=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator-=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator-=(mat<4, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator-=(mat<4, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator*=(mat<4, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator*=(mat<4, 4, U, Q> const& m); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator/=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator/=(mat<4, 4, U, Q> const& m); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator/=(mat<4, 4, U, Q> const& m); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR mat<4, 4, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr mat<4, 4, T, Q> & operator--(); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator++(int); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator--(int); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(T scalar, mat<4, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(T scalar, mat<4, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(T scalar, mat<4, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(T scalar, mat<4, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(T scalar, mat<4, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(T scalar, mat<4, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR 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); + GLM_FUNC_DECL constexpr 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 GLM_CONSTEXPR 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); + GLM_FUNC_DECL constexpr 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 GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T scalar); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> operator/(T scalar, mat<4, 4, T, Q> const& m); + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> operator/(T scalar, mat<4, 4, T, Q> const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR 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); + GLM_FUNC_DECL constexpr 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 GLM_CONSTEXPR 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); + GLM_FUNC_DECL constexpr 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 GLM_CONSTEXPR mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr 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 GLM_CONSTEXPR bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); + GLM_FUNC_DECL constexpr bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_mat4x4.inl b/glm/detail/type_mat4x4.inl index 9b8120347..4909d42be 100644 --- a/glm/detail/type_mat4x4.inl +++ b/glm/detail/type_mat4x4.inl @@ -7,101 +7,57 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr mat<4, 4, T, Q>::mat() # if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : value{col_type(1, 0, 0, 0), col_type(0, 1, 0, 0), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)} # endif - { -# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALISATION - 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); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<4, 4, T, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<4, 4, T, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; - this->value[3] = m[3]; -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(T s) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(T s) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(s, 0, 0, 0), col_type(0, s, 0, 0), col_type(0, 0, s, 0), col_type(0, 0, 0, s)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(s, 0, 0, 0); - this->value[1] = col_type(0, s, 0, 0); - this->value[2] = col_type(0, 0, s, 0); - this->value[3] = col_type(0, 0, 0, s); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat ( T const& x0, T const& y0, T const& z0, T const& w0, T const& x1, T const& y1, T const& z1, T const& w1, T const& x2, T const& y2, T const& z2, T const& w2, T const& x3, T const& y3, T const& z3, T const& w3 ) -# if GLM_HAS_INITIALIZER_LISTS - : value{ - col_type(x0, y0, z0, w0), - col_type(x1, y1, z1, w1), - col_type(x2, y2, z2, w2), - col_type(x3, y3, z3, w3)} -# endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x0, y0, z0, w0); - this->value[1] = col_type(x1, y1, z1, w1); - this->value[2] = col_type(x2, y2, z2, w2); - this->value[3] = col_type(x3, y3, z3, w3); -# endif - } + : value{ + col_type(x0, y0, z0, w0), + col_type(x1, y1, z1, w1), + col_type(x2, y2, z2, w2), + col_type(x3, y3, z3, w3)} + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2, col_type const& v3) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(col_type const& v0, col_type const& v1, col_type const& v2, col_type const& v3) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v0), col_type(v1), col_type(v2), col_type(v3)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = v0; - this->value[1] = v1; - this->value[2] = v2; - this->value[3] = v3; -# endif - } + {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<4, 4, U, P> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<4, 4, U, P> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(m[3])} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0]); - this->value[1] = col_type(m[1]); - this->value[2] = col_type(m[2]); - this->value[3] = col_type(m[3]); -# endif - } + {} // -- Conversions -- @@ -111,7 +67,7 @@ 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_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat ( X1 const& x1, Y1 const& y1, Z1 const& z1, W1 const& w1, X2 const& x2, Y2 const& y2, Z2 const& z2, W2 const& w2, @@ -122,179 +78,109 @@ namespace glm : value{col_type(x1, y1, z1, w1), col_type(x2, y2, z2, w2), col_type(x3, y3, z3, w3), col_type(x4, y4, z4, w4)} # endif { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 3rd parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 4th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 3rd parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 4th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 5th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 6th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 7th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 8th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 5th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 6th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 7th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 8th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 9th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 10th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 11th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 12th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 9th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 10th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 11th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 12th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 13th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 14th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 15th parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 16th parameter type invalid."); - -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(x1, y1, z1, w1); - this->value[1] = col_type(x2, y2, z2, w2); - this->value[2] = col_type(x3, y3, z3, w3); - this->value[3] = col_type(x4, y4, z4, w4); -# endif + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 13th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 14th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 15th parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 16th parameter type invalid."); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::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) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::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) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(v1), col_type(v2), col_type(v3), col_type(v4)} # endif { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 3rd parameter type invalid."); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 4th parameter type invalid."); - -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(v1); - this->value[1] = col_type(v2); - this->value[2] = col_type(v3); - this->value[3] = col_type(v4); -# endif + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 1st parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 2nd parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 3rd parameter type invalid."); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer || GLM_CONFIG_UNRESTRICTED_GENTYPE, "*mat4x4 constructor only takes float and integer types, 4th parameter type invalid."); } // -- Matrix conversions -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<2, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<2, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<3, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 0), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 0); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<2, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<2, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<3, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<3, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0), col_type(m[2], 1, 0), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<2, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = col_type(0, 0, 1, 0); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<4, 2, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<4, 2, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0, 0), col_type(m[1], 0, 0), col_type(0, 0, 1, 0), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - 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); - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<3, 4, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0]), col_type(m[1]), col_type(m[2]), col_type(0, 0, 0, 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = m[0]; - this->value[1] = m[1]; - this->value[2] = m[2]; - this->value[3] = col_type(0, 0, 0, 1); -# endif - } + {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>::mat(mat<4, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>::mat(mat<4, 3, T, Q> const& m) # if GLM_HAS_INITIALIZER_LISTS : value{col_type(m[0], 0), col_type(m[1], 0), col_type(m[2], 0), col_type(m[3], 1)} # endif - { -# if !GLM_HAS_INITIALIZER_LISTS - this->value[0] = col_type(m[0], 0); - this->value[1] = col_type(m[1], 0); - this->value[2] = col_type(m[2], 0); - this->value[3] = col_type(m[3], 1); -# endif - } + {} // -- Accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type & mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<4, 4, T, Q>::col_type & mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const GLM_NOEXCEPT + GLM_FUNC_QUALIFIER constexpr typename mat<4, 4, T, Q>::col_type const& mat<4, 4, T, Q>::operator[](typename mat<4, 4, T, Q>::length_type i) const noexcept { GLM_ASSERT_LENGTH(i, this->length()); return this->value[i]; @@ -304,7 +190,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator=(mat<4, 4, U, Q> const& m) { //memcpy could be faster //memcpy(&this->value, &m.value, 16 * sizeof(valType)); @@ -317,7 +203,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator+=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator+=(U s) { this->value[0] += s; this->value[1] += s; @@ -328,7 +214,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator+=(mat<4, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q>& mat<4, 4, T, Q>::operator+=(mat<4, 4, U, Q> const& m) { this->value[0] += m[0]; this->value[1] += m[1]; @@ -339,7 +225,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator-=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator-=(U s) { this->value[0] -= s; this->value[1] -= s; @@ -350,7 +236,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator-=(mat<4, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator-=(mat<4, 4, U, Q> const& m) { this->value[0] -= m[0]; this->value[1] -= m[1]; @@ -361,7 +247,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator*=(U s) { this->value[0] *= s; this->value[1] *= s; @@ -372,14 +258,14 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator*=(mat<4, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator*=(mat<4, 4, U, Q> const& m) { return (*this = *this * m); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator/=(U s) { this->value[0] /= s; this->value[1] /= s; @@ -390,7 +276,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator/=(mat<4, 4, U, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator/=(mat<4, 4, U, Q> const& m) { return *this *= inverse(m); } @@ -398,7 +284,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator++() { ++this->value[0]; ++this->value[1]; @@ -408,7 +294,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> & mat<4, 4, T, Q>::operator--() { --this->value[0]; --this->value[1]; @@ -418,7 +304,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> mat<4, 4, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> mat<4, 4, T, Q>::operator++(int) { mat<4, 4, T, Q> Result(*this); ++*this; @@ -426,7 +312,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> mat<4, 4, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> mat<4, 4, T, Q>::operator--(int) { mat<4, 4, T, Q> Result(*this); --*this; @@ -436,13 +322,13 @@ namespace glm // -- Unary constant operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m) { return m; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m) { return mat<4, 4, T, Q>( -m[0], @@ -454,7 +340,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m, T scalar) { return mat<4, 4, T, Q>( m[0] + scalar, @@ -464,7 +350,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator+(T scalar, mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator+(T scalar, mat<4, 4, T, Q> const& m) { return mat<4, 4, T, Q>( m[0] + scalar, @@ -474,7 +360,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator+(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return mat<4, 4, T, Q>( m1[0] + m2[0], @@ -484,7 +370,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m, T scalar) { return mat<4, 4, T, Q>( m[0] - scalar, @@ -494,7 +380,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator-(T scalar, mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator-(T scalar, mat<4, 4, T, Q> const& m) { return mat<4, 4, T, Q>( scalar - m[0], @@ -504,7 +390,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator-(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return mat<4, 4, T, Q>( m1[0] - m2[0], @@ -514,7 +400,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m, T scalar) { return mat<4, 4, T, Q>( m[0] * scalar, @@ -524,7 +410,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator*(T scalar, mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator*(T scalar, mat<4, 4, T, Q> const& m) { return mat<4, 4, T, Q>( m[0] * scalar, @@ -534,7 +420,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::col_type operator* + GLM_FUNC_QUALIFIER constexpr 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 @@ -582,7 +468,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR typename mat<4, 4, T, Q>::row_type operator* + GLM_FUNC_QUALIFIER constexpr 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 @@ -596,7 +482,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<2, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<2, 4, T, Q> const& m2) { return mat<2, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -610,7 +496,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<3, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<3, 4, T, Q> const& m2) { return mat<3, 4, T, Q>( m1[0][0] * m2[0][0] + m1[1][0] * m2[0][1] + m1[2][0] * m2[0][2] + m1[3][0] * m2[0][3], @@ -635,7 +521,7 @@ namespace glm template struct mul4x4 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 4, T, Q> call(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr static mat<4, 4, T, Q> call(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { typename mat<4, 4, T, Q>::col_type const SrcA0 = m1[0]; typename mat<4, 4, T, Q>::col_type const SrcA1 = m1[1]; @@ -659,7 +545,7 @@ namespace glm template struct mul4x4 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 4, T, Q> call(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr static mat<4, 4, T, Q> call(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { typename mat<4, 4, T, Q>::col_type const& SrcA0 = m1[0]; typename mat<4, 4, T, Q>::col_type const& SrcA1 = m1[1]; @@ -701,13 +587,13 @@ namespace glm template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator*(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return detail::mul4x4::value>::call(m1, m2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T scalar) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m, T scalar) { return mat<4, 4, T, Q>( m[0] / scalar, @@ -717,7 +603,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator/(T scalar, mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator/(T scalar, mat<4, 4, T, Q> const& m) { return mat<4, 4, T, Q>( scalar / m[0], @@ -727,19 +613,19 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR 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) + GLM_FUNC_QUALIFIER constexpr typename mat<4, 4, T, Q>::col_type operator/(mat<4, 4, T, Q> const& m, typename mat<4, 4, T, Q>::row_type const& v) { return inverse(m) * v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR 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) + GLM_FUNC_QUALIFIER constexpr typename mat<4, 4, T, Q>::row_type operator/(typename mat<4, 4, T, Q>::col_type const& v, mat<4, 4, T, Q> const& m) { return v * inverse(m); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> operator/(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { mat<4, 4, T, Q> m1_copy(m1); return m1_copy /= m2; @@ -748,13 +634,13 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator==(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return (m1[0] == m2[0]) && (m1[1] == m2[1]) && (m1[2] == m2[2]) && (m1[3] == m2[3]); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2) { return (m1[0] != m2[0]) || (m1[1] != m2[1]) || (m1[2] != m2[2]) || (m1[3] != m2[3]); } diff --git a/glm/detail/type_quat.hpp b/glm/detail/type_quat.hpp index 1b41e1560..075fbb0e0 100644 --- a/glm/detail/type_quat.hpp +++ b/glm/detail/type_quat.hpp @@ -63,15 +63,15 @@ namespace glm typedef length_t length_type; /// Return the count of components of a quaternion - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;} + GLM_FUNC_DECL static constexpr length_type length(){return 4;} - GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i); - GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const; + GLM_FUNC_DECL constexpr T & operator[](length_type i); + GLM_FUNC_DECL constexpr T const& operator[](length_type i) const; // -- Implicit basic constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR qua() GLM_DEFAULT_CTOR; - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua(qua const& q) GLM_DEFAULT; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr qua() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_FUNC_DECL constexpr qua(qua const& q) = default; template GLM_CTOR_DECL qua(qua const& q); @@ -85,7 +85,7 @@ namespace glm GLM_CTOR_DECL qua(T w, T x, T y, T z); # endif - GLM_FUNC_DECL static GLM_CONSTEXPR qua wxyz(T w, T x, T y, T z); + GLM_FUNC_DECL static constexpr qua wxyz(T w, T x, T y, T z); // -- Conversion constructors -- @@ -113,20 +113,20 @@ namespace glm // -- Unary arithmetic operators -- - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR qua& operator=(qua const& q) GLM_DEFAULT; + GLM_DEFAULTED_FUNC_DECL constexpr qua& operator=(qua const& q) = default; template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua& operator=(qua const& q); + GLM_FUNC_DISCARD_DECL constexpr qua& operator=(qua const& q); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua& operator+=(qua const& q); + GLM_FUNC_DISCARD_DECL constexpr qua& operator+=(qua const& q); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua& operator-=(qua const& q); + GLM_FUNC_DISCARD_DECL constexpr qua& operator-=(qua const& q); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua& operator*=(qua const& q); + GLM_FUNC_DISCARD_DECL constexpr qua& operator*=(qua const& q); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua& operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr qua& operator*=(U s); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR qua& operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr qua& operator/=(U s); }; # if GLM_SILENT_WARNINGS == GLM_ENABLE @@ -142,50 +142,50 @@ namespace glm // -- Unary bit operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator+(qua const& q); + GLM_FUNC_DECL constexpr qua operator+(qua const& q); template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator-(qua const& q); + GLM_FUNC_DECL constexpr qua operator-(qua const& q); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator+(qua const& q, qua const& p); + GLM_FUNC_DECL constexpr qua operator+(qua const& q, qua const& p); template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator-(qua const& q, qua const& p); + GLM_FUNC_DECL constexpr qua operator-(qua const& q, qua const& p); template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator*(qua const& q, qua const& p); + GLM_FUNC_DECL constexpr qua operator*(qua const& q, qua const& p); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(qua const& q, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(qua const& q, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, qua const& q); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, qua const& q); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(qua const& q, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(qua const& q, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v, qua const& q); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v, qua const& q); template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator*(qua const& q, T const& s); + GLM_FUNC_DECL constexpr qua operator*(qua const& q, T const& s); template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator*(T const& s, qua const& q); + GLM_FUNC_DECL constexpr qua operator*(T const& s, qua const& q); template - GLM_FUNC_DECL GLM_CONSTEXPR qua operator/(qua const& q, T const& s); + GLM_FUNC_DECL constexpr qua operator/(qua const& q, T const& s); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(qua const& q1, qua const& q2); + GLM_FUNC_DECL constexpr bool operator==(qua const& q1, qua const& q2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(qua const& q1, qua const& q2); + GLM_FUNC_DECL constexpr bool operator!=(qua const& q1, qua const& q2); } //namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_quat.inl b/glm/detail/type_quat.inl index 6a8f9871b..4d49f9cd1 100644 --- a/glm/detail/type_quat.inl +++ b/glm/detail/type_quat.inl @@ -16,7 +16,7 @@ namespace detail template struct compute_dot, T, Aligned> { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static T call(qua const& a, qua const& b) + GLM_FUNC_QUALIFIER constexpr static T call(qua const& a, qua const& b) { vec<4, T, Q> tmp(a.w * b.w, a.x * b.x, a.y * b.y, a.z * b.z); return (tmp.x + tmp.y) + (tmp.z + tmp.w); @@ -26,7 +26,7 @@ namespace detail template struct compute_quat_add { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static qua call(qua const& q, qua const& p) + GLM_FUNC_QUALIFIER constexpr static qua call(qua const& q, qua const& p) { return qua::wxyz(q.w + p.w, q.x + p.x, q.y + p.y, q.z + p.z); } @@ -35,7 +35,7 @@ namespace detail template struct compute_quat_sub { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static qua call(qua const& q, qua const& p) + GLM_FUNC_QUALIFIER constexpr static qua call(qua const& q, qua const& p) { return qua::wxyz(q.w - p.w, q.x - p.x, q.y - p.y, q.z - p.z); } @@ -44,7 +44,7 @@ namespace detail template struct compute_quat_mul_scalar { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static qua call(qua const& q, T s) + GLM_FUNC_QUALIFIER constexpr static qua call(qua const& q, T s) { return qua::wxyz(q.w * s, q.x * s, q.y * s, q.z * s); } @@ -53,7 +53,7 @@ namespace detail template struct compute_quat_div_scalar { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static qua call(qua const& q, T s) + GLM_FUNC_QUALIFIER constexpr static qua call(qua const& q, T s) { return qua::wxyz(q.w / s, q.x / s, q.y / s, q.z / s); } @@ -62,7 +62,7 @@ namespace detail template struct compute_quat_mul_vec4 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, T, Q> call(qua const& q, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr static vec<4, T, Q> call(qua const& q, vec<4, T, Q> const& v) { return vec<4, T, Q>(q * vec<3, T, Q>(v), v.w); } @@ -72,24 +72,68 @@ namespace detail // -- Component accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & qua::operator[](typename qua::length_type i) + GLM_FUNC_QUALIFIER constexpr T & qua::operator[](typename qua::length_type i) { GLM_ASSERT_LENGTH(i, this->length()); # ifdef GLM_FORCE_QUAT_DATA_WXYZ - return (&w)[i]; + switch (i) + { + default: + case 0: + return w; + case 1: + return x; + case 2: + return y; + case 3: + return z; + } # else - return (&x)[i]; + switch (i) + { + default: + case 0: + return x; + case 1: + return y; + case 2: + return z; + case 3: + return w; + } # endif } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& qua::operator[](typename qua::length_type i) const + GLM_FUNC_QUALIFIER constexpr T const& qua::operator[](typename qua::length_type i) const { GLM_ASSERT_LENGTH(i, this->length()); # ifdef GLM_FORCE_QUAT_DATA_WXYZ - return (&w)[i]; + switch (i) + { + default: + case 0: + return w; + case 1: + return x; + case 2: + return y; + case 3: + return z; + } # else - return (&x)[i]; + switch (i) + { + default: + case 0: + return x; + case 1: + return y; + case 2: + return z; + case 3: + return w; + } # endif } @@ -97,7 +141,7 @@ namespace detail # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR qua::qua() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr qua::qua() # if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE # ifdef GLM_FORCE_QUAT_DATA_WXYZ : w(1), x(0), y(0), z(0) @@ -108,20 +152,9 @@ namespace detail {} # endif -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(qua const& q) -# ifdef GLM_FORCE_QUAT_DATA_WXYZ - : w(q.w), x(q.x), y(q.y), z(q.z) -# else - : x(q.x), y(q.y), z(q.z), w(q.w) -# endif - {} -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua::qua(qua const& q) # ifdef GLM_FORCE_QUAT_DATA_WXYZ : w(q.w), x(q.x), y(q.y), z(q.z) # else @@ -132,7 +165,7 @@ namespace detail // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(T s, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr qua::qua(T s, vec<3, T, Q> const& v) # ifdef GLM_FORCE_QUAT_DATA_WXYZ : w(s), x(v.x), y(v.y), z(v.z) # else @@ -142,9 +175,9 @@ namespace detail template # ifdef GLM_FORCE_QUAT_DATA_XYZW - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(T _x, T _y, T _z, T _w) + GLM_FUNC_QUALIFIER constexpr qua::qua(T _x, T _y, T _z, T _w) # else - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(T _w, T _x, T _y, T _z) + GLM_FUNC_QUALIFIER constexpr qua::qua(T _w, T _x, T _y, T _z) # endif # ifdef GLM_FORCE_QUAT_DATA_WXYZ : w(_w), x(_x), y(_y), z(_z) @@ -154,7 +187,7 @@ namespace detail {} template - GLM_CONSTEXPR qua qua::wxyz(T w, T x, T y, T z) { + constexpr qua qua::wxyz(T w, T x, T y, T z) { # ifdef GLM_FORCE_QUAT_DATA_XYZW return qua(x, y, z, w); # else @@ -166,7 +199,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua::qua(qua const& q) # ifdef GLM_FORCE_QUAT_DATA_WXYZ : w(static_cast(q.w)), x(static_cast(q.x)), y(static_cast(q.y)), z(static_cast(q.z)) # else @@ -217,7 +250,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(vec<3, T, Q> const& eulerAngle) + GLM_FUNC_QUALIFIER constexpr qua::qua(vec<3, T, Q> const& eulerAngle) { vec<3, T, Q> c = glm::cos(eulerAngle * T(0.5)); vec<3, T, Q> s = glm::sin(eulerAngle * T(0.5)); @@ -229,13 +262,13 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(mat<3, 3, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr qua::qua(mat<3, 3, T, Q> const& m) { *this = quat_cast(m); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua::qua(mat<4, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr qua::qua(mat<4, 4, T, Q> const& m) { *this = quat_cast(m); } @@ -256,21 +289,9 @@ namespace detail // -- Unary arithmetic operators -- -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator=(qua const& q) - { - this->w = q.w; - this->x = q.x; - this->y = q.y; - this->z = q.z; - return *this; - } -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator=(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua & qua::operator=(qua const& q) { this->w = static_cast(q.w); this->x = static_cast(q.x); @@ -281,21 +302,21 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator+=(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua & qua::operator+=(qua const& q) { return (*this = detail::compute_quat_add::value>::call(*this, qua(q))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator-=(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua & qua::operator-=(qua const& q) { return (*this = detail::compute_quat_sub::value>::call(*this, qua(q))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator*=(qua const& r) + GLM_FUNC_QUALIFIER constexpr qua & qua::operator*=(qua const& r) { qua const p(*this); qua const q(r); @@ -309,14 +330,14 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr qua & qua::operator*=(U s) { return (*this = detail::compute_quat_mul_scalar::value>::call(*this, static_cast(s))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua & qua::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr qua & qua::operator/=(U s) { return (*this = detail::compute_quat_div_scalar::value>::call(*this, static_cast(s))); } @@ -324,13 +345,13 @@ namespace detail // -- Unary bit operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator+(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua operator+(qua const& q) { return q; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator-(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua operator-(qua const& q) { return qua::wxyz(-q.w, -q.x, -q.y, -q.z); } @@ -338,25 +359,25 @@ namespace detail // -- Binary operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator+(qua const& q, qua const& p) + GLM_FUNC_QUALIFIER constexpr qua operator+(qua const& q, qua const& p) { return qua(q) += p; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator-(qua const& q, qua const& p) + GLM_FUNC_QUALIFIER constexpr qua operator-(qua const& q, qua const& p) { return qua(q) -= p; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator*(qua const& q, qua const& p) + GLM_FUNC_QUALIFIER constexpr qua operator*(qua const& q, qua const& p) { return qua(q) *= p; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(qua const& q, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(qua const& q, vec<3, T, Q> const& v) { vec<3, T, Q> const QuatVector(q.x, q.y, q.z); vec<3, T, Q> const uv(glm::cross(QuatVector, v)); @@ -366,38 +387,38 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, qua const& q) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, qua const& q) { return glm::inverse(q) * v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(qua const& q, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(qua const& q, vec<4, T, Q> const& v) { return detail::compute_quat_mul_vec4::value>::call(q, v); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v, qua const& q) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v, qua const& q) { return glm::inverse(q) * v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator*(qua const& q, T const& s) + GLM_FUNC_QUALIFIER constexpr qua operator*(qua const& q, T const& s) { return qua::wxyz( q.w * s, q.x * s, q.y * s, q.z * s); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator*(T const& s, qua const& q) + GLM_FUNC_QUALIFIER constexpr qua operator*(T const& s, qua const& q) { return q * s; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua operator/(qua const& q, T const& s) + GLM_FUNC_QUALIFIER constexpr qua operator/(qua const& q, T const& s) { return qua::wxyz( q.w / s, q.x / s, q.y / s, q.z / s); @@ -406,13 +427,13 @@ namespace detail // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(qua const& q1, qua const& q2) + GLM_FUNC_QUALIFIER constexpr bool operator==(qua const& q1, qua const& q2) { return q1.x == q2.x && q1.y == q2.y && q1.z == q2.z && q1.w == q2.w; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(qua const& q1, qua const& q2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(qua const& q1, qua const& q2) { return q1.x != q2.x || q1.y != q2.y || q1.z != q2.z || q1.w != q2.w; } diff --git a/glm/detail/type_vec1.hpp b/glm/detail/type_vec1.hpp index 0cc7b5d4c..f2274b607 100644 --- a/glm/detail/type_vec1.hpp +++ b/glm/detail/type_vec1.hpp @@ -85,15 +85,15 @@ namespace glm /// Return the count of components of the vector typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 1;} + GLM_FUNC_DECL static constexpr length_type length(){return 1;} - GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i); - GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const; + GLM_FUNC_DECL constexpr T & operator[](length_type i); + GLM_FUNC_DECL constexpr T const& operator[](length_type i) const; // -- Implicit basic constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_FUNC_DECL constexpr vec(vec const& v) = default; template GLM_CTOR_DECL vec(vec<1, T, P> const& v); @@ -121,7 +121,7 @@ namespace glm /* # if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(detail::_swizzle<1, T, Q, E0, -1,-2,-3> const& that) + GLM_FUNC_DISCARD_DECL constexpr vec(detail::_swizzle<1, T, Q, E0, -1,-2,-3> const& that) { *this = that(); } @@ -129,178 +129,178 @@ namespace glm */ // -- Unary arithmetic operators -- - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> & operator=(vec const& v) GLM_DEFAULT; + GLM_DEFAULTED_FUNC_DECL constexpr vec<1, T, Q> & operator=(vec const& v) = default; template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator+=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator+=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator+=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator+=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator-=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator-=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator-=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator-=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator*=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator*=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator*=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator*=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator/=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator/=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator/=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator/=(vec<1, U, Q> const& v); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator--(); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator++(int); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator%=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator%=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator%=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator%=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator&=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator&=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator&=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator&=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator|=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator|=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator|=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator|=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator^=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator^=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator^=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator^=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator<<=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator<<=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator<<=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator<<=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator>>=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator>>=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<1, T, Q> & operator>>=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<1, T, Q> & operator>>=(vec<1, U, Q> const& v); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, T, Q> operator~(vec<1, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<1, T, Q> operator~(vec<1, T, Q> const& v); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec1.inl b/glm/detail/type_vec1.inl index 18411e7f7..95b707971 100644 --- a/glm/detail/type_vec1.inl +++ b/glm/detail/type_vec1.inl @@ -8,30 +8,23 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr vec<1, T, Q>::vec() # if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE : x(0) # endif {} # endif -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(vec<1, T, Q> const& v) - : x(v.x) - {} -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(vec<1, T, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q>::vec(vec<1, T, P> const& v) : x(v.x) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q>::vec(T scalar) : x(scalar) {} @@ -39,56 +32,47 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(vec<1, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q>::vec(vec<1, U, P> const& v) : x(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(vec<2, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q>::vec(vec<2, U, P> const& v) : x(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(vec<3, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q>::vec(vec<3, U, P> const& v) : x(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q>::vec(vec<4, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q>::vec(vec<4, U, P> const& v) : x(static_cast(v.x)) {} // -- Component accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & vec<1, T, Q>::operator[](typename vec<1, T, Q>::length_type) + GLM_FUNC_QUALIFIER constexpr T & vec<1, T, Q>::operator[](typename vec<1, T, Q>::length_type) { return x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<1, T, Q>::operator[](typename vec<1, T, Q>::length_type) const + GLM_FUNC_QUALIFIER constexpr T const& vec<1, T, Q>::operator[](typename vec<1, T, Q>::length_type) const { return x; } // -- Unary arithmetic operators -- -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator=(vec<1, T, Q> const& v) - { - this->x = v.x; - return *this; - } -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator=(vec<1, U, Q> const& v) { this->x = static_cast(v.x); return *this; @@ -96,7 +80,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator+=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator+=(U scalar) { this->x += static_cast(scalar); return *this; @@ -104,7 +88,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator+=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator+=(vec<1, U, Q> const& v) { this->x += static_cast(v.x); return *this; @@ -112,7 +96,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator-=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator-=(U scalar) { this->x -= static_cast(scalar); return *this; @@ -120,7 +104,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator-=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator-=(vec<1, U, Q> const& v) { this->x -= static_cast(v.x); return *this; @@ -128,7 +112,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator*=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator*=(U scalar) { this->x *= static_cast(scalar); return *this; @@ -136,7 +120,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator*=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator*=(vec<1, U, Q> const& v) { this->x *= static_cast(v.x); return *this; @@ -144,7 +128,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator/=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator/=(U scalar) { this->x /= static_cast(scalar); return *this; @@ -152,7 +136,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator/=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator/=(vec<1, U, Q> const& v) { this->x /= static_cast(v.x); return *this; @@ -161,21 +145,21 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator++() { ++this->x; return *this; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator--() { --this->x; return *this; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> vec<1, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> vec<1, T, Q>::operator++(int) { vec<1, T, Q> Result(*this); ++*this; @@ -183,7 +167,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> vec<1, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> vec<1, T, Q>::operator--(int) { vec<1, T, Q> Result(*this); --*this; @@ -194,7 +178,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator%=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator%=(U scalar) { this->x %= static_cast(scalar); return *this; @@ -202,7 +186,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator%=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator%=(vec<1, U, Q> const& v) { this->x %= static_cast(v.x); return *this; @@ -210,7 +194,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator&=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator&=(U scalar) { this->x &= static_cast(scalar); return *this; @@ -218,7 +202,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator&=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator&=(vec<1, U, Q> const& v) { this->x &= static_cast(v.x); return *this; @@ -226,7 +210,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator|=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator|=(U scalar) { this->x |= static_cast(scalar); return *this; @@ -234,7 +218,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator|=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator|=(vec<1, U, Q> const& v) { this->x |= static_cast(v.x); return *this; @@ -242,7 +226,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator^=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator^=(U scalar) { this->x ^= static_cast(scalar); return *this; @@ -250,7 +234,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator^=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator^=(vec<1, U, Q> const& v) { this->x ^= static_cast(v.x); return *this; @@ -258,7 +242,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator<<=(U scalar) { this->x <<= static_cast(scalar); return *this; @@ -266,7 +250,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator<<=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator<<=(vec<1, U, Q> const& v) { this->x <<= static_cast(v.x); return *this; @@ -274,7 +258,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator>>=(U scalar) { this->x >>= static_cast(scalar); return *this; @@ -282,7 +266,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> & vec<1, T, Q>::operator>>=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> & vec<1, T, Q>::operator>>=(vec<1, U, Q> const& v) { this->x >>= static_cast(v.x); return *this; @@ -291,13 +275,13 @@ namespace glm // -- Unary constant operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v) { return v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v) { return vec<1, T, Q>( -v.x); @@ -306,21 +290,21 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x + scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator+(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar + v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator+(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x + v2.x); @@ -328,63 +312,63 @@ namespace glm //operator- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x - scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator-(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar - v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator-(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x - v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator*(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x * scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator*(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar * v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator*(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x * v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator/(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x / scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator/(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar / v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator/(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x / v2.x); @@ -393,133 +377,133 @@ namespace glm // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator%(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x % scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator%(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar % v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator%(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x % v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator&(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x & scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator&(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar & v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator&(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x & v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator|(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x | scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator|(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar | v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator|(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x | v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator^(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( v.x ^ scalar); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator^(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( scalar ^ v.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator^(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( v1.x ^ v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator<<(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( static_cast(v.x << scalar)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator<<(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( static_cast(scalar << v.x)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator<<(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( static_cast(v1.x << v2.x)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator>>(vec<1, T, Q> const& v, T scalar) { return vec<1, T, Q>( static_cast(v.x >> scalar)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator>>(T scalar, vec<1, T, Q> const& v) { return vec<1, T, Q>( static_cast(scalar >> v.x)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator>>(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<1, T, Q>( static_cast(v1.x >> v2.x)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, T, Q> operator~(vec<1, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<1, T, Q> operator~(vec<1, T, Q> const& v) { return vec<1, T, Q>( ~v.x); @@ -528,25 +512,25 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator==(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return detail::compute_equal::is_iec559>::call(v1.x, v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(vec<1, T, Q> const& v1, vec<1, T, Q> const& v2) { return !(v1 == v2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, bool, Q> operator&&(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2) { return vec<1, bool, Q>(v1.x && v2.x); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<1, bool, Q> operator||(vec<1, bool, Q> const& v1, vec<1, bool, Q> const& v2) { return vec<1, bool, Q>(v1.x || v2.x); } diff --git a/glm/detail/type_vec2.hpp b/glm/detail/type_vec2.hpp index 66c6137ce..ad5710230 100644 --- a/glm/detail/type_vec2.hpp +++ b/glm/detail/type_vec2.hpp @@ -91,15 +91,15 @@ namespace glm /// Return the count of components of the vector typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 2;} + GLM_FUNC_DECL static constexpr length_type length(){return 2;} - GLM_FUNC_DECL GLM_CONSTEXPR T& operator[](length_type i); - GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const; + GLM_FUNC_DECL constexpr T& operator[](length_type i); + GLM_FUNC_DECL constexpr T const& operator[](length_type i) const; // -- Implicit basic constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_FUNC_DECL constexpr vec(vec const& v) = default; template GLM_CTOR_DECL vec(vec<2, T, P> const& v); @@ -147,258 +147,258 @@ namespace glm // -- Unary arithmetic operators -- - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> & operator=(vec const& v) GLM_DEFAULT; + GLM_DEFAULTED_FUNC_DECL constexpr vec<2, T, Q> & operator=(vec const& v) = default; template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator+=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator+=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator+=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator+=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator+=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator+=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator-=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator-=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator-=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator-=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator-=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator-=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator*=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator*=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator*=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator*=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator*=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator*=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator/=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator/=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator/=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator/=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator/=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator/=(vec<2, U, Q> const& v); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator--(); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator++(int); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator%=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator%=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator%=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator%=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator%=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator%=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator&=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator&=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator&=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator&=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator&=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator&=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator|=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator|=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator|=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator|=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator|=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator|=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator^=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator^=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator^=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator^=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator^=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator^=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator<<=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator<<=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator<<=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator<<=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator<<=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator<<=(vec<2, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator>>=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator>>=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator>>=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator>>=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<2, T, Q> & operator>>=(vec<2, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<2, T, Q> & operator>>=(vec<2, U, Q> const& v); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(T scalar, vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(T scalar, vec<2, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, T, Q> operator~(vec<2, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<2, T, Q> operator~(vec<2, T, Q> const& v); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator==(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator!=(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, bool, Q> operator&&(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, bool, Q> operator&&(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec2.inl b/glm/detail/type_vec2.inl index e8408997f..41df2f697 100644 --- a/glm/detail/type_vec2.inl +++ b/glm/detail/type_vec2.inl @@ -8,35 +8,28 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr vec<2, T, Q>::vec() # if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE : x(0), y(0) # endif {} # endif -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<2, T, Q> const& v) - : x(v.x), y(v.y) - {} -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<2, T, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<2, T, P> const& v) : x(v.x), y(v.y) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(T scalar) : x(scalar), y(scalar) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(T _x, T _y) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(T _x, T _y) : x(_x), y(_y) {} @@ -44,35 +37,35 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<1, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<1, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(A _x, B _y) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(A _x, B _y) : x(static_cast(_x)) , y(static_cast(_y)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<1, A, Q> const& _x, B _y) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<1, A, Q> const& _x, B _y) : x(static_cast(_x.x)) , y(static_cast(_y)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(A _x, vec<1, B, Q> const& _y) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(A _x, vec<1, B, Q> const& _y) : x(static_cast(_x)) , y(static_cast(_y.x)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<1, A, Q> const& _x, vec<1, B, Q> const& _y) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<1, A, Q> const& _x, vec<1, B, Q> const& _y) : x(static_cast(_x.x)) , y(static_cast(_y.x)) {} @@ -81,21 +74,21 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<2, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<2, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.y)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<3, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<3, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.y)) {} template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q>::vec(vec<4, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q>::vec(vec<4, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.y)) {} @@ -103,7 +96,7 @@ namespace glm // -- Component accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) + GLM_FUNC_QUALIFIER constexpr T & vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) { GLM_ASSERT_LENGTH(i, this->length()); switch(i) @@ -117,7 +110,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER constexpr T const& vec<2, T, Q>::operator[](typename vec<2, T, Q>::length_type i) const { GLM_ASSERT_LENGTH(i, this->length()); switch(i) @@ -132,19 +125,9 @@ namespace glm // -- Unary arithmetic operators -- -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator=(vec<2, T, Q> const& v) - { - this->x = v.x; - this->y = v.y; - return *this; - } -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator=(vec<2, U, Q> const& v) { this->x = static_cast(v.x); this->y = static_cast(v.y); @@ -153,7 +136,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator+=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator+=(U scalar) { this->x += static_cast(scalar); this->y += static_cast(scalar); @@ -162,7 +145,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator+=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator+=(vec<1, U, Q> const& v) { this->x += static_cast(v.x); this->y += static_cast(v.x); @@ -171,7 +154,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator+=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator+=(vec<2, U, Q> const& v) { this->x += static_cast(v.x); this->y += static_cast(v.y); @@ -180,7 +163,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator-=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator-=(U scalar) { this->x -= static_cast(scalar); this->y -= static_cast(scalar); @@ -189,7 +172,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator-=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator-=(vec<1, U, Q> const& v) { this->x -= static_cast(v.x); this->y -= static_cast(v.x); @@ -198,7 +181,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator-=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator-=(vec<2, U, Q> const& v) { this->x -= static_cast(v.x); this->y -= static_cast(v.y); @@ -207,7 +190,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator*=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator*=(U scalar) { this->x *= static_cast(scalar); this->y *= static_cast(scalar); @@ -216,7 +199,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator*=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator*=(vec<1, U, Q> const& v) { this->x *= static_cast(v.x); this->y *= static_cast(v.x); @@ -225,7 +208,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator*=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator*=(vec<2, U, Q> const& v) { this->x *= static_cast(v.x); this->y *= static_cast(v.y); @@ -234,7 +217,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator/=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator/=(U scalar) { this->x /= static_cast(scalar); this->y /= static_cast(scalar); @@ -243,7 +226,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator/=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator/=(vec<1, U, Q> const& v) { this->x /= static_cast(v.x); this->y /= static_cast(v.x); @@ -252,7 +235,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator/=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator/=(vec<2, U, Q> const& v) { this->x /= static_cast(v.x); this->y /= static_cast(v.y); @@ -262,7 +245,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator++() { ++this->x; ++this->y; @@ -270,7 +253,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator--() { --this->x; --this->y; @@ -278,7 +261,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> vec<2, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> vec<2, T, Q>::operator++(int) { vec<2, T, Q> Result(*this); ++*this; @@ -286,7 +269,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> vec<2, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> vec<2, T, Q>::operator--(int) { vec<2, T, Q> Result(*this); --*this; @@ -297,7 +280,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator%=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator%=(U scalar) { this->x %= static_cast(scalar); this->y %= static_cast(scalar); @@ -306,7 +289,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator%=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator%=(vec<1, U, Q> const& v) { this->x %= static_cast(v.x); this->y %= static_cast(v.x); @@ -315,7 +298,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator%=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator%=(vec<2, U, Q> const& v) { this->x %= static_cast(v.x); this->y %= static_cast(v.y); @@ -324,7 +307,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator&=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator&=(U scalar) { this->x &= static_cast(scalar); this->y &= static_cast(scalar); @@ -333,7 +316,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator&=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator&=(vec<1, U, Q> const& v) { this->x &= static_cast(v.x); this->y &= static_cast(v.x); @@ -342,7 +325,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator&=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator&=(vec<2, U, Q> const& v) { this->x &= static_cast(v.x); this->y &= static_cast(v.y); @@ -351,7 +334,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator|=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator|=(U scalar) { this->x |= static_cast(scalar); this->y |= static_cast(scalar); @@ -360,7 +343,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator|=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator|=(vec<1, U, Q> const& v) { this->x |= static_cast(v.x); this->y |= static_cast(v.x); @@ -369,7 +352,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator|=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator|=(vec<2, U, Q> const& v) { this->x |= static_cast(v.x); this->y |= static_cast(v.y); @@ -378,7 +361,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator^=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator^=(U scalar) { this->x ^= static_cast(scalar); this->y ^= static_cast(scalar); @@ -387,7 +370,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator^=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator^=(vec<1, U, Q> const& v) { this->x ^= static_cast(v.x); this->y ^= static_cast(v.x); @@ -396,7 +379,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator^=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator^=(vec<2, U, Q> const& v) { this->x ^= static_cast(v.x); this->y ^= static_cast(v.y); @@ -405,7 +388,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator<<=(U scalar) { this->x <<= static_cast(scalar); this->y <<= static_cast(scalar); @@ -414,7 +397,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator<<=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator<<=(vec<1, U, Q> const& v) { this->x <<= static_cast(v.x); this->y <<= static_cast(v.x); @@ -423,7 +406,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator<<=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator<<=(vec<2, U, Q> const& v) { this->x <<= static_cast(v.x); this->y <<= static_cast(v.y); @@ -432,7 +415,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator>>=(U scalar) { this->x >>= static_cast(scalar); this->y >>= static_cast(scalar); @@ -441,7 +424,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator>>=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator>>=(vec<1, U, Q> const& v) { this->x >>= static_cast(v.x); this->y >>= static_cast(v.x); @@ -450,7 +433,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> & vec<2, T, Q>::operator>>=(vec<2, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> & vec<2, T, Q>::operator>>=(vec<2, U, Q> const& v) { this->x >>= static_cast(v.x); this->y >>= static_cast(v.y); @@ -460,13 +443,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v) { return v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v) { return vec<2, T, Q>( -v.x, @@ -476,7 +459,7 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x + scalar, @@ -484,7 +467,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x + v2.x, @@ -492,7 +475,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator+(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator+(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar + v.x, @@ -500,7 +483,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator+(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator+(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x + v2.x, @@ -508,7 +491,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator+(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x + v2.x, @@ -516,7 +499,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x - scalar, @@ -524,7 +507,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x - v2.x, @@ -532,7 +515,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator-(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator-(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar - v.x, @@ -540,7 +523,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator-(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator-(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x - v2.x, @@ -548,7 +531,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator-(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x - v2.x, @@ -556,7 +539,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x * scalar, @@ -564,7 +547,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x * v2.x, @@ -572,7 +555,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator*(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator*(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar * v.x, @@ -580,7 +563,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator*(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator*(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x * v2.x, @@ -588,7 +571,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator*(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x * v2.x, @@ -596,7 +579,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x / scalar, @@ -604,7 +587,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x / v2.x, @@ -612,7 +595,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator/(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator/(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar / v.x, @@ -620,7 +603,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator/(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator/(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x / v2.x, @@ -628,7 +611,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator/(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x / v2.x, @@ -638,7 +621,7 @@ namespace glm // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x % scalar, @@ -646,7 +629,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x % v2.x, @@ -654,7 +637,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator%(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator%(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar % v.x, @@ -662,7 +645,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator%(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator%(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x % v2.x, @@ -670,7 +653,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator%(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x % v2.x, @@ -678,7 +661,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x & scalar, @@ -686,7 +669,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x & v2.x, @@ -694,7 +677,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator&(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator&(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar & v.x, @@ -702,7 +685,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator&(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator&(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x & v2.x, @@ -710,7 +693,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator&(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x & v2.x, @@ -718,7 +701,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x | scalar, @@ -726,7 +709,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x | v2.x, @@ -734,7 +717,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator|(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator|(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar | v.x, @@ -742,7 +725,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator|(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator|(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x | v2.x, @@ -750,7 +733,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator|(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x | v2.x, @@ -758,7 +741,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x ^ scalar, @@ -766,7 +749,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x ^ v2.x, @@ -774,7 +757,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator^(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator^(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar ^ v.x, @@ -782,7 +765,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator^(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator^(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x ^ v2.x, @@ -790,7 +773,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator^(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x ^ v2.x, @@ -798,7 +781,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x << scalar, @@ -806,7 +789,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x << v2.x, @@ -814,7 +797,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator<<(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator<<(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar << v.x, @@ -822,7 +805,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator<<(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x << v2.x, @@ -830,7 +813,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator<<(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x << v2.x, @@ -838,7 +821,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v, T scalar) { return vec<2, T, Q>( v.x >> scalar, @@ -846,7 +829,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<2, T, Q>( v1.x >> v2.x, @@ -854,7 +837,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator>>(T scalar, vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator>>(T scalar, vec<2, T, Q> const& v) { return vec<2, T, Q>( scalar >> v.x, @@ -862,7 +845,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator>>(vec<1, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x >> v2.x, @@ -870,7 +853,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator>>(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return vec<2, T, Q>( v1.x >> v2.x, @@ -878,7 +861,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, T, Q> operator~(vec<2, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<2, T, Q> operator~(vec<2, T, Q> const& v) { return vec<2, T, Q>( ~v.x, @@ -888,7 +871,7 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator==(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return detail::compute_equal::is_iec559>::call(v1.x, v2.x) && @@ -896,19 +879,19 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(vec<2, T, Q> const& v1, vec<2, T, Q> const& v2) { return !(v1 == v2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, bool, Q> operator&&(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, bool, Q> operator&&(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2) { return vec<2, bool, Q>(v1.x && v2.x, v1.y && v2.y); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<2, bool, Q> operator||(vec<2, bool, Q> const& v1, vec<2, bool, Q> const& v2) { return vec<2, bool, Q>(v1.x || v2.x, v1.y || v2.y); } diff --git a/glm/detail/type_vec3.hpp b/glm/detail/type_vec3.hpp index 90de2f8a4..2252bde1c 100644 --- a/glm/detail/type_vec3.hpp +++ b/glm/detail/type_vec3.hpp @@ -97,15 +97,15 @@ namespace glm /// Return the count of components of the vector typedef length_t length_type; - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 3;} + GLM_FUNC_DECL static constexpr length_type length(){return 3;} - GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i); - GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const; + GLM_FUNC_DECL constexpr T & operator[](length_type i); + GLM_FUNC_DECL constexpr T const& operator[](length_type i) const; // -- Implicit basic constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec const& v) GLM_DEFAULT; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_FUNC_DECL constexpr vec(vec const& v) = default; template GLM_CTOR_DECL vec(vec<3, T, P> const& v); @@ -162,19 +162,19 @@ namespace glm // -- Swizzle constructors -- # if GLM_CONFIG_SWIZZLE == GLM_SWIZZLE_OPERATOR template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(detail::_swizzle<3, T, Q, E0, E1, E2, -1> const& that) + GLM_FUNC_DISCARD_DECL constexpr vec(detail::_swizzle<3, T, Q, E0, E1, E2, -1> const& that) { *this = that(); } template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v, T const& scalar) + GLM_FUNC_DISCARD_DECL constexpr vec(detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v, T const& scalar) { *this = vec(v(), scalar); } template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec(T const& scalar, detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v) + GLM_FUNC_DISCARD_DECL constexpr vec(T const& scalar, detail::_swizzle<2, T, Q, E0, E1, -1, -2> const& v) { *this = vec(scalar, v()); } @@ -182,80 +182,80 @@ namespace glm // -- Unary arithmetic operators -- - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q>& operator=(vec<3, T, Q> const& v) GLM_DEFAULT; + GLM_DEFAULTED_FUNC_DECL constexpr vec<3, T, Q>& operator=(vec<3, T, Q> const& v) = default; template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator+=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator+=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator+=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator+=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator+=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator+=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator-=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator-=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator-=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator-=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator-=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator-=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator*=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator*=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator*=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator*=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator*=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator*=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator/=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator/=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator/=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator/=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator/=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator/=(vec<3, U, Q> const& v); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator--(); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator++(int); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator%=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator%=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator%=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator%=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator%=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator%=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator&=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator&=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator&=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator&=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator&=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator&=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator|=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator|=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator|=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator|=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator|=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator|=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator^=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator^=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator^=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator^=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator^=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator^=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator<<=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator<<=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator<<=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator<<=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator<<=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator<<=(vec<3, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator>>=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator>>=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator>>=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator>>=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<3, T, Q> & operator>>=(vec<3, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<3, T, Q> & operator>>=(vec<3, U, Q> const& v); }; @@ -263,179 +263,179 @@ namespace glm // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(T scalar, vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(T scalar, vec<3, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<1, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> operator~(vec<3, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<3, T, Q> operator~(vec<3, T, Q> const& v); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator==(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator!=(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, bool, Q> operator&&(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, bool, Q> operator&&(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2); diff --git a/glm/detail/type_vec3.inl b/glm/detail/type_vec3.inl index 2bf65d866..3c5905963 100644 --- a/glm/detail/type_vec3.inl +++ b/glm/detail/type_vec3.inl @@ -9,35 +9,28 @@ namespace glm # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr vec<3, T, Q>::vec() # if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE : x(0), y(0), z(0) # endif {} # endif -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<3, T, Q> const& v) - : x(v.x), y(v.y), z(v.z) - {} -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<3, T, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<3, T, P> const& v) : x(v.x), y(v.y), z(v.z) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(T scalar) : x(scalar), y(scalar), z(scalar) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(T _x, T _y, T _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(T _x, T _y, T _z) : x(_x), y(_y), z(_z) {} @@ -45,7 +38,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<1, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<1, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.x)) , z(static_cast(v.x)) @@ -53,7 +46,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(X _x, Y _y, Z _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(X _x, Y _y, Z _z) : x(static_cast(_x)) , y(static_cast(_y)) , z(static_cast(_z)) @@ -61,7 +54,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, Z _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, Z _z) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_z)) @@ -69,7 +62,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, Z _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, Z _z) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_z)) @@ -77,7 +70,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, Z _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, Z _z) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_z)) @@ -85,7 +78,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(X _x, Y _y, vec<1, Z, Q> const& _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(X _x, Y _y, vec<1, Z, Q> const& _z) : x(static_cast(_x)) , y(static_cast(_y)) , z(static_cast(_z.x)) @@ -93,7 +86,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, vec<1, Z, Q> const& _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, vec<1, Z, Q> const& _z) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_z.x)) @@ -101,7 +94,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_z.x)) @@ -109,7 +102,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_z.x)) @@ -119,7 +112,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<2, A, P> const& _xy, B _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<2, A, P> const& _xy, B _z) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_z)) @@ -127,7 +120,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<2, A, P> const& _xy, vec<1, B, P> const& _z) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<2, A, P> const& _xy, vec<1, B, P> const& _z) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_z.x)) @@ -135,7 +128,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(A _x, vec<2, B, P> const& _yz) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(A _x, vec<2, B, P> const& _yz) : x(static_cast(_x)) , y(static_cast(_yz.x)) , z(static_cast(_yz.y)) @@ -143,7 +136,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<1, A, P> const& _x, vec<2, B, P> const& _yz) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<1, A, P> const& _x, vec<2, B, P> const& _yz) : x(static_cast(_x.x)) , y(static_cast(_yz.x)) , z(static_cast(_yz.y)) @@ -151,7 +144,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<3, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<3, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.y)) , z(static_cast(v.z)) @@ -159,7 +152,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>::vec(vec<4, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>::vec(vec<4, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.y)) , z(static_cast(v.z)) @@ -168,7 +161,7 @@ namespace glm // -- Component accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T & vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) + GLM_FUNC_QUALIFIER constexpr T & vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) { GLM_ASSERT_LENGTH(i, this->length()); switch(i) @@ -184,7 +177,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER constexpr T const& vec<3, T, Q>::operator[](typename vec<3, T, Q>::length_type i) const { GLM_ASSERT_LENGTH(i, this->length()); switch(i) @@ -201,20 +194,9 @@ namespace glm // -- Unary arithmetic operators -- -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>& vec<3, T, Q>::operator=(vec<3, T, Q> const& v) - { - this->x = v.x; - this->y = v.y; - this->z = v.z; - return *this; - } -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q>& vec<3, T, Q>::operator=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q>& vec<3, T, Q>::operator=(vec<3, U, Q> const& v) { this->x = static_cast(v.x); this->y = static_cast(v.y); @@ -224,84 +206,84 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator+=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator+=(U scalar) { return (*this = detail::compute_vec_add<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator+=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator+=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_add<3, T, Q, detail::is_aligned::value>::call(*this, vec<1, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator+=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator+=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_add<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator-=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator-=(U scalar) { return (*this = detail::compute_vec_sub<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator-=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator-=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_sub<3, T, Q, detail::is_aligned::value>::call(*this, vec<1, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator-=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator-=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_sub<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator*=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator*=(U scalar) { return (*this = detail::compute_vec_mul<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(static_cast(scalar)))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator*=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator*=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_mul<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator*=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator*=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_mul<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator/=(U v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator/=(U v) { return (*this = detail::compute_vec_div<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator/=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator/=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_div<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator/=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator/=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_div<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } @@ -309,7 +291,7 @@ namespace glm // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator++() { ++this->x; ++this->y; @@ -318,7 +300,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator--() { --this->x; --this->y; @@ -327,7 +309,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> vec<3, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> vec<3, T, Q>::operator++(int) { vec<3, T, Q> Result(*this); ++*this; @@ -335,7 +317,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> vec<3, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> vec<3, T, Q>::operator--(int) { vec<3, T, Q> Result(*this); --*this; @@ -346,126 +328,126 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator%=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator%=(U scalar) { return (*this = detail::compute_vec_mod<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator%=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator%=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_mod<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator%=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator%=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_mod<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator&=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator&=(U scalar) { return (*this = detail::compute_vec_and<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator&=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator&=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_and<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator&=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator&=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_and<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator|=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator|=(U scalar) { return (*this = detail::compute_vec_or<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator|=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator|=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_or<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator|=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator|=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_or<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator^=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator^=(U scalar) { return (*this = detail::compute_vec_xor<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator^=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator^=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_xor<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator^=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator^=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_xor<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator<<=(U scalar) { return (*this = detail::compute_vec_shift_left<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator<<=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator<<=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_shift_left<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<1, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator<<=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator<<=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_shift_left<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator>>=(U scalar) { return (*this = detail::compute_vec_shift_right<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator>>=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator>>=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_shift_right<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> & vec<3, T, Q>::operator>>=(vec<3, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> & vec<3, T, Q>::operator>>=(vec<3, U, Q> const& v) { return (*this = detail::compute_vec_shift_right<3, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); @@ -474,13 +456,13 @@ namespace glm // -- Unary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v) { return v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v) { return vec<3, T, Q>(0) -= v; } @@ -488,122 +470,122 @@ namespace glm // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) += scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<3, T, Q>(v1) += v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator+(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator+(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(v) += scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator+(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator+(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) += v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator+(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) += v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) -= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) -= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator-(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator-(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) -= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator-(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator-(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) -= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator-(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) -= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) *= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) *= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(v) *= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(v) *= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator*(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) *= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) /= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) /= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator/(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator/(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) /= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator/(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator/(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) /= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator/(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) /= v2; } @@ -611,187 +593,187 @@ namespace glm // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) %= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) %= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator%(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator%(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) %= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator%(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator%(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar.x) %= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator%(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) %= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) &= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) &= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator&(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator&(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) &= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator&(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator&(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar.x) &= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator&(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) &= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) |= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) |= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator|(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator|(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) |= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator|(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator|(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar.x) |= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator|(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) |= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) ^= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) ^= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator^(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator^(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) ^= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator^(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator^(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar.x) ^= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator^(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) ^= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) <<= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) <<= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator<<(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator<<(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) << v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator<<(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar.x) << v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator<<(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) <<= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v, T scalar) { return vec<3, T, Q>(v) >>= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<3, T, Q>(v) >>= scalar.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator>>(T scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator>>(T scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar) >>= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator>>(vec<1, T, Q> const& scalar, vec<3, T, Q> const& v) { return vec<3, T, Q>(scalar.x) >>= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator>>(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return vec<3, T, Q>(v1) >>= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> operator~(vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> operator~(vec<3, T, Q> const& v) { return vec<3, T, Q>( ~v.x, @@ -802,7 +784,7 @@ namespace glm // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator==(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return detail::compute_equal::is_iec559>::call(v1.x, v2.x) && @@ -811,19 +793,19 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(vec<3, T, Q> const& v1, vec<3, T, Q> const& v2) { return !(v1 == v2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, bool, Q> operator&&(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, bool, Q> operator&&(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2) { return vec<3, bool, Q>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<3, bool, Q> operator||(vec<3, bool, Q> const& v1, vec<3, bool, Q> const& v2) { return vec<3, bool, Q>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z); } @@ -859,7 +841,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, double, aligned_highp>::vec(const vec<3, double, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, double, aligned_highp>::vec(const vec<3, double, aligned_highp>& v) #if (GLM_ARCH & GLM_ARCH_AVX_BIT) :data(v.data) {} #else @@ -874,19 +856,19 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, float, aligned_highp>::vec(const vec<3, float, aligned_highp>& v) : + GLM_FUNC_QUALIFIER constexpr vec<3, float, aligned_highp>::vec(const vec<3, float, aligned_highp>& v) : data(v.data) {} template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, float, aligned_highp>::vec(const vec<3, float, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, float, aligned_highp>::vec(const vec<3, float, packed_highp>& v) { data = _mm_set_ps(v[2], v[2], v[1], v[0]); } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, float, packed_highp>::vec(const vec<3, float, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, float, packed_highp>::vec(const vec<3, float, aligned_highp>& v) { _mm_store_sd(reinterpret_cast(this), _mm_castps_pd(v.data)); __m128 mz = _mm_shuffle_ps(v.data, v.data, _MM_SHUFFLE(2, 2, 2, 2)); @@ -895,7 +877,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, double, aligned_highp>::vec(const vec<3, double, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, double, aligned_highp>::vec(const vec<3, double, packed_highp>& v) { #if (GLM_ARCH & GLM_ARCH_AVX_BIT) data = _mm256_set_pd(v[2], v[2], v[1], v[0]); @@ -907,7 +889,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, double, packed_highp>::vec(const vec<3, double, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, double, packed_highp>::vec(const vec<3, double, aligned_highp>& v) { #if (GLM_ARCH & GLM_ARCH_AVX_BIT) __m256d T1 = _mm256_permute_pd(v.data, 1); @@ -922,14 +904,14 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, int, aligned_highp>::vec(const vec<3, int, aligned_highp>& v) : + GLM_FUNC_QUALIFIER constexpr vec<3, int, aligned_highp>::vec(const vec<3, int, aligned_highp>& v) : data(v.data) { } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, int, aligned_highp>::vec(const vec<3, int, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, int, aligned_highp>::vec(const vec<3, int, packed_highp>& v) { __m128 mx = _mm_load_ss(reinterpret_cast(&v[0])); __m128 my = _mm_load_ss(reinterpret_cast(&v[1])); @@ -940,7 +922,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, int, packed_highp>::vec(const vec<3, int, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, int, packed_highp>::vec(const vec<3, int, aligned_highp>& v) { _mm_store_sd(reinterpret_cast(this), _mm_castsi128_pd(v.data)); __m128 mz = _mm_shuffle_ps(_mm_castsi128_ps(v.data), _mm_castsi128_ps(v.data), _MM_SHUFFLE(2, 2, 2, 2)); @@ -949,14 +931,14 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, unsigned int, aligned_highp>::vec(const vec<3, unsigned int, aligned_highp>& v) : + GLM_FUNC_QUALIFIER constexpr vec<3, unsigned int, aligned_highp>::vec(const vec<3, unsigned int, aligned_highp>& v) : data(v.data) { } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, unsigned int, aligned_highp>::vec(const vec<3, unsigned int, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, unsigned int, aligned_highp>::vec(const vec<3, unsigned int, packed_highp>& v) { __m128 mx = _mm_load_ss(reinterpret_cast(&v[0])); __m128 my = _mm_load_ss(reinterpret_cast(&v[1])); @@ -967,7 +949,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, unsigned int, packed_highp>::vec(const vec<3, unsigned int, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<3, unsigned int, packed_highp>::vec(const vec<3, unsigned int, aligned_highp>& v) { _mm_store_sd(reinterpret_cast(this), _mm_castsi128_pd(v.data)); __m128 mz = _mm_shuffle_ps(_mm_castsi128_ps(v.data), _mm_castsi128_ps(v.data), _MM_SHUFFLE(2, 2, 2, 2)); diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 9ba11229f..093d798d8 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -95,15 +95,15 @@ namespace glm typedef length_t length_type; /// Return the count of components of the vector - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 4;} + GLM_FUNC_DECL static constexpr length_type length(){return 4;} - GLM_FUNC_DECL GLM_CONSTEXPR T & operator[](length_type i); - GLM_FUNC_DECL GLM_CONSTEXPR T const& operator[](length_type i) const; + GLM_FUNC_DECL constexpr T & operator[](length_type i); + GLM_FUNC_DECL constexpr T const& operator[](length_type i) const; // -- Implicit basic constructors -- - GLM_DEFAULTED_DEFAULT_CTOR_DECL GLM_CONSTEXPR vec() GLM_DEFAULT_CTOR; - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec(vec<4, T, Q> const& v) GLM_DEFAULT; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr vec() GLM_DEFAULT_CTOR; + GLM_DEFAULTED_FUNC_DECL constexpr vec(vec<4, T, Q> const& v) = default; template GLM_CTOR_DECL vec(vec<4, T, P> const& v); @@ -254,259 +254,259 @@ namespace glm // -- Unary arithmetic operators -- - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q>& operator=(vec<4, T, Q> const& v) GLM_DEFAULT; + GLM_DEFAULTED_FUNC_DECL constexpr vec<4, T, Q>& operator=(vec<4, T, Q> const& v) = default; template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator=(vec<4, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator=(vec<4, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator+=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator+=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator+=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator+=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator+=(vec<4, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator+=(vec<4, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator-=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator-=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator-=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator-=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator-=(vec<4, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator-=(vec<4, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator*=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator*=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator*=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator*=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator*=(vec<4, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator*=(vec<4, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator/=(U scalar); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator/=(U scalar); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator/=(vec<1, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator/=(vec<1, U, Q> const& v); template - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q>& operator/=(vec<4, U, Q> const& v); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q>& operator/=(vec<4, U, Q> const& v); // -- Increment and decrement operators -- - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q> & operator++(); - GLM_FUNC_DISCARD_DECL GLM_CONSTEXPR vec<4, T, Q> & operator--(); - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator++(int); - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator--(int); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q> & operator++(); + GLM_FUNC_DISCARD_DECL constexpr vec<4, T, Q> & operator--(); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator++(int); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator--(int); // -- Unary bit operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator%=(U scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator%=(U scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator%=(vec<1, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator%=(vec<1, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator%=(vec<4, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator%=(vec<4, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator&=(U scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator&=(U scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator&=(vec<1, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator&=(vec<1, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator&=(vec<4, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator&=(vec<4, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator|=(U scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator|=(U scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator|=(vec<1, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator|=(vec<1, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator|=(vec<4, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator|=(vec<4, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator^=(U scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator^=(U scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator^=(vec<1, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator^=(vec<1, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator^=(vec<4, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator^=(vec<4, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator<<=(U scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator<<=(U scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator<<=(vec<1, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator<<=(vec<1, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator<<=(vec<4, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator<<=(vec<4, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator>>=(U scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator>>=(U scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator>>=(vec<1, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator>>=(vec<1, U, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> & operator>>=(vec<4, U, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> & operator>>=(vec<4, U, Q> const& v); }; // -- Unary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v); // -- Binary operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v, T scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v, T scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(T scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(T scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, T, Q> operator~(vec<4, T, Q> const& v); + GLM_FUNC_DECL constexpr vec<4, T, Q> operator~(vec<4, T, Q> const& v); // -- Boolean operators -- template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator==(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator==(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR bool operator!=(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); + GLM_FUNC_DECL constexpr bool operator!=(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> operator&&(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, bool, Q> operator&&(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2); template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2); + GLM_FUNC_DECL constexpr vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2); }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 2d1ad558b..ff74c7004 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -13,35 +13,28 @@ namespace detail # if GLM_CONFIG_DEFAULTED_DEFAULT_CTOR == GLM_DISABLE template - GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec() + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr vec<4, T, Q>::vec() # if GLM_CONFIG_CTOR_INIT != GLM_CTOR_INIT_DISABLE : x(0), y(0), z(0), w(0) # endif {} # endif -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<4, T, Q> const& v) - : x(v.x), y(v.y), z(v.z), w(v.w) - {} -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<4, T, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<4, T, P> const& v) : x(v.x), y(v.y), z(v.z), w(v.w) {} // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(T scalar) : x(scalar), y(scalar), z(scalar), w(scalar) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(T _x, T _y, T _z, T _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(T _x, T _y, T _z, T _w) : x(_x), y(_y), z(_z), w(_w) {} @@ -49,7 +42,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.x)) , z(static_cast(v.x)) @@ -58,7 +51,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, Y _y, Z _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, Y _y, Z _z, W _w) : x(static_cast(_x)) , y(static_cast(_y)) , z(static_cast(_z)) @@ -67,7 +60,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, Z _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, Z _z, W _w) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_z)) @@ -76,7 +69,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, Z _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, Z _z, W _w) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_z)) @@ -85,7 +78,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, Z _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, Z _z, W _w) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_z)) @@ -94,7 +87,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, Y _y, vec<1, Z, Q> const& _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, Y _y, vec<1, Z, Q> const& _z, W _w) : x(static_cast(_x)) , y(static_cast(_y)) , z(static_cast(_z.x)) @@ -103,7 +96,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, vec<1, Z, Q> const& _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, vec<1, Z, Q> const& _z, W _w) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_z.x)) @@ -112,7 +105,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, W _w) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_z.x)) @@ -121,7 +114,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, W _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, W _w) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_z.x)) @@ -130,7 +123,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, Z _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, Z _z, vec<1, W, Q> const& _w) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_z)) @@ -139,7 +132,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, Z _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, Z _z, vec<1, W, Q> const& _w) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_z)) @@ -148,7 +141,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, Z _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, Z _z, vec<1, W, Q> const& _w) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_z)) @@ -157,7 +150,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, Y _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, Y _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) : x(static_cast(_x)) , y(static_cast(_y)) , z(static_cast(_z.x)) @@ -166,7 +159,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, Y _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_z.x)) @@ -175,7 +168,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(X _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_z.x)) @@ -184,7 +177,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, X, Q> const& _x, vec<1, Y, Q> const& _y, vec<1, Z, Q> const& _z, vec<1, W, Q> const& _w) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_z.x)) @@ -195,7 +188,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<2, A, P> const& _xy, B _z, C _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<2, A, P> const& _xy, B _z, C _w) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_z)) @@ -204,7 +197,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<2, A, P> const& _xy, vec<1, B, P> const& _z, C _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<2, A, P> const& _xy, vec<1, B, P> const& _z, C _w) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_z.x)) @@ -213,7 +206,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<2, A, P> const& _xy, B _z, vec<1, C, P> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<2, A, P> const& _xy, B _z, vec<1, C, P> const& _w) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_z)) @@ -222,7 +215,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<2, A, P> const& _xy, vec<1, B, P> const& _z, vec<1, C, P> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<2, A, P> const& _xy, vec<1, B, P> const& _z, vec<1, C, P> const& _w) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_z.x)) @@ -231,7 +224,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(A _x, vec<2, B, P> const& _yz, C _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(A _x, vec<2, B, P> const& _yz, C _w) : x(static_cast(_x)) , y(static_cast(_yz.x)) , z(static_cast(_yz.y)) @@ -240,7 +233,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<2, B, P> const& _yz, C _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<2, B, P> const& _yz, C _w) : x(static_cast(_x.x)) , y(static_cast(_yz.x)) , z(static_cast(_yz.y)) @@ -249,7 +242,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(A _x, vec<2, B, P> const& _yz, vec<1, C, P> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(A _x, vec<2, B, P> const& _yz, vec<1, C, P> const& _w) : x(static_cast(_x)) , y(static_cast(_yz.x)) , z(static_cast(_yz.y)) @@ -258,7 +251,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<2, B, P> const& _yz, vec<1, C, P> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<2, B, P> const& _yz, vec<1, C, P> const& _w) : x(static_cast(_x.x)) , y(static_cast(_yz.x)) , z(static_cast(_yz.y)) @@ -267,7 +260,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(A _x, B _y, vec<2, C, P> const& _zw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(A _x, B _y, vec<2, C, P> const& _zw) : x(static_cast(_x)) , y(static_cast(_y)) , z(static_cast(_zw.x)) @@ -276,7 +269,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, A, P> const& _x, B _y, vec<2, C, P> const& _zw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, A, P> const& _x, B _y, vec<2, C, P> const& _zw) : x(static_cast(_x.x)) , y(static_cast(_y)) , z(static_cast(_zw.x)) @@ -285,7 +278,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(A _x, vec<1, B, P> const& _y, vec<2, C, P> const& _zw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(A _x, vec<1, B, P> const& _y, vec<2, C, P> const& _zw) : x(static_cast(_x)) , y(static_cast(_y.x)) , z(static_cast(_zw.x)) @@ -294,7 +287,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<1, B, P> const& _y, vec<2, C, P> const& _zw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<1, B, P> const& _y, vec<2, C, P> const& _zw) : x(static_cast(_x.x)) , y(static_cast(_y.x)) , z(static_cast(_zw.x)) @@ -303,7 +296,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<3, A, P> const& _xyz, B _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<3, A, P> const& _xyz, B _w) : x(static_cast(_xyz.x)) , y(static_cast(_xyz.y)) , z(static_cast(_xyz.z)) @@ -312,7 +305,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<3, A, P> const& _xyz, vec<1, B, P> const& _w) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<3, A, P> const& _xyz, vec<1, B, P> const& _w) : x(static_cast(_xyz.x)) , y(static_cast(_xyz.y)) , z(static_cast(_xyz.z)) @@ -321,7 +314,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(A _x, vec<3, B, P> const& _yzw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(A _x, vec<3, B, P> const& _yzw) : x(static_cast(_x)) , y(static_cast(_yzw.x)) , z(static_cast(_yzw.y)) @@ -330,7 +323,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<3, B, P> const& _yzw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<1, A, P> const& _x, vec<3, B, P> const& _yzw) : x(static_cast(_x.x)) , y(static_cast(_yzw.x)) , z(static_cast(_yzw.y)) @@ -339,7 +332,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<2, A, P> const& _xy, vec<2, B, P> const& _zw) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<2, A, P> const& _xy, vec<2, B, P> const& _zw) : x(static_cast(_xy.x)) , y(static_cast(_xy.y)) , z(static_cast(_zw.x)) @@ -348,7 +341,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>::vec(vec<4, U, P> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>::vec(vec<4, U, P> const& v) : x(static_cast(v.x)) , y(static_cast(v.y)) , z(static_cast(v.z)) @@ -359,7 +352,7 @@ namespace detail // -- Component accesses -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) + GLM_FUNC_QUALIFIER constexpr T& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) { GLM_ASSERT_LENGTH(i, this->length()); switch (i) @@ -377,7 +370,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T const& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) const + GLM_FUNC_QUALIFIER constexpr T const& vec<4, T, Q>::operator[](typename vec<4, T, Q>::length_type i) const { GLM_ASSERT_LENGTH(i, this->length()); switch (i) @@ -396,21 +389,9 @@ namespace detail // -- Unary arithmetic operators -- -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>& vec<4, T, Q>::operator=(vec<4, T, Q> const& v) - { - this->x = v.x; - this->y = v.y; - this->z = v.z; - this->w = v.w; - return *this; - } -# endif - template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q>& vec<4, T, Q>::operator=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q>& vec<4, T, Q>::operator=(vec<4, U, Q> const& v) { this->x = static_cast(v.x); this->y = static_cast(v.y); @@ -421,84 +402,84 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator+=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator+=(U scalar) { return (*this = detail::compute_vec_add<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator+=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator+=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_add<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator+=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator+=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_add<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator-=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator-=(U scalar) { return (*this = detail::compute_vec_sub<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator-=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator-=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_sub<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator-=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator-=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_sub<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator*=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator*=(U scalar) { return (*this = detail::compute_vec_mul<4,T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator*=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator*=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_mul<4,T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator*=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator*=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_mul<4,T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator/=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator/=(U scalar) { return (*this = detail::compute_vec_div<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator/=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator/=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_div<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v.x))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator/=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator/=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_div<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } @@ -506,7 +487,7 @@ namespace detail // -- Increment and decrement operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator++() + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator++() { ++this->x; ++this->y; @@ -516,7 +497,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator--() + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator--() { --this->x; --this->y; @@ -526,7 +507,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> vec<4, T, Q>::operator++(int) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> vec<4, T, Q>::operator++(int) { vec<4, T, Q> Result(*this); ++*this; @@ -534,7 +515,7 @@ namespace detail } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> vec<4, T, Q>::operator--(int) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> vec<4, T, Q>::operator--(int) { vec<4, T, Q> Result(*this); --*this; @@ -545,126 +526,126 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator%=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator%=(U scalar) { return (*this = detail::compute_vec_mod<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator%=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator%=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_mod<3, T, Q, detail::is_aligned::value>::call(*this, vec<3, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator%=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator%=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_mod<4, T, Q, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator&=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator&=(U scalar) { return (*this = detail::compute_vec_and<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator&=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator&=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_and<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator&=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator&=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_and<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator|=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator|=(U scalar) { return (*this = detail::compute_vec_or<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator|=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator|=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_or<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator|=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator|=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_or<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator^=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator^=(U scalar) { return (*this = detail::compute_vec_xor<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator^=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator^=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_xor<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator^=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator^=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_xor<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator<<=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator<<=(U scalar) { return (*this = detail::compute_vec_shift_left<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator<<=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator<<=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_shift_left<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator<<=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator<<=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_shift_left<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator>>=(U scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator>>=(U scalar) { return (*this = detail::compute_vec_shift_right<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(scalar))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator>>=(vec<1, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator>>=(vec<1, U, Q> const& v) { return (*this = detail::compute_vec_shift_right<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> & vec<4, T, Q>::operator>>=(vec<4, U, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> & vec<4, T, Q>::operator>>=(vec<4, U, Q> const& v) { return (*this = detail::compute_vec_shift_right<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(*this, vec<4, T, Q>(v))); } @@ -672,13 +653,13 @@ namespace detail // -- Unary constant operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v) { return v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v) { return vec<4, T, Q>(0) -= v; } @@ -686,121 +667,121 @@ namespace detail // -- Binary arithmetic operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) += scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) += v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator+(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator+(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(v) += scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator+(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator+(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v2) += v1; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator+(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) += v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) -= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) -= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator-(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator-(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) -= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator-(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator-(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) -= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator-(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) -= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) *= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) *= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(v) *= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v2) *= v1; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator*(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) *= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) /= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) /= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator/(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator/(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) /= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator/(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator/(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) /= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator/(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) /= v2; } @@ -808,187 +789,187 @@ namespace detail // -- Binary bit operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) %= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) %= v2.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator%(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator%(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) %= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator%(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator%(vec<1, T, Q> const& scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar.x) %= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator%(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) %= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) &= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v, vec<1, T, Q> const& scalar) { return vec<4, T, Q>(v) &= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator&(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator&(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) &= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator&(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator&(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) &= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator&(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator&(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) &= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) |= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) |= v2.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator|(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator|(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) |= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator|(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator|(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) |= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator|(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) |= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) ^= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) ^= v2.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator^(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator^(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) ^= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator^(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator^(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) ^= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator^(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) ^= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) <<= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) <<= v2.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator<<(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator<<(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) <<= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator<<(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) <<= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator<<(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) <<= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v, T scalar) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v, T scalar) { return vec<4, T, Q>(v) >>= scalar; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<1, T, Q> const& v2) { return vec<4, T, Q>(v1) >>= v2.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator>>(T scalar, vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator>>(T scalar, vec<4, T, Q> const& v) { return vec<4, T, Q>(scalar) >>= v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator>>(vec<1, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1.x) >>= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator>>(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return vec<4, T, Q>(v1) >>= v2; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, T, Q> operator~(vec<4, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<4, T, Q> operator~(vec<4, T, Q> const& v) { return detail::compute_vec_bitwise_not<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(v); } @@ -996,25 +977,25 @@ namespace detail // -- Boolean operators -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator==(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator==(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return detail::compute_vec_equal<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(v1, v2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool operator!=(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr bool operator!=(vec<4, T, Q> const& v1, vec<4, T, Q> const& v2) { return detail::compute_vec_nequal<4, T, Q, detail::is_int::value, sizeof(T) * 8, detail::is_aligned::value>::call(v1, v2); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> operator&&(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, bool, Q> operator&&(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2) { return vec<4, bool, Q>(v1.x && v2.x, v1.y && v2.y, v1.z && v2.z, v1.w && v2.w); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2) + GLM_FUNC_QUALIFIER constexpr vec<4, bool, Q> operator||(vec<4, bool, Q> const& v1, vec<4, bool, Q> const& v2) { return vec<4, bool, Q>(v1.x || v2.x, v1.y || v2.y, v1.z || v2.z, v1.w || v2.w); } @@ -1047,49 +1028,49 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, float, aligned_highp>::vec(const vec<4, float, aligned_highp>& v): + GLM_FUNC_QUALIFIER constexpr vec<4, float, aligned_highp>::vec(const vec<4, float, aligned_highp>& v): data(v.data) { } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, float, aligned_highp>::vec(const vec<4, float, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, float, aligned_highp>::vec(const vec<4, float, packed_highp>& v) { data = _mm_loadu_ps(reinterpret_cast(&v)); } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, float, packed_highp>::vec(const vec<4, float, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, float, packed_highp>::vec(const vec<4, float, aligned_highp>& v) { _mm_storeu_ps(reinterpret_cast(this), v.data); } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, int, aligned_highp>::vec(const vec<4, int, aligned_highp>& v) : + GLM_FUNC_QUALIFIER constexpr vec<4, int, aligned_highp>::vec(const vec<4, int, aligned_highp>& v) : data(v.data) { } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, int, aligned_highp>::vec(const vec<4, int, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, int, aligned_highp>::vec(const vec<4, int, packed_highp>& v) { data = _mm_loadu_si128(reinterpret_cast(&v)); } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, int, packed_highp>::vec(const vec<4, int, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, int, packed_highp>::vec(const vec<4, int, aligned_highp>& v) { _mm_storeu_si128(reinterpret_cast<__m128i*>(this), v.data); } template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, double, aligned_highp>::vec(const vec<4, double, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, double, aligned_highp>::vec(const vec<4, double, aligned_highp>& v) { # if (GLM_ARCH & GLM_ARCH_AVX_BIT) data = v.data; @@ -1101,7 +1082,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, double, aligned_highp>::vec(const vec<4, double, packed_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, double, aligned_highp>::vec(const vec<4, double, packed_highp>& v) { # if (GLM_ARCH & GLM_ARCH_AVX_BIT) data = _mm256_loadu_pd(reinterpret_cast(&v)); @@ -1113,7 +1094,7 @@ namespace glm { template<> template<> - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, double, packed_highp>::vec(const vec<4, double, aligned_highp>& v) + GLM_FUNC_QUALIFIER constexpr vec<4, double, packed_highp>::vec(const vec<4, double, aligned_highp>& v) { # if (GLM_ARCH & GLM_ARCH_AVX_BIT) _mm256_storeu_pd(reinterpret_cast(this), v.data); diff --git a/glm/detail/type_vec_simd.inl b/glm/detail/type_vec_simd.inl index ca1d2fd01..1978d00af 100644 --- a/glm/detail/type_vec_simd.inl +++ b/glm/detail/type_vec_simd.inl @@ -579,41 +579,41 @@ struct compute_vec_div : public compute_vec_div #define CTOR_FLOAT(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(float _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(float _s) :\ data(_mm_set1_ps(_s))\ {} #if GLM_ARCH & GLM_ARCH_AVX_BIT # define CTOR_DOUBLE(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(double _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(double _s) :\ data(_mm256_set1_pd(_s)){} #define CTOR_DOUBLE4(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(double _x, double _y, double _z, double _w):\ + GLM_FUNC_QUALIFIER constexpr vec::vec(double _x, double _y, double _z, double _w):\ data(_mm256_set_pd(_w, _z, _y, _x)) {} #define CTOR_DOUBLE3(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(double _x, double _y, double _z):\ + GLM_FUNC_QUALIFIER constexpr vec::vec(double _x, double _y, double _z):\ data(_mm256_set_pd(_z, _z, _y, _x)) {} # define CTOR_INT64(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(detail::int64 _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(detail::int64 _s) :\ data(_mm256_set1_epi64x(_s)){} #define CTOR_DOUBLE_COPY3(L, Q)\ template<>\ template\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, double, Q>::vec(vec<3, double, P> const& v) :\ + GLM_FUNC_QUALIFIER constexpr vec<3, double, Q>::vec(vec<3, double, P> const& v) :\ data(_mm256_setr_pd(v.x, v.y, v.z, v.z)){} #else # define CTOR_DOUBLE(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(double _v) \ + GLM_FUNC_QUALIFIER constexpr vec::vec(double _v) \ {\ data.setv(0, _mm_set1_pd(_v)); \ data.setv(1, _mm_set1_pd(_v)); \ @@ -621,7 +621,7 @@ struct compute_vec_div : public compute_vec_div #define CTOR_DOUBLE4(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(double _x, double _y, double _z, double _w)\ + GLM_FUNC_QUALIFIER constexpr vec::vec(double _x, double _y, double _z, double _w)\ {\ data.setv(0, _mm_setr_pd(_x, _y)); \ data.setv(1, _mm_setr_pd(_z, _w)); \ @@ -629,7 +629,7 @@ struct compute_vec_div : public compute_vec_div #define CTOR_DOUBLE3(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(double _x, double _y, double _z)\ + GLM_FUNC_QUALIFIER constexpr vec::vec(double _x, double _y, double _z)\ {\ data.setv(0, _mm_setr_pd(_x, _y)); \ data.setv(1, _mm_setr_pd(_z, _z)); \ @@ -637,13 +637,13 @@ struct compute_vec_div : public compute_vec_div # define CTOR_INT64(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(detail::int64 _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(detail::int64 _s) :\ data(_mm256_set1_epi64x(_s)){} #define CTOR_DOUBLE_COPY3(L, Q)\ template<>\ template\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, double, Q>::vec(vec<3, double, P> const& v)\ + GLM_FUNC_QUALIFIER constexpr vec<3, double, Q>::vec(vec<3, double, P> const& v)\ {\ data.setv(0, _mm_setr_pd(v.x, v.y));\ data.setv(1, _mm_setr_pd(v.z, 1.0));\ @@ -653,57 +653,57 @@ struct compute_vec_div : public compute_vec_div #define CTOR_INT(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _s) :\ data(_mm_set1_epi32(_s))\ {} #define CTOR_FLOAT4(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(float _x, float _y, float _z, float _w) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(float _x, float _y, float _z, float _w) :\ data(_mm_set_ps(_w, _z, _y, _x))\ {} #define CTOR_FLOAT3(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(float _x, float _y, float _z) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(float _x, float _y, float _z) :\ data(_mm_set_ps(_z, _z, _y, _x)){} #define CTOR_INT4(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _x, int _y, int _z, int _w) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _x, int _y, int _z, int _w) :\ data(_mm_set_epi32(_w, _z, _y, _x)){} #define CTOR_INT3(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _x, int _y, int _z) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _x, int _y, int _z) :\ data(_mm_set_epi32(_z, _z, _y, _x)){} #define CTOR_VECF_INT4(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _x, int _y, int _z, int _w) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _x, int _y, int _z, int _w) :\ data(_mm_cvtepi32_ps(_mm_set_epi32(_w, _z, _y, _x)))\ {} #define CTOR_VECF_INT3(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _x, int _y, int _z) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _x, int _y, int _z) :\ data(_mm_cvtepi32_ps(_mm_set_epi32(_z, _z, _y, _x)))\ {} #define CTOR_DEFAULT(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec() :\ + GLM_FUNC_QUALIFIER constexpr vec::vec() :\ data(_mm_setzero_ps())\ {} #define CTOR_FLOAT_COPY3(L, Q)\ template<>\ template\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, float, Q>::vec(vec<3, float, P> const& v)\ + GLM_FUNC_QUALIFIER constexpr vec<3, float, Q>::vec(vec<3, float, P> const& v)\ :data(_mm_set_ps(v.z, v.z, v.y, v.x))\ {} @@ -948,54 +948,54 @@ struct _swizzle_base1 : public _swizzle_base1< #define CTOR_FLOAT(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(float _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(float _s) :\ data(vdupq_n_f32(_s))\ {} #define CTOR_INT(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _s) :\ data(vdupq_n_s32(_s))\ {} #define CTOR_UINT(L, Q)\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(uint _s) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(uint _s) :\ data(vdupq_n_u32(_s))\ {} #define CTOR_VECF_INT4(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _x, int _y, int _z, int _w) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _x, int _y, int _z, int _w) :\ data(vcvtq_f32_s32(vec(_x, _y, _z, _w).data))\ {} #define CTOR_VECF_UINT4(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(uint _x, uint _y, uint _z, uint _w) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(uint _x, uint _y, uint _z, uint _w) :\ data(vcvtq_f32_u32(vec(_x, _y, _z, _w).data))\ {} #define CTOR_VECF_INT3(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(int _x, int _y, int _z) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(int _x, int _y, int _z) :\ data(vcvtq_f32_s32(vec(_x, _y, _z).data))\ {} #define CTOR_VECF_UINT4(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(uint _x, uint _y, uint _z, uint _w) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(uint _x, uint _y, uint _z, uint _w) :\ data(vcvtq_f32_u32(vec(_x, _y, _z, _w).data))\ {} #define CTOR_VECF_UINT3(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(uint _x, uint _y, uint _z) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(uint _x, uint _y, uint _z) :\ data(vcvtq_f32_u32(vec(_x, _y, _z).data))\ {} @@ -1003,21 +1003,21 @@ struct _swizzle_base1 : public _swizzle_base1< #define CTOR_VECF_VECF(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(const vec& rhs) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(const vec& rhs) :\ data(rhs.data)\ {} #define CTOR_VECF_VECI(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(const vec& rhs) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(const vec& rhs) :\ data(vcvtq_f32_s32(rhs.data))\ {} #define CTOR_VECF_VECU(L, Q)\ template<>\ template<>\ - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec::vec(const vec& rhs) :\ + GLM_FUNC_QUALIFIER constexpr vec::vec(const vec& rhs) :\ data(vcvtq_f32_u32(rhs.data))\ {} diff --git a/glm/ext/_matrix_vectorize.hpp b/glm/ext/_matrix_vectorize.hpp index 0d08117ed..0d49e844a 100644 --- a/glm/ext/_matrix_vectorize.hpp +++ b/glm/ext/_matrix_vectorize.hpp @@ -10,7 +10,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<2, 2, T, Q> call(Ret (*Func)(T x), mat<2, 2, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<2, 2, T, Q> call(Ret (*Func)(T x), mat<2, 2, T, Q> const &x) { return mat<2, 2, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[1][0]), Func(x[1][1]) @@ -21,7 +21,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<2, 3, T, Q> call(Ret (*Func)(T x), mat<2, 3, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<2, 3, T, Q> call(Ret (*Func)(T x), mat<2, 3, T, Q> const &x) { return mat<2, 3, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[1][0]), Func(x[1][1]), Func(x[1][2]) @@ -33,7 +33,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<2, 4, T, Q> call(Ret (*Func)(T x), mat<2, 4, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<2, 4, T, Q> call(Ret (*Func)(T x), mat<2, 4, T, Q> const &x) { return mat<2, 4, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[0][3]), Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), Func(x[1][3]) @@ -45,7 +45,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<3, 2, T, Q> call(Ret (*Func)(T x), mat<3, 2, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<3, 2, T, Q> call(Ret (*Func)(T x), mat<3, 2, T, Q> const &x) { return mat<3, 2, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[1][0]), Func(x[1][1]), @@ -58,7 +58,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<3, 3, T, Q> call(Ret (*Func)(T x), mat<3, 3, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<3, 3, T, Q> call(Ret (*Func)(T x), mat<3, 3, T, Q> const &x) { return mat<3, 3, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), @@ -71,7 +71,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<3, 4, T, Q> call(Ret (*Func)(T x), mat<3, 4, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<3, 4, T, Q> call(Ret (*Func)(T x), mat<3, 4, T, Q> const &x) { return mat<3, 4, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[0][3]), Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), Func(x[1][3]), @@ -84,7 +84,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 2, T, Q> call(Ret (*Func)(T x), mat<4, 2, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<4, 2, T, Q> call(Ret (*Func)(T x), mat<4, 2, T, Q> const &x) { return mat<4, 2, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[1][0]), Func(x[1][1]), @@ -98,7 +98,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 3, T, Q> call(Ret (*Func)(T x), mat<4, 3, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<4, 3, T, Q> call(Ret (*Func)(T x), mat<4, 3, T, Q> const &x) { return mat<4, 3, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), @@ -112,7 +112,7 @@ namespace glm { template class mat, typename Ret, typename T, qualifier Q> struct matrix_functor_1 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat<4, 4, T, Q> call(Ret (*Func)(T x), mat<4, 4, T, Q> const &x) { + GLM_FUNC_QUALIFIER constexpr static mat<4, 4, T, Q> call(Ret (*Func)(T x), mat<4, 4, T, Q> const &x) { return mat<4, 4, Ret, Q>( Func(x[0][0]), Func(x[0][1]), Func(x[0][2]), Func(x[0][3]), Func(x[1][0]), Func(x[1][1]), Func(x[1][2]), Func(x[1][3]), diff --git a/glm/ext/matrix_common.hpp b/glm/ext/matrix_common.hpp index 6bb3d06e7..4794318f0 100644 --- a/glm/ext/matrix_common.hpp +++ b/glm/ext/matrix_common.hpp @@ -31,7 +31,7 @@ namespace glm GLM_FUNC_DECL mat mix(mat const& x, mat const& y, U a); template - GLM_FUNC_DECL GLM_CONSTEXPR mat abs(mat const& x); + GLM_FUNC_DECL constexpr mat abs(mat const& x); /// @} }//namespace glm diff --git a/glm/ext/matrix_common.inl b/glm/ext/matrix_common.inl index 1be422202..6a8bb725b 100644 --- a/glm/ext/matrix_common.inl +++ b/glm/ext/matrix_common.inl @@ -19,14 +19,14 @@ namespace glm template struct compute_abs_matrix { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static mat call(mat const& x) + GLM_FUNC_QUALIFIER constexpr static mat call(mat const& x) { return detail::matrix_functor_1::call(abs, x); } }; template - GLM_FUNC_DECL GLM_CONSTEXPR mat abs(mat const& x) + GLM_FUNC_DECL constexpr mat abs(mat const& x) { return compute_abs_matrix::value>::call(x); } diff --git a/glm/ext/matrix_relational.hpp b/glm/ext/matrix_relational.hpp index 20023ad89..40d50ba66 100644 --- a/glm/ext/matrix_relational.hpp +++ b/glm/ext/matrix_relational.hpp @@ -34,7 +34,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(mat const& x, mat const& y); + GLM_FUNC_DECL constexpr vec equal(mat const& x, mat const& y); /// Perform a component-wise not-equal-to comparison of two matrices. /// Return a boolean vector which components value is True if this expression is satisfied per column of the matrices. @@ -44,7 +44,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y); + GLM_FUNC_DECL constexpr vec notEqual(mat const& x, mat const& y); /// Returns the component-wise comparison of |x - y| < epsilon. /// True if this expression is satisfied. @@ -54,7 +54,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(mat const& x, mat const& y, T epsilon); + GLM_FUNC_DECL constexpr vec equal(mat const& x, mat const& y, T epsilon); /// Returns the component-wise comparison of |x - y| < epsilon. /// True if this expression is satisfied. @@ -64,7 +64,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(mat const& x, mat const& y, vec const& epsilon); + GLM_FUNC_DECL constexpr vec equal(mat const& x, mat const& y, vec const& epsilon); /// Returns the component-wise comparison of |x - y| < epsilon. /// True if this expression is not satisfied. @@ -74,7 +74,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y, T epsilon); + GLM_FUNC_DECL constexpr vec notEqual(mat const& x, mat const& y, T epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. @@ -84,7 +84,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y, vec const& epsilon); + GLM_FUNC_DECL constexpr vec notEqual(mat const& x, mat const& y, vec const& epsilon); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is satisfied. @@ -94,7 +94,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(mat const& x, mat const& y, int ULPs); + GLM_FUNC_DECL constexpr vec equal(mat const& x, mat const& y, int ULPs); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is satisfied. @@ -104,7 +104,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(mat const& x, mat const& y, vec const& ULPs); + GLM_FUNC_DECL constexpr vec equal(mat const& x, mat const& y, vec const& ULPs); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is not satisfied. @@ -114,7 +114,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y, int ULPs); + GLM_FUNC_DECL constexpr vec notEqual(mat const& x, mat const& y, int ULPs); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is not satisfied. @@ -124,7 +124,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(mat const& x, mat const& y, vec const& ULPs); + GLM_FUNC_DECL constexpr vec notEqual(mat const& x, mat const& y, vec const& ULPs); /// @} }//namespace glm diff --git a/glm/ext/matrix_relational.inl b/glm/ext/matrix_relational.inl index 9cd42b772..c2952c68c 100644 --- a/glm/ext/matrix_relational.inl +++ b/glm/ext/matrix_relational.inl @@ -8,7 +8,7 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(mat const& a, mat const& b) + GLM_FUNC_QUALIFIER constexpr vec equal(mat const& a, mat const& b) { vec Result(true); for(length_t i = 0; i < C; ++i) @@ -17,13 +17,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(mat const& a, mat const& b, T Epsilon) + GLM_FUNC_QUALIFIER constexpr vec equal(mat const& a, mat const& b, T Epsilon) { return equal(a, b, vec(Epsilon)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(mat const& a, mat const& b, vec const& Epsilon) + GLM_FUNC_QUALIFIER constexpr vec equal(mat const& a, mat const& b, vec const& Epsilon) { vec Result(true); for(length_t i = 0; i < C; ++i) @@ -32,7 +32,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b) + GLM_FUNC_QUALIFIER constexpr vec notEqual(mat const& a, mat const& b) { vec Result(true); for(length_t i = 0; i < C; ++i) @@ -41,13 +41,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b, T Epsilon) + GLM_FUNC_QUALIFIER constexpr vec notEqual(mat const& a, mat const& b, T Epsilon) { return notEqual(a, b, vec(Epsilon)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b, vec const& Epsilon) + GLM_FUNC_QUALIFIER constexpr vec notEqual(mat const& a, mat const& b, vec const& Epsilon) { vec Result(true); for(length_t i = 0; i < C; ++i) @@ -56,13 +56,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(mat const& a, mat const& b, int MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec equal(mat const& a, mat const& b, int MaxULPs) { return equal(a, b, vec(MaxULPs)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(mat const& a, mat const& b, vec const& MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec equal(mat const& a, mat const& b, vec const& MaxULPs) { vec Result(true); for(length_t i = 0; i < C; ++i) @@ -71,13 +71,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b, int MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec notEqual(mat const& a, mat const& b, int MaxULPs) { return notEqual(a, b, vec(MaxULPs)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(mat const& a, mat const& b, vec const& MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec notEqual(mat const& a, mat const& b, vec const& MaxULPs) { vec Result(true); for(length_t i = 0; i < C; ++i) diff --git a/glm/ext/matrix_transform.hpp b/glm/ext/matrix_transform.hpp index 52695b8bf..fa3ba57a8 100644 --- a/glm/ext/matrix_transform.hpp +++ b/glm/ext/matrix_transform.hpp @@ -36,7 +36,7 @@ namespace glm /// Builds an identity matrix. template - GLM_FUNC_DECL GLM_CONSTEXPR genType identity(); + GLM_FUNC_DECL constexpr genType identity(); /// Builds a translation 4 * 4 matrix created from a vector of 3 components. /// @@ -61,7 +61,7 @@ namespace glm /// @see - translate(vec<3, T, Q> const& v) /// @see glTranslate man page template - GLM_FUNC_DECL GLM_CONSTEXPR mat<4, 4, T, Q> translate( + GLM_FUNC_DECL constexpr mat<4, 4, T, Q> translate( mat<4, 4, T, Q> const& m, vec<3, T, Q> const& v); /// Builds a rotation 4 * 4 matrix created from an axis vector and an angle. diff --git a/glm/ext/matrix_transform.inl b/glm/ext/matrix_transform.inl index 029ef0fb5..4eb966c2b 100644 --- a/glm/ext/matrix_transform.inl +++ b/glm/ext/matrix_transform.inl @@ -1,13 +1,13 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType identity() + GLM_FUNC_QUALIFIER constexpr genType identity() { return detail::init_gentype::GENTYPE>::identity(); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR mat<4, 4, T, Q> translate(mat<4, 4, T, Q> const& m, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr mat<4, 4, T, Q> translate(mat<4, 4, T, Q> const& m, vec<3, T, Q> const& v) { mat<4, 4, T, Q> Result(m); Result[3] = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3]; diff --git a/glm/ext/quaternion_common.hpp b/glm/ext/quaternion_common.hpp index f738692a4..14103cb67 100644 --- a/glm/ext/quaternion_common.hpp +++ b/glm/ext/quaternion_common.hpp @@ -62,7 +62,7 @@ namespace glm /// @tparam T A floating-point scalar type /// @tparam Q A value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR qua lerp(qua const& x, qua const& y, T a); + GLM_FUNC_DECL constexpr qua lerp(qua const& x, qua const& y, T a); /// Spherical linear interpolation of two quaternions. /// The interpolation always take the short path and the rotation is performed at constant speed. @@ -96,14 +96,14 @@ namespace glm /// @tparam T A floating-point scalar type /// @tparam Q A value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR qua conjugate(qua const& q); + GLM_FUNC_DECL constexpr qua conjugate(qua const& q); /// Returns the q inverse. /// /// @tparam T A floating-point scalar type /// @tparam Q A value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR qua inverse(qua const& q); + GLM_FUNC_DECL constexpr qua inverse(qua const& q); /// Returns true if x holds a NaN (not a number) /// representation in the underlying implementation's set of diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl index ad171f9d4..3615babd6 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -3,7 +3,7 @@ namespace glm template GLM_FUNC_QUALIFIER qua mix(qua const& x, qua const& y, T a) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'mix' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'mix' only accept floating-point inputs"); T const cosTheta = dot(x, y); @@ -26,9 +26,9 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua lerp(qua const& x, qua const& y, T a) + GLM_FUNC_QUALIFIER constexpr qua lerp(qua const& x, qua const& y, T a) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'lerp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'lerp' only accept floating-point inputs"); // Lerp is only defined in [0, 1] assert(a >= static_cast(0)); @@ -40,7 +40,7 @@ namespace glm template GLM_FUNC_QUALIFIER qua slerp(qua const& x, qua const& y, T a) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'slerp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'slerp' only accept floating-point inputs"); qua z = y; @@ -75,8 +75,8 @@ namespace glm template GLM_FUNC_QUALIFIER qua slerp(qua const& x, qua const& y, T a, S k) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'slerp' only accept floating-point inputs"); - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'slerp' only accept integer for spin count"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'slerp' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_integer, "'slerp' only accept integer for spin count"); qua z = y; @@ -110,13 +110,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua conjugate(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua conjugate(qua const& q) { return qua::wxyz(q.w, -q.x, -q.y, -q.z); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua inverse(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua inverse(qua const& q) { return conjugate(q) / dot(q, q); } @@ -124,7 +124,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec<4, bool, Q> isnan(qua const& q) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isnan' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isnan' only accept floating-point inputs"); return vec<4, bool, Q>(isnan(q.x), isnan(q.y), isnan(q.z), isnan(q.w)); } @@ -132,7 +132,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec<4, bool, Q> isinf(qua const& q) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isinf' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isinf' only accept floating-point inputs"); return vec<4, bool, Q>(isinf(q.x), isinf(q.y), isinf(q.z), isinf(q.w)); } diff --git a/glm/ext/quaternion_geometric.hpp b/glm/ext/quaternion_geometric.hpp index d3e593f35..ec8c6a3df 100644 --- a/glm/ext/quaternion_geometric.hpp +++ b/glm/ext/quaternion_geometric.hpp @@ -44,7 +44,7 @@ namespace glm /// /// @see ext_quaternion_geometric template - GLM_FUNC_DECL GLM_CONSTEXPR qua normalize(qua const& q); + GLM_FUNC_DECL constexpr qua normalize(qua const& q); /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... /// @@ -53,7 +53,7 @@ namespace glm /// /// @see ext_quaternion_geometric template - GLM_FUNC_DECL GLM_CONSTEXPR T dot(qua const& x, qua const& y); + GLM_FUNC_DECL constexpr T dot(qua const& x, qua const& y); /// Compute a cross product. /// @@ -62,7 +62,7 @@ namespace glm /// /// @see ext_quaternion_geometric template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua cross(qua const& q1, qua const& q2); + GLM_FUNC_QUALIFIER constexpr qua cross(qua const& q1, qua const& q2); /// @} } //namespace glm diff --git a/glm/ext/quaternion_geometric.inl b/glm/ext/quaternion_geometric.inl index e68eec99b..1d3ce3e2e 100644 --- a/glm/ext/quaternion_geometric.inl +++ b/glm/ext/quaternion_geometric.inl @@ -1,9 +1,9 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T dot(qua const& x, qua const& y) + GLM_FUNC_QUALIFIER constexpr T dot(qua const& x, qua const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'dot' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'dot' accepts only floating-point inputs"); return detail::compute_dot, T, detail::is_aligned::value>::call(x, y); } @@ -14,7 +14,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua normalize(qua const& q) + GLM_FUNC_QUALIFIER constexpr qua normalize(qua const& q) { T len = length(q); if(len <= static_cast(0)) // Problem @@ -24,7 +24,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua cross(qua const& q1, qua const& q2) + GLM_FUNC_QUALIFIER constexpr qua cross(qua const& q1, qua const& q2) { return qua::wxyz( q1.w * q2.w - q1.x * q2.x - q1.y * q2.y - q1.z * q2.z, diff --git a/glm/ext/scalar_common.inl b/glm/ext/scalar_common.inl index 97edcf515..18c7924ac 100644 --- a/glm/ext/scalar_common.inl +++ b/glm/ext/scalar_common.inl @@ -30,7 +30,7 @@ namespace glm template GLM_FUNC_QUALIFIER T fmin(T a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); if (isnan(a)) return b; @@ -41,7 +41,7 @@ namespace glm template GLM_FUNC_QUALIFIER T (fmin)(T a, T b, T c) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); if (isnan(a)) return (fmin)(b, c); @@ -55,7 +55,7 @@ namespace glm template GLM_FUNC_QUALIFIER T (fmin)(T a, T b, T c, T d) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmin' only accept floating-point input"); if (isnan(a)) return (fmin)(b, c, d); @@ -75,7 +75,7 @@ namespace glm template GLM_FUNC_QUALIFIER T (fmax)(T a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); if (isnan(a)) return b; @@ -86,7 +86,7 @@ namespace glm template GLM_FUNC_QUALIFIER T (fmax)(T a, T b, T c) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); if (isnan(a)) return (fmax)(b, c); @@ -100,7 +100,7 @@ namespace glm template GLM_FUNC_QUALIFIER T (fmax)(T a, T b, T c, T d) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fmax' only accept floating-point input"); if (isnan(a)) return (fmax)(b, c, d); @@ -117,7 +117,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType fclamp(genType x, genType minVal, genType maxVal) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fclamp' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fclamp' only accept floating-point or integer inputs"); return fmin((fmax)(x, minVal), maxVal); } @@ -153,7 +153,7 @@ namespace glm template GLM_FUNC_QUALIFIER int iround(genType const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'iround' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'iround' only accept floating-point inputs"); assert(static_cast(0.0) <= x); return static_cast(x + static_cast(0.5)); @@ -162,7 +162,7 @@ namespace glm template GLM_FUNC_QUALIFIER uint uround(genType const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'uround' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'uround' only accept floating-point inputs"); assert(static_cast(0.0) <= x); return static_cast(x + static_cast(0.5)); diff --git a/glm/ext/scalar_constants.hpp b/glm/ext/scalar_constants.hpp index 74e210d9c..79d8f36ff 100644 --- a/glm/ext/scalar_constants.hpp +++ b/glm/ext/scalar_constants.hpp @@ -24,15 +24,15 @@ namespace glm /// Return the epsilon constant for floating point types. template - GLM_FUNC_DECL GLM_CONSTEXPR genType epsilon(); + GLM_FUNC_DECL constexpr genType epsilon(); /// Return the pi constant for floating point types. template - GLM_FUNC_DECL GLM_CONSTEXPR genType pi(); + GLM_FUNC_DECL constexpr genType pi(); /// Return the value of cos(1 / 2) for floating point types. template - GLM_FUNC_DECL GLM_CONSTEXPR genType cos_one_over_two(); + GLM_FUNC_DECL constexpr genType cos_one_over_two(); /// @} } //namespace glm diff --git a/glm/ext/scalar_constants.inl b/glm/ext/scalar_constants.inl index b928e5118..715efc0ba 100644 --- a/glm/ext/scalar_constants.inl +++ b/glm/ext/scalar_constants.inl @@ -3,21 +3,21 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType epsilon() + GLM_FUNC_QUALIFIER constexpr genType epsilon() { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'epsilon' only accepts floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'epsilon' only accepts floating-point inputs"); return std::numeric_limits::epsilon(); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType pi() + GLM_FUNC_QUALIFIER constexpr genType pi() { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'pi' only accepts floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'pi' only accepts floating-point inputs"); return static_cast(3.14159265358979323846264338327950288); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType cos_one_over_two() + GLM_FUNC_QUALIFIER constexpr genType cos_one_over_two() { return genType(0.877582561890372716130286068203503191); } diff --git a/glm/ext/scalar_integer.inl b/glm/ext/scalar_integer.inl index d416197e8..73fa1618f 100644 --- a/glm/ext/scalar_integer.inl +++ b/glm/ext/scalar_integer.inl @@ -26,7 +26,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - GLM_STATIC_ASSERT(!std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ceilPowerOfTwo' only accept integer scalar or vector inputs"); + static_assert(!std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ceilPowerOfTwo' only accept integer scalar or vector inputs"); vec const Sign(sign(x)); @@ -48,7 +48,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vec call(vec const& x) { - GLM_STATIC_ASSERT(!std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ceilPowerOfTwo' only accept integer scalar or vector inputs"); + static_assert(!std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'ceilPowerOfTwo' only accept integer scalar or vector inputs"); vec v(x); @@ -159,7 +159,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isPowerOfTwo(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'isPowerOfTwo' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'isPowerOfTwo' only accept integer inputs"); genIUType const Result = glm::abs(Value); return !(Result & (Result - 1)); @@ -168,7 +168,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType nextPowerOfTwo(genIUType value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'nextPowerOfTwo' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'nextPowerOfTwo' only accept integer inputs"); return detail::compute_ceilPowerOfTwo<1, genIUType, defaultp, std::numeric_limits::is_signed>::call(vec<1, genIUType, defaultp>(value)).x; } @@ -176,7 +176,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType prevPowerOfTwo(genIUType value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'prevPowerOfTwo' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'prevPowerOfTwo' only accept integer inputs"); return isPowerOfTwo(value) ? value : static_cast(static_cast(1) << static_cast(findMSB(value))); } @@ -184,7 +184,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isMultiple(genIUType Value, genIUType Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'isMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'isMultiple' only accept integer inputs"); return isMultiple(vec<1, genIUType>(Value), vec<1, genIUType>(Multiple)).x; } @@ -192,7 +192,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType nextMultiple(genIUType Source, genIUType Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'nextMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'nextMultiple' only accept integer inputs"); return detail::compute_ceilMultiple::is_iec559, std::numeric_limits::is_signed>::call(Source, Multiple); } @@ -200,7 +200,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType prevMultiple(genIUType Source, genIUType Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'prevMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'prevMultiple' only accept integer inputs"); return detail::compute_floorMultiple::is_iec559, std::numeric_limits::is_signed>::call(Source, Multiple); } @@ -208,7 +208,7 @@ namespace detail template GLM_FUNC_QUALIFIER int findNSB(genIUType x, int significantBitCount) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findNSB' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'findNSB' only accept integer inputs"); if(bitCount(x) < significantBitCount) return -1; diff --git a/glm/ext/scalar_reciprocal.inl b/glm/ext/scalar_reciprocal.inl index 0cd5f87b4..4b73ae154 100644 --- a/glm/ext/scalar_reciprocal.inl +++ b/glm/ext/scalar_reciprocal.inl @@ -9,7 +9,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType sec(genType angle) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sec' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sec' only accept floating-point values"); return genType(1) / glm::cos(angle); } @@ -17,7 +17,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType csc(genType angle) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csc' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csc' only accept floating-point values"); return genType(1) / glm::sin(angle); } @@ -25,7 +25,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType cot(genType angle) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'cot' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'cot' only accept floating-point values"); genType const pi_over_2 = genType(3.1415926535897932384626433832795 / 2.0); return glm::tan(pi_over_2 - angle); @@ -35,7 +35,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType asec(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asec' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asec' only accept floating-point values"); return acos(genType(1) / x); } @@ -43,7 +43,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType acsc(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsc' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsc' only accept floating-point values"); return asin(genType(1) / x); } @@ -51,7 +51,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType acot(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acot' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acot' only accept floating-point values"); genType const pi_over_2 = genType(3.1415926535897932384626433832795 / 2.0); return pi_over_2 - atan(x); @@ -61,7 +61,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType sech(genType angle) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sech' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sech' only accept floating-point values"); return genType(1) / glm::cosh(angle); } @@ -69,7 +69,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType csch(genType angle) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csch' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csch' only accept floating-point values"); return genType(1) / glm::sinh(angle); } @@ -77,7 +77,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType coth(genType angle) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'coth' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'coth' only accept floating-point values"); return glm::cosh(angle) / glm::sinh(angle); } @@ -85,7 +85,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType asech(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asech' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asech' only accept floating-point values"); return acosh(genType(1) / x); } @@ -93,7 +93,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType acsch(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsch' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsch' only accept floating-point values"); return asinh(genType(1) / x); } @@ -101,7 +101,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType acoth(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acoth' only accept floating-point values"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acoth' only accept floating-point values"); return atanh(genType(1) / x); } }//namespace glm diff --git a/glm/ext/scalar_relational.hpp b/glm/ext/scalar_relational.hpp index e84df1786..0a30ae835 100644 --- a/glm/ext/scalar_relational.hpp +++ b/glm/ext/scalar_relational.hpp @@ -31,14 +31,14 @@ namespace glm /// /// @tparam genType Floating-point or integer scalar types template - GLM_FUNC_DECL GLM_CONSTEXPR bool equal(genType const& x, genType const& y, genType const& epsilon); + GLM_FUNC_DECL constexpr bool equal(genType const& x, genType const& y, genType const& epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. /// /// @tparam genType Floating-point or integer scalar types template - GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, genType const& epsilon); + GLM_FUNC_DECL constexpr bool notEqual(genType const& x, genType const& y, genType const& epsilon); /// Returns the component-wise comparison between two scalars in term of ULPs. /// True if this expression is satisfied. @@ -49,7 +49,7 @@ namespace glm /// /// @tparam genType Floating-point or integer scalar types template - GLM_FUNC_DECL GLM_CONSTEXPR bool equal(genType const& x, genType const& y, int ULPs); + GLM_FUNC_DECL constexpr bool equal(genType const& x, genType const& y, int ULPs); /// Returns the component-wise comparison between two scalars in term of ULPs. /// True if this expression is not satisfied. @@ -60,7 +60,7 @@ namespace glm /// /// @tparam genType Floating-point or integer scalar types template - GLM_FUNC_DECL GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, int ULPs); + GLM_FUNC_DECL constexpr bool notEqual(genType const& x, genType const& y, int ULPs); /// @} }//namespace glm diff --git a/glm/ext/scalar_relational.inl b/glm/ext/scalar_relational.inl index c85583ef5..6578859bf 100644 --- a/glm/ext/scalar_relational.inl +++ b/glm/ext/scalar_relational.inl @@ -6,19 +6,19 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool equal(genType const& x, genType const& y, genType const& epsilon) + GLM_FUNC_QUALIFIER constexpr bool equal(genType const& x, genType const& y, genType const& epsilon) { return abs(x - y) <= epsilon; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, genType const& epsilon) + GLM_FUNC_QUALIFIER constexpr bool notEqual(genType const& x, genType const& y, genType const& epsilon) { return abs(x - y) > epsilon; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool equal(genType const& x, genType const& y, int MaxULPs) + GLM_FUNC_QUALIFIER constexpr bool equal(genType const& x, genType const& y, int MaxULPs) { detail::float_t const a(x); detail::float_t const b(y); @@ -33,7 +33,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR bool notEqual(genType const& x, genType const& y, int ULPs) + GLM_FUNC_QUALIFIER constexpr bool notEqual(genType const& x, genType const& y, int ULPs) { return !equal(x, y, ULPs); } diff --git a/glm/ext/scalar_ulp.inl b/glm/ext/scalar_ulp.inl index 716528d0c..224fdb524 100644 --- a/glm/ext/scalar_ulp.inl +++ b/glm/ext/scalar_ulp.inl @@ -226,7 +226,7 @@ namespace glm template GLM_FUNC_QUALIFIER T nextFloat(T x, int ULPs) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'next_float' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'next_float' only accept floating-point input"); assert(ULPs >= 0); T temp = x; @@ -264,7 +264,7 @@ namespace glm template GLM_FUNC_QUALIFIER T prevFloat(T x, int ULPs) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'prev_float' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'prev_float' only accept floating-point input"); assert(ULPs >= 0); T temp = x; diff --git a/glm/ext/vector_common.hpp b/glm/ext/vector_common.hpp index c0a2858cc..49384dede 100644 --- a/glm/ext/vector_common.hpp +++ b/glm/ext/vector_common.hpp @@ -32,7 +32,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec min(vec const& a, vec const& b, vec const& c); + GLM_FUNC_DECL constexpr vec min(vec const& a, vec const& b, vec const& c); /// Return the minimum component-wise values of 4 inputs /// @@ -40,7 +40,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec min(vec const& a, vec const& b, vec const& c, vec const& d); + GLM_FUNC_DECL constexpr vec min(vec const& a, vec const& b, vec const& c, vec const& d); /// Return the maximum component-wise values of 3 inputs /// @@ -48,7 +48,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec max(vec const& x, vec const& y, vec const& z); + GLM_FUNC_DECL constexpr vec max(vec const& x, vec const& y, vec const& z); /// Return the maximum component-wise values of 4 inputs /// @@ -56,7 +56,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec max( vec const& x, vec const& y, vec const& z, vec const& w); + GLM_FUNC_DECL constexpr vec max( vec const& x, vec const& y, vec const& z, vec const& w); /// Returns y if y < x; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned. /// diff --git a/glm/ext/vector_common.inl b/glm/ext/vector_common.inl index 67817fc55..b7f9b9435 100644 --- a/glm/ext/vector_common.inl +++ b/glm/ext/vector_common.inl @@ -3,86 +3,86 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec min(vec const& x, vec const& y, vec const& z) + GLM_FUNC_QUALIFIER constexpr vec min(vec const& x, vec const& y, vec const& z) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); return glm::min(glm::min(x, y), z); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec min(vec const& x, vec const& y, vec const& z, vec const& w) + GLM_FUNC_QUALIFIER constexpr vec min(vec const& x, vec const& y, vec const& z, vec const& w) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'min' only accept floating-point or integer inputs"); return glm::min(glm::min(x, y), glm::min(z, w)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec max(vec const& x, vec const& y, vec const& z) + GLM_FUNC_QUALIFIER constexpr vec max(vec const& x, vec const& y, vec const& z) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); return glm::max(glm::max(x, y), z); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec max(vec const& x, vec const& y, vec const& z, vec const& w) + GLM_FUNC_QUALIFIER constexpr vec max(vec const& x, vec const& y, vec const& z, vec const& w) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); + static_assert(std::numeric_limits::is_iec559 || std::numeric_limits::is_integer, "'max' only accept floating-point or integer inputs"); return glm::max(glm::max(x, y), glm::max(z, w)); } template GLM_FUNC_QUALIFIER vec fmin(vec const& a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); return detail::functor2::call(fmin, a, vec(b)); } template GLM_FUNC_QUALIFIER vec fmin(vec const& a, vec const& b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); return detail::functor2::call(fmin, a, b); } template GLM_FUNC_QUALIFIER vec fmin(vec const& a, vec const& b, vec const& c) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); return fmin(fmin(a, b), c); } template GLM_FUNC_QUALIFIER vec fmin(vec const& a, vec const& b, vec const& c, vec const& d) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmin' only accept floating-point inputs"); return fmin(fmin(a, b), fmin(c, d)); } template GLM_FUNC_QUALIFIER vec fmax(vec const& a, T b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); return detail::functor2::call(fmax, a, vec(b)); } template GLM_FUNC_QUALIFIER vec fmax(vec const& a, vec const& b) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); return detail::functor2::call(fmax, a, b); } template GLM_FUNC_QUALIFIER vec fmax(vec const& a, vec const& b, vec const& c) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); return fmax(fmax(a, b), c); } template GLM_FUNC_QUALIFIER vec fmax(vec const& a, vec const& b, vec const& c, vec const& d) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'fmax' only accept floating-point inputs"); return fmax(fmax(a, b), fmax(c, d)); } @@ -130,7 +130,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec iround(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'iround' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'iround' only accept floating-point inputs"); assert(all(lessThanEqual(vec(0), x))); return vec(x + static_cast(0.5)); @@ -139,7 +139,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec uround(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'uround' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'uround' only accept floating-point inputs"); assert(all(lessThanEqual(vec(0), x))); return vec(x + static_cast(0.5)); diff --git a/glm/ext/vector_integer.inl b/glm/ext/vector_integer.inl index cefb132e2..85c5887f1 100644 --- a/glm/ext/vector_integer.inl +++ b/glm/ext/vector_integer.inl @@ -5,7 +5,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec isPowerOfTwo(vec const& Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'isPowerOfTwo' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'isPowerOfTwo' only accept integer inputs"); vec const Result(abs(Value)); return equal(Result & (Result - vec(1)), vec(0)); @@ -14,7 +14,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec nextPowerOfTwo(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'nextPowerOfTwo' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'nextPowerOfTwo' only accept integer inputs"); return detail::compute_ceilPowerOfTwo::is_signed>::call(v); } @@ -22,7 +22,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec prevPowerOfTwo(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'prevPowerOfTwo' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'prevPowerOfTwo' only accept integer inputs"); return detail::functor1::call(prevPowerOfTwo, v); } @@ -30,7 +30,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec isMultiple(vec const& Value, T Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'isMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'isMultiple' only accept integer inputs"); return equal(Value % Multiple, vec(0)); } @@ -38,7 +38,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec isMultiple(vec const& Value, vec const& Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'isMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'isMultiple' only accept integer inputs"); return equal(Value % Multiple, vec(0)); } @@ -46,7 +46,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec nextMultiple(vec const& Source, T Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'nextMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'nextMultiple' only accept integer inputs"); return detail::functor2::call(nextMultiple, Source, vec(Multiple)); } @@ -54,7 +54,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec nextMultiple(vec const& Source, vec const& Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'nextMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'nextMultiple' only accept integer inputs"); return detail::functor2::call(nextMultiple, Source, Multiple); } @@ -62,7 +62,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec prevMultiple(vec const& Source, T Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'prevMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'prevMultiple' only accept integer inputs"); return detail::functor2::call(prevMultiple, Source, vec(Multiple)); } @@ -70,7 +70,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec prevMultiple(vec const& Source, vec const& Multiple) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'prevMultiple' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'prevMultiple' only accept integer inputs"); return detail::functor2::call(prevMultiple, Source, Multiple); } @@ -78,7 +78,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec findNSB(vec const& Source, vec SignificantBitCount) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findNSB' only accept integer inputs"); + static_assert(std::numeric_limits::is_integer, "'findNSB' only accept integer inputs"); return detail::functor2_vec_int::call(findNSB, Source, SignificantBitCount); } diff --git a/glm/ext/vector_reciprocal.inl b/glm/ext/vector_reciprocal.inl index b85102a2f..cfa66fcae 100644 --- a/glm/ext/vector_reciprocal.inl +++ b/glm/ext/vector_reciprocal.inl @@ -9,7 +9,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec sec(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sec' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sec' only accept floating-point inputs"); return static_cast(1) / detail::functor1::call(cos, x); } @@ -17,7 +17,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec csc(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csc' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csc' only accept floating-point inputs"); return static_cast(1) / detail::functor1::call(sin, x); } @@ -25,7 +25,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec cot(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'cot' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'cot' only accept floating-point inputs"); T const pi_over_2 = static_cast(3.1415926535897932384626433832795 / 2.0); return detail::functor1::call(tan, pi_over_2 - x); } @@ -34,7 +34,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec asec(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asec' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asec' only accept floating-point inputs"); return detail::functor1::call(acos, static_cast(1) / x); } @@ -42,7 +42,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec acsc(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsc' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsc' only accept floating-point inputs"); return detail::functor1::call(asin, static_cast(1) / x); } @@ -50,7 +50,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec acot(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acot' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acot' only accept floating-point inputs"); T const pi_over_2 = static_cast(3.1415926535897932384626433832795 / 2.0); return pi_over_2 - detail::functor1::call(atan, x); } @@ -59,7 +59,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec sech(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sech' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'sech' only accept floating-point inputs"); return static_cast(1) / detail::functor1::call(cosh, x); } @@ -67,7 +67,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec csch(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csch' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'csch' only accept floating-point inputs"); return static_cast(1) / detail::functor1::call(sinh, x); } @@ -75,7 +75,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec coth(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'coth' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'coth' only accept floating-point inputs"); return glm::cosh(x) / glm::sinh(x); } @@ -83,7 +83,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec asech(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asech' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'asech' only accept floating-point inputs"); return detail::functor1::call(acosh, static_cast(1) / x); } @@ -91,7 +91,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec acsch(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsch' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acsch' only accept floating-point inputs"); return detail::functor1::call(asinh, static_cast(1) / x); } @@ -99,7 +99,7 @@ namespace glm template GLM_FUNC_QUALIFIER vec acoth(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acoth' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'acoth' only accept floating-point inputs"); return detail::functor1::call(atanh, static_cast(1) / x); } }//namespace glm diff --git a/glm/ext/vector_relational.hpp b/glm/ext/vector_relational.hpp index 1c2367dc0..b1fb07f04 100644 --- a/glm/ext/vector_relational.hpp +++ b/glm/ext/vector_relational.hpp @@ -36,7 +36,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y, T epsilon); + GLM_FUNC_DECL constexpr vec equal(vec const& x, vec const& y, T epsilon); /// Returns the component-wise comparison of |x - y| < epsilon. /// True if this expression is satisfied. @@ -45,7 +45,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y, vec const& epsilon); + GLM_FUNC_DECL constexpr vec equal(vec const& x, vec const& y, vec const& epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. @@ -54,7 +54,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, T epsilon); + GLM_FUNC_DECL constexpr vec notEqual(vec const& x, vec const& y, T epsilon); /// Returns the component-wise comparison of |x - y| >= epsilon. /// True if this expression is not satisfied. @@ -63,7 +63,7 @@ namespace glm /// @tparam T Floating-point or integer scalar types /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, vec const& epsilon); + GLM_FUNC_DECL constexpr vec notEqual(vec const& x, vec const& y, vec const& epsilon); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is satisfied. @@ -72,7 +72,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y, int ULPs); + GLM_FUNC_DECL constexpr vec equal(vec const& x, vec const& y, int ULPs); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is satisfied. @@ -81,7 +81,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y, vec const& ULPs); + GLM_FUNC_DECL constexpr vec equal(vec const& x, vec const& y, vec const& ULPs); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is not satisfied. @@ -90,7 +90,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, int ULPs); + GLM_FUNC_DECL constexpr vec notEqual(vec const& x, vec const& y, int ULPs); /// Returns the component-wise comparison between two vectors in term of ULPs. /// True if this expression is not satisfied. @@ -99,7 +99,7 @@ namespace glm /// @tparam T Floating-point /// @tparam Q Value from qualifier enum template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, vec const& ULPs); + GLM_FUNC_DECL constexpr vec notEqual(vec const& x, vec const& y, vec const& ULPs); /// @} }//namespace glm diff --git a/glm/ext/vector_relational.inl b/glm/ext/vector_relational.inl index 8c50b2ff2..768757563 100644 --- a/glm/ext/vector_relational.inl +++ b/glm/ext/vector_relational.inl @@ -6,38 +6,38 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y, T Epsilon) + GLM_FUNC_QUALIFIER constexpr vec equal(vec const& x, vec const& y, T Epsilon) { return equal(x, y, vec(Epsilon)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y, vec const& Epsilon) + GLM_FUNC_QUALIFIER constexpr vec equal(vec const& x, vec const& y, vec const& Epsilon) { return lessThanEqual(abs(x - y), Epsilon); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, T Epsilon) + GLM_FUNC_QUALIFIER constexpr vec notEqual(vec const& x, vec const& y, T Epsilon) { return notEqual(x, y, vec(Epsilon)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, vec const& Epsilon) + GLM_FUNC_QUALIFIER constexpr vec notEqual(vec const& x, vec const& y, vec const& Epsilon) { return greaterThan(abs(x - y), Epsilon); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y, int MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec equal(vec const& x, vec const& y, int MaxULPs) { return equal(x, y, vec(MaxULPs)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec equal(vec const& x, vec const& y, vec const& MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec equal(vec const& x, vec const& y, vec const& MaxULPs) { vec Result(false); for(length_t i = 0; i < L; ++i) @@ -62,13 +62,13 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, int MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec notEqual(vec const& x, vec const& y, int MaxULPs) { return notEqual(x, y, vec(MaxULPs)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y, vec const& MaxULPs) + GLM_FUNC_QUALIFIER constexpr vec notEqual(vec const& x, vec const& y, vec const& MaxULPs) { return not_(equal(x, y, MaxULPs)); } diff --git a/glm/fwd.hpp b/glm/fwd.hpp index 9c2e5eafa..aac882f22 100644 --- a/glm/fwd.hpp +++ b/glm/fwd.hpp @@ -4,7 +4,6 @@ namespace glm { -#if GLM_HAS_EXTENDED_INTEGER_TYPE typedef std::int8_t int8; typedef std::int16_t int16; typedef std::int32_t int32; @@ -14,17 +13,6 @@ namespace glm typedef std::uint16_t uint16; typedef std::uint32_t uint32; typedef std::uint64_t uint64; -#else - typedef signed char int8; - typedef signed short int16; - typedef signed int int32; - typedef detail::int64 int64; - - typedef unsigned char uint8; - typedef unsigned short uint16; - typedef unsigned int uint32; - typedef detail::uint64 uint64; -#endif // Scalar int diff --git a/glm/geometric.hpp b/glm/geometric.hpp index ac857e69d..9d81d30d5 100644 --- a/glm/geometric.hpp +++ b/glm/geometric.hpp @@ -47,7 +47,7 @@ namespace glm /// @see GLSL dot man page /// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions template - GLM_FUNC_DECL GLM_CONSTEXPR T dot(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr T dot(vec const& x, vec const& y); /// Returns the cross product of x and y. /// @@ -56,7 +56,7 @@ namespace glm /// @see GLSL cross man page /// @see GLSL 4.20.8 specification, section 8.5 Geometric Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> cross(vec<3, T, Q> const& x, vec<3, T, Q> const& y); + GLM_FUNC_DECL constexpr vec<3, T, Q> cross(vec<3, T, Q> const& x, vec<3, T, Q> const& y); /// Returns a vector in the same direction as x but with length of 1. /// According to issue 10 GLSL 1.10 specification, if length(x) == 0 then result is undefined and generate an error. diff --git a/glm/gtc/bitfield.inl b/glm/gtc/bitfield.inl index cbfd3888c..786e7c1c5 100644 --- a/glm/gtc/bitfield.inl +++ b/glm/gtc/bitfield.inl @@ -229,7 +229,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIUType mask(genIUType Bits) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'mask' accepts only integer values"); + static_assert(std::numeric_limits::is_integer, "'mask' accepts only integer values"); return Bits >= static_cast(sizeof(genIUType) * 8) ? ~static_cast(0) : (static_cast(1) << Bits) - static_cast(1); } @@ -241,7 +241,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec mask(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'mask' accepts only integer values"); + static_assert(std::numeric_limits::is_integer, "'mask' accepts only integer values"); return detail::functor1::call(mask, v); } @@ -249,7 +249,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIType bitfieldRotateRight(genIType In, int Shift) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateRight' accepts only integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldRotateRight' accepts only integer values"); int const BitSize = static_cast(sizeof(genIType) * 8); return (In << static_cast(Shift)) | (In >> static_cast(BitSize - Shift)); @@ -258,7 +258,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec bitfieldRotateRight(vec const& In, int Shift) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateRight' accepts only integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldRotateRight' accepts only integer values"); int const BitSize = static_cast(sizeof(T) * 8); return (In << static_cast(Shift)) | (In >> static_cast(BitSize - Shift)); @@ -267,7 +267,7 @@ namespace detail template GLM_FUNC_QUALIFIER genIType bitfieldRotateLeft(genIType In, int Shift) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateLeft' accepts only integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldRotateLeft' accepts only integer values"); int const BitSize = static_cast(sizeof(genIType) * 8); return (In >> static_cast(Shift)) | (In << static_cast(BitSize - Shift)); @@ -276,7 +276,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec bitfieldRotateLeft(vec const& In, int Shift) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldRotateLeft' accepts only integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldRotateLeft' accepts only integer values"); int const BitSize = static_cast(sizeof(T) * 8); return (In >> static_cast(Shift)) | (In << static_cast(BitSize - Shift)); diff --git a/glm/gtc/constants.hpp b/glm/gtc/constants.hpp index 6a1f37d30..65a7a4390 100644 --- a/glm/gtc/constants.hpp +++ b/glm/gtc/constants.hpp @@ -27,142 +27,142 @@ namespace glm /// Return 0. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType zero(); + GLM_FUNC_DECL constexpr genType zero(); /// Return 1. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType one(); + GLM_FUNC_DECL constexpr genType one(); /// Return pi * 2. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType two_pi(); + GLM_FUNC_DECL constexpr genType two_pi(); /// Return unit-circle circumference, or pi * 2. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType tau(); + GLM_FUNC_DECL constexpr genType tau(); /// Return square root of pi. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_pi(); + GLM_FUNC_DECL constexpr genType root_pi(); /// Return pi / 2. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType half_pi(); + GLM_FUNC_DECL constexpr genType half_pi(); /// Return pi / 2 * 3. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType three_over_two_pi(); + GLM_FUNC_DECL constexpr genType three_over_two_pi(); /// Return pi / 4. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType quarter_pi(); + GLM_FUNC_DECL constexpr genType quarter_pi(); /// Return 1 / pi. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_pi(); + GLM_FUNC_DECL constexpr genType one_over_pi(); /// Return 1 / (pi * 2). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_two_pi(); + GLM_FUNC_DECL constexpr genType one_over_two_pi(); /// Return 2 / pi. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_pi(); + GLM_FUNC_DECL constexpr genType two_over_pi(); /// Return 4 / pi. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType four_over_pi(); + GLM_FUNC_DECL constexpr genType four_over_pi(); /// Return 2 / sqrt(pi). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType two_over_root_pi(); + GLM_FUNC_DECL constexpr genType two_over_root_pi(); /// Return 1 / sqrt(2). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType one_over_root_two(); + GLM_FUNC_DECL constexpr genType one_over_root_two(); /// Return sqrt(pi / 2). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_half_pi(); + GLM_FUNC_DECL constexpr genType root_half_pi(); /// Return sqrt(2 * pi). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_two_pi(); + GLM_FUNC_DECL constexpr genType root_two_pi(); /// Return sqrt(ln(4)). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_ln_four(); + GLM_FUNC_DECL constexpr genType root_ln_four(); /// Return e constant. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType e(); + GLM_FUNC_DECL constexpr genType e(); /// Return Euler's constant. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType euler(); + GLM_FUNC_DECL constexpr genType euler(); /// Return sqrt(2). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_two(); + GLM_FUNC_DECL constexpr genType root_two(); /// Return sqrt(3). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_three(); + GLM_FUNC_DECL constexpr genType root_three(); /// Return sqrt(5). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType root_five(); + GLM_FUNC_DECL constexpr genType root_five(); /// Return ln(2). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType ln_two(); + GLM_FUNC_DECL constexpr genType ln_two(); /// Return ln(10). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ten(); + GLM_FUNC_DECL constexpr genType ln_ten(); /// Return ln(ln(2)). /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType ln_ln_two(); + GLM_FUNC_DECL constexpr genType ln_ln_two(); /// Return 1 / 3. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType third(); + GLM_FUNC_DECL constexpr genType third(); /// Return 2 / 3. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType two_thirds(); + GLM_FUNC_DECL constexpr genType two_thirds(); /// Return the golden ratio constant. /// @see gtc_constants template - GLM_FUNC_DECL GLM_CONSTEXPR genType golden_ratio(); + GLM_FUNC_DECL constexpr genType golden_ratio(); /// @} } //namespace glm diff --git a/glm/gtc/constants.inl b/glm/gtc/constants.inl index e9d377614..a87b370aa 100644 --- a/glm/gtc/constants.inl +++ b/glm/gtc/constants.inl @@ -3,169 +3,169 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType zero() + GLM_FUNC_QUALIFIER constexpr genType zero() { return genType(0); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one() + GLM_FUNC_QUALIFIER constexpr genType one() { return genType(1); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_pi() + GLM_FUNC_QUALIFIER constexpr genType two_pi() { return genType(6.28318530717958647692528676655900576); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType tau() + GLM_FUNC_QUALIFIER constexpr genType tau() { return two_pi(); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_pi() + GLM_FUNC_QUALIFIER constexpr genType root_pi() { return genType(1.772453850905516027); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType half_pi() + GLM_FUNC_QUALIFIER constexpr genType half_pi() { return genType(1.57079632679489661923132169163975144); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType three_over_two_pi() + GLM_FUNC_QUALIFIER constexpr genType three_over_two_pi() { return genType(4.71238898038468985769396507491925432); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType quarter_pi() + GLM_FUNC_QUALIFIER constexpr genType quarter_pi() { return genType(0.785398163397448309615660845819875721); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one_over_pi() + GLM_FUNC_QUALIFIER constexpr genType one_over_pi() { return genType(0.318309886183790671537767526745028724); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one_over_two_pi() + GLM_FUNC_QUALIFIER constexpr genType one_over_two_pi() { return genType(0.159154943091895335768883763372514362); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_over_pi() + GLM_FUNC_QUALIFIER constexpr genType two_over_pi() { return genType(0.636619772367581343075535053490057448); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType four_over_pi() + GLM_FUNC_QUALIFIER constexpr genType four_over_pi() { return genType(1.273239544735162686151070106980114898); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_over_root_pi() + GLM_FUNC_QUALIFIER constexpr genType two_over_root_pi() { return genType(1.12837916709551257389615890312154517); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType one_over_root_two() + GLM_FUNC_QUALIFIER constexpr genType one_over_root_two() { return genType(0.707106781186547524400844362104849039); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_half_pi() + GLM_FUNC_QUALIFIER constexpr genType root_half_pi() { return genType(1.253314137315500251); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_two_pi() + GLM_FUNC_QUALIFIER constexpr genType root_two_pi() { return genType(2.506628274631000502); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_ln_four() + GLM_FUNC_QUALIFIER constexpr genType root_ln_four() { return genType(1.17741002251547469); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType e() + GLM_FUNC_QUALIFIER constexpr genType e() { return genType(2.71828182845904523536); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType euler() + GLM_FUNC_QUALIFIER constexpr genType euler() { return genType(0.577215664901532860606); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_two() + GLM_FUNC_QUALIFIER constexpr genType root_two() { return genType(1.41421356237309504880168872420969808); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_three() + GLM_FUNC_QUALIFIER constexpr genType root_three() { return genType(1.73205080756887729352744634150587236); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType root_five() + GLM_FUNC_QUALIFIER constexpr genType root_five() { return genType(2.23606797749978969640917366873127623); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType ln_two() + GLM_FUNC_QUALIFIER constexpr genType ln_two() { return genType(0.693147180559945309417232121458176568); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType ln_ten() + GLM_FUNC_QUALIFIER constexpr genType ln_ten() { return genType(2.30258509299404568401799145468436421); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType ln_ln_two() + GLM_FUNC_QUALIFIER constexpr genType ln_ln_two() { return genType(-0.3665129205816643); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType third() + GLM_FUNC_QUALIFIER constexpr genType third() { return genType(0.3333333333333333333333333333333333333333); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType two_thirds() + GLM_FUNC_QUALIFIER constexpr genType two_thirds() { return genType(0.666666666666666666666666666666666666667); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType golden_ratio() + GLM_FUNC_QUALIFIER constexpr genType golden_ratio() { return genType(1.61803398874989484820458683436563811); } diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl index 30462bc53..97aba4b46 100644 --- a/glm/gtc/packing.inl +++ b/glm/gtc/packing.inl @@ -685,8 +685,8 @@ namespace detail template GLM_FUNC_QUALIFIER vec packUnorm(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "uintType must be an integer type"); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "floatType must be a floating point type"); + static_assert(std::numeric_limits::is_integer, "uintType must be an integer type"); + static_assert(std::numeric_limits::is_iec559, "floatType must be a floating point type"); return vec(round(clamp(v, static_cast(0), static_cast(1)) * static_cast(std::numeric_limits::max()))); } @@ -694,8 +694,8 @@ namespace detail template GLM_FUNC_QUALIFIER vec unpackUnorm(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "uintType must be an integer type"); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "floatType must be a floating point type"); + static_assert(std::numeric_limits::is_integer, "uintType must be an integer type"); + static_assert(std::numeric_limits::is_iec559, "floatType must be a floating point type"); return vec(v) * (static_cast(1) / static_cast(std::numeric_limits::max())); } @@ -703,8 +703,8 @@ namespace detail template GLM_FUNC_QUALIFIER vec packSnorm(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "uintType must be an integer type"); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "floatType must be a floating point type"); + static_assert(std::numeric_limits::is_integer, "uintType must be an integer type"); + static_assert(std::numeric_limits::is_iec559, "floatType must be a floating point type"); return vec(round(clamp(v , static_cast(-1), static_cast(1)) * static_cast(std::numeric_limits::max()))); } @@ -712,8 +712,8 @@ namespace detail template GLM_FUNC_QUALIFIER vec unpackSnorm(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "uintType must be an integer type"); - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "floatType must be a floating point type"); + static_assert(std::numeric_limits::is_integer, "uintType must be an integer type"); + static_assert(std::numeric_limits::is_iec559, "floatType must be a floating point type"); return clamp(vec(v) * (static_cast(1) / static_cast(std::numeric_limits::max())), static_cast(-1), static_cast(1)); } diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 314449ebd..69d428c32 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -112,7 +112,7 @@ namespace glm /// /// @see ext_quaternion_relational template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> lessThan(qua const& x, qua const& y); + GLM_FUNC_DECL constexpr vec<4, bool, Q> lessThan(qua const& x, qua const& y); /// Returns the component-wise comparison of result x <= y. /// @@ -121,7 +121,7 @@ namespace glm /// /// @see ext_quaternion_relational template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> lessThanEqual(qua const& x, qua const& y); + GLM_FUNC_DECL constexpr vec<4, bool, Q> lessThanEqual(qua const& x, qua const& y); /// Returns the component-wise comparison of result x > y. /// @@ -130,7 +130,7 @@ namespace glm /// /// @see ext_quaternion_relational template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> greaterThan(qua const& x, qua const& y); + GLM_FUNC_DECL constexpr vec<4, bool, Q> greaterThan(qua const& x, qua const& y); /// Returns the component-wise comparison of result x >= y. /// @@ -139,7 +139,7 @@ namespace glm /// /// @see ext_quaternion_relational template - GLM_FUNC_DECL GLM_CONSTEXPR vec<4, bool, Q> greaterThanEqual(qua const& x, qua const& y); + GLM_FUNC_DECL constexpr vec<4, bool, Q> greaterThanEqual(qua const& x, qua const& y); /// Build a look at quaternion based on the default handedness. /// diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index ea159f298..4f0a0fde2 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -129,7 +129,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> lessThan(qua const& x, qua const& y) + GLM_FUNC_QUALIFIER constexpr vec<4, bool, Q> lessThan(qua const& x, qua const& y) { vec<4, bool, Q> Result(false, false, false, false); for(length_t i = 0; i < x.length(); ++i) @@ -138,7 +138,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> lessThanEqual(qua const& x, qua const& y) + GLM_FUNC_QUALIFIER constexpr vec<4, bool, Q> lessThanEqual(qua const& x, qua const& y) { vec<4, bool, Q> Result(false, false, false, false); for(length_t i = 0; i < x.length(); ++i) @@ -147,7 +147,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> greaterThan(qua const& x, qua const& y) + GLM_FUNC_QUALIFIER constexpr vec<4, bool, Q> greaterThan(qua const& x, qua const& y) { vec<4, bool, Q> Result(false, false, false, false); for(length_t i = 0; i < x.length(); ++i) @@ -156,7 +156,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<4, bool, Q> greaterThanEqual(qua const& x, qua const& y) + GLM_FUNC_QUALIFIER constexpr vec<4, bool, Q> greaterThanEqual(qua const& x, qua const& y) { vec<4, bool, Q> Result(false, false, false, false); for(length_t i = 0; i < x.length(); ++i) diff --git a/glm/gtc/ulp.inl b/glm/gtc/ulp.inl index 836c84b4a..ca0e572a3 100644 --- a/glm/gtc/ulp.inl +++ b/glm/gtc/ulp.inl @@ -35,7 +35,7 @@ namespace glm template GLM_FUNC_QUALIFIER T next_float(T x, int ULPs) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'next_float' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'next_float' only accept floating-point input"); assert(ULPs >= 0); T temp = x; @@ -73,7 +73,7 @@ namespace glm template GLM_FUNC_QUALIFIER T prev_float(T x, int ULPs) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'prev_float' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'prev_float' only accept floating-point input"); assert(ULPs >= 0); T temp = x; diff --git a/glm/gtx/common.inl b/glm/gtx/common.inl index 4651e35c8..f9f9aaea9 100644 --- a/glm/gtx/common.inl +++ b/glm/gtx/common.inl @@ -29,7 +29,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isdenormal(T const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); # if GLM_HAS_CXX11_STL return std::fpclassify(x) == FP_SUBNORMAL; @@ -44,7 +44,7 @@ namespace detail vec<1, T, Q> const& x ) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); return typename vec<1, T, Q>::bool_type( isdenormal(x.x)); @@ -56,7 +56,7 @@ namespace detail vec<2, T, Q> const& x ) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); return typename vec<2, T, Q>::bool_type( isdenormal(x.x), @@ -69,7 +69,7 @@ namespace detail vec<3, T, Q> const& x ) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); return typename vec<3, T, Q>::bool_type( isdenormal(x.x), @@ -83,7 +83,7 @@ namespace detail vec<4, T, Q> const& x ) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'isdenormal' only accept floating-point inputs"); return typename vec<4, T, Q>::bool_type( isdenormal(x.x), diff --git a/glm/gtx/component_wise.inl b/glm/gtx/component_wise.inl index a2eac83fb..c133928d4 100644 --- a/glm/gtx/component_wise.inl +++ b/glm/gtx/component_wise.inl @@ -78,7 +78,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec compNormalize(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'compNormalize' accepts only floating-point types for 'floatType' template parameter"); + static_assert(std::numeric_limits::is_iec559, "'compNormalize' accepts only floating-point types for 'floatType' template parameter"); return detail::compute_compNormalize::is_integer, std::numeric_limits::is_signed>::call(v); } @@ -86,7 +86,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec compScale(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'compScale' accepts only floating-point types for 'floatType' template parameter"); + static_assert(std::numeric_limits::is_iec559, "'compScale' accepts only floating-point types for 'floatType' template parameter"); return detail::compute_compScale::is_integer, std::numeric_limits::is_signed>::call(v); } diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 04a60706e..236161bce 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -34,8 +34,6 @@ namespace glm template struct tdualquat { - // -- Implementation detail -- - typedef T value_type; typedef qua part_type; @@ -47,15 +45,14 @@ namespace glm typedef length_t length_type; /// Return the count of components of a dual quaternion - GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 2;} + GLM_FUNC_DECL static constexpr length_type length(){return 2;} - GLM_FUNC_DECL part_type & operator[](length_type i); - GLM_FUNC_DECL part_type const& operator[](length_type i) const; + GLM_FUNC_DECL constexpr part_type & operator[](length_type i) noexcept; + GLM_FUNC_DECL constexpr part_type const& operator[](length_type i) const noexcept; // -- Implicit basic constructors -- - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT; - GLM_DEFAULTED_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat const& d) GLM_DEFAULT; + GLM_DEFAULTED_DEFAULT_CTOR_DECL constexpr tdualquat() GLM_DEFAULT_CTOR; template GLM_CTOR_DECL tdualquat(tdualquat const& d); @@ -75,14 +72,12 @@ namespace glm // -- Unary arithmetic operators -- - GLM_DEFAULTED_FUNC_DECL tdualquat & operator=(tdualquat const& m) GLM_DEFAULT; - template - GLM_FUNC_DISCARD_DECL tdualquat & operator=(tdualquat const& m); + GLM_FUNC_DISCARD_DECL constexpr tdualquat & operator=(tdualquat const& m); template - GLM_FUNC_DISCARD_DECL tdualquat & operator*=(U s); + GLM_FUNC_DISCARD_DECL constexpr tdualquat & operator*=(U s); template - GLM_FUNC_DISCARD_DECL tdualquat & operator/=(U s); + GLM_FUNC_DISCARD_DECL constexpr tdualquat & operator/=(U s); }; // -- Unary bit operators -- diff --git a/glm/gtx/dual_quaternion.inl b/glm/gtx/dual_quaternion.inl index 3a04160e3..906eb4294 100644 --- a/glm/gtx/dual_quaternion.inl +++ b/glm/gtx/dual_quaternion.inl @@ -8,16 +8,16 @@ namespace glm // -- Component accesses -- template - GLM_FUNC_QUALIFIER typename tdualquat::part_type & tdualquat::operator[](typename tdualquat::length_type i) + GLM_FUNC_QUALIFIER constexpr typename tdualquat::part_type & tdualquat::operator[](typename tdualquat::length_type i) noexcept { - assert(i >= 0 && i < this->length()); + GLM_ASSERT_LENGTH(i, this->length()); return (&real)[i]; } template - GLM_FUNC_QUALIFIER typename tdualquat::part_type const& tdualquat::operator[](typename tdualquat::length_type i) const + GLM_FUNC_QUALIFIER constexpr typename tdualquat::part_type const& tdualquat::operator[](typename tdualquat::length_type i) const noexcept { - assert(i >= 0 && i < this->length()); + GLM_ASSERT_LENGTH(i, this->length()); return (&real)[i]; } @@ -25,23 +25,17 @@ namespace glm # if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat() -# if GLM_CONFIG_DEFAULTED_FUNCTIONS != GLM_DISABLE + GLM_DEFAULTED_DEFAULT_CTOR_QUALIFIER constexpr tdualquat::tdualquat() +# if GLM_CONFIG_CTOR_INIT == GLM_CTOR_INITIALIZER_LIST : real(qua()) , dual(qua::wxyz(0, 0, 0, 0)) # endif {} - - template - GLM_DEFAULTED_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(tdualquat const& d) - : real(d.real) - , dual(d.dual) - {} # endif template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(tdualquat const& d) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(tdualquat const& d) : real(d.real) , dual(d.dual) {} @@ -49,12 +43,12 @@ namespace glm // -- Explicit basic constructors -- template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(qua const& r) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(qua const& r) : real(r), dual(qua::wxyz(0, 0, 0, 0)) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(qua const& q, vec<3, T, Q> const& p) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(qua const& q, vec<3, T, Q> const& p) : real(q), dual(qua::wxyz( T(-0.5) * ( p.x*q.x + p.y*q.y + p.z*q.z), T(+0.5) * ( p.x*q.w + p.y*q.z - p.z*q.y), @@ -63,7 +57,7 @@ namespace glm {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(qua const& r, qua const& d) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(qua const& r, qua const& d) : real(r), dual(d) {} @@ -71,38 +65,28 @@ namespace glm template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(tdualquat const& q) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(tdualquat const& q) : real(q.real) , dual(q.dual) {} template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(mat<2, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(mat<2, 4, T, Q> const& m) { *this = dualquat_cast(m); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat::tdualquat(mat<3, 4, T, Q> const& m) + GLM_FUNC_QUALIFIER constexpr tdualquat::tdualquat(mat<3, 4, T, Q> const& m) { *this = dualquat_cast(m); } // -- Unary arithmetic operators -- -# if GLM_CONFIG_DEFAULTED_FUNCTIONS == GLM_DISABLE - template - GLM_DEFAULTED_FUNC_QUALIFIER tdualquat & tdualquat::operator=(tdualquat const& q) - { - this->real = q.real; - this->dual = q.dual; - return *this; - } -# endif - template template - GLM_FUNC_QUALIFIER tdualquat & tdualquat::operator=(tdualquat const& q) + GLM_FUNC_QUALIFIER constexpr tdualquat & tdualquat::operator=(tdualquat const& q) { this->real = q.real; this->dual = q.dual; @@ -111,7 +95,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tdualquat & tdualquat::operator*=(U s) + GLM_FUNC_QUALIFIER constexpr tdualquat & tdualquat::operator*=(U s) { this->real *= static_cast(s); this->dual *= static_cast(s); @@ -120,7 +104,7 @@ namespace glm template template - GLM_FUNC_QUALIFIER tdualquat & tdualquat::operator/=(U s) + GLM_FUNC_QUALIFIER constexpr tdualquat & tdualquat::operator/=(U s) { this->real /= static_cast(s); this->dual /= static_cast(s); diff --git a/glm/gtx/exterior_product.hpp b/glm/gtx/exterior_product.hpp index 1979acc84..07e2b0401 100644 --- a/glm/gtx/exterior_product.hpp +++ b/glm/gtx/exterior_product.hpp @@ -35,7 +35,7 @@ namespace glm /// /// @see Exterior product template - GLM_FUNC_DECL GLM_CONSTEXPR T cross(vec<2, T, Q> const& v, vec<2, T, Q> const& u); + GLM_FUNC_DECL constexpr T cross(vec<2, T, Q> const& v, vec<2, T, Q> const& u); /// @} } //namespace glm diff --git a/glm/gtx/exterior_product.inl b/glm/gtx/exterior_product.inl index 690085d6f..fa67d3832 100644 --- a/glm/gtx/exterior_product.inl +++ b/glm/gtx/exterior_product.inl @@ -8,9 +8,9 @@ namespace detail template struct compute_cross_vec2 { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static T call(vec<2, T, Q> const& v, vec<2, T, Q> const& u) + GLM_FUNC_QUALIFIER constexpr static T call(vec<2, T, Q> const& v, vec<2, T, Q> const& u) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'cross' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'cross' accepts only floating-point inputs"); return v.x * u.y - u.x * v.y; } @@ -18,7 +18,7 @@ namespace detail }//namespace detail template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T cross(vec<2, T, Q> const& x, vec<2, T, Q> const& y) + GLM_FUNC_QUALIFIER constexpr T cross(vec<2, T, Q> const& x, vec<2, T, Q> const& y) { return detail::compute_cross_vec2::value>::call(x, y); } diff --git a/glm/gtx/fast_square_root.inl b/glm/gtx/fast_square_root.inl index 60fdb7a5a..5a5757fae 100644 --- a/glm/gtx/fast_square_root.inl +++ b/glm/gtx/fast_square_root.inl @@ -6,7 +6,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType fastSqrt(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fastSqrt' only accept floating-point input"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fastSqrt' only accept floating-point input"); return genType(1) / fastInverseSqrt(x); } @@ -34,7 +34,7 @@ namespace glm template GLM_FUNC_QUALIFIER genType fastLength(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fastLength' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fastLength' only accept floating-point inputs"); return abs(x); } @@ -42,7 +42,7 @@ namespace glm template GLM_FUNC_QUALIFIER T fastLength(vec const& x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fastLength' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'fastLength' only accept floating-point inputs"); return fastSqrt(dot(x, x)); } diff --git a/glm/gtx/iteration.hpp b/glm/gtx/iteration.hpp index c63af87a2..83c2071e4 100644 --- a/glm/gtx/iteration.hpp +++ b/glm/gtx/iteration.hpp @@ -27,58 +27,58 @@ namespace glm /// @addtogroup gtx_iteration /// @{ template - GLM_FUNC_DECL GLM_CONSTEXPR T* begin(vec& v); + GLM_FUNC_DECL constexpr T* begin(vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR T* begin(mat& m); + GLM_FUNC_DECL constexpr T* begin(mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR T* begin(qua& q); + GLM_FUNC_DECL constexpr T* begin(qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR const T* begin(const vec& v); + GLM_FUNC_DECL constexpr const T* begin(const vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR const T* begin(const mat& m); + GLM_FUNC_DECL constexpr const T* begin(const mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR const T* begin(const qua& q); + GLM_FUNC_DECL constexpr const T* begin(const qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR T* end(vec& v); + GLM_FUNC_DECL constexpr T* end(vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR T* end(mat& m); + GLM_FUNC_DECL constexpr T* end(mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR T* end(qua& q); + GLM_FUNC_DECL constexpr T* end(qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR const T* end(const vec& v); + GLM_FUNC_DECL constexpr const T* end(const vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR const T* end(const mat& m); + GLM_FUNC_DECL constexpr const T* end(const mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR const T* end(const qua& q); + GLM_FUNC_DECL constexpr const T* end(const qua& q); // Reverse iteration // rbegin,rend template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rbegin(vec& v); + GLM_FUNC_DECL constexpr std::reverse_iterator rbegin(vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rbegin(mat& m); + GLM_FUNC_DECL constexpr std::reverse_iterator rbegin(mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rbegin(qua& q); + GLM_FUNC_DECL constexpr std::reverse_iterator rbegin(qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rbegin(const vec& v); + GLM_FUNC_DECL constexpr std::reverse_iterator rbegin(const vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rbegin(const mat& m); + GLM_FUNC_DECL constexpr std::reverse_iterator rbegin(const mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rbegin(const qua& q); + GLM_FUNC_DECL constexpr std::reverse_iterator rbegin(const qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rend(vec& v); + GLM_FUNC_DECL constexpr std::reverse_iterator rend(vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rend(mat& m); + GLM_FUNC_DECL constexpr std::reverse_iterator rend(mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rend(qua& q); + GLM_FUNC_DECL constexpr std::reverse_iterator rend(qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rend(const vec& v); + GLM_FUNC_DECL constexpr std::reverse_iterator rend(const vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rend(const mat& m); + GLM_FUNC_DECL constexpr std::reverse_iterator rend(const mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR std::reverse_iterator rend(const qua& q); + GLM_FUNC_DECL constexpr std::reverse_iterator rend(const qua& q); /// @} diff --git a/glm/gtx/iteration.inl b/glm/gtx/iteration.inl index be0894007..2950d5d9f 100644 --- a/glm/gtx/iteration.inl +++ b/glm/gtx/iteration.inl @@ -10,104 +10,104 @@ namespace glm /// @addtogroup gtx_iteration /// @{ template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T* begin(vec& v) { + GLM_FUNC_QUALIFIER constexpr T* begin(vec& v) { return &v.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T* begin(mat& m) { + GLM_FUNC_QUALIFIER constexpr T* begin(mat& m) { return &m[0].x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T* begin(qua& q) { + GLM_FUNC_QUALIFIER constexpr T* begin(qua& q) { return &q[0]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR const T* begin(const vec& v) { + GLM_FUNC_QUALIFIER constexpr const T* begin(const vec& v) { return &v.x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR const T* begin(const mat& m) { + GLM_FUNC_QUALIFIER constexpr const T* begin(const mat& m) { return &m[0].x; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR const T* begin(const qua& q) { + GLM_FUNC_QUALIFIER constexpr const T* begin(const qua& q) { return &q[0]; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T* end(vec& v) { + GLM_FUNC_QUALIFIER constexpr T* end(vec& v) { return (&v.x) + L; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T* end(mat& m) { + GLM_FUNC_QUALIFIER constexpr T* end(mat& m) { return (&m[0].x) + C*R; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T* end(qua& q) { + GLM_FUNC_QUALIFIER constexpr T* end(qua& q) { return (&q[0]) + 4; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR const T* end(const vec& v) { + GLM_FUNC_QUALIFIER constexpr const T* end(const vec& v) { return (&v.x) + L; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR const T* end(const mat& m) { + GLM_FUNC_QUALIFIER constexpr const T* end(const mat& m) { return (&m[0].x) + C*R; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR const T* end(const qua& q) { + GLM_FUNC_QUALIFIER constexpr const T* end(const qua& q) { return (&q[0]) + 4; } // Reverse iteration // rbegin,rend template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rbegin(vec& v) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rbegin(vec& v) { return std::reverse_iterator(end(v)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rbegin(mat& m) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rbegin(mat& m) { return std::reverse_iterator(end(m)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rbegin(qua& q) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rbegin(qua& q) { return std::reverse_iterator(end(q)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rbegin(const vec& v) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rbegin(const vec& v) { return std::reverse_iterator(end(v)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rbegin(const mat& m) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rbegin(const mat& m) { return std::reverse_iterator(end(m)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rbegin(const qua& q) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rbegin(const qua& q) { return std::reverse_iterator(end(q)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rend(vec& v) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rend(vec& v) { return std::reverse_iterator(begin(v)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rend(mat& m) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rend(mat& m) { return std::reverse_iterator(begin(m)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rend(qua& q) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rend(qua& q) { return std::reverse_iterator(begin(q)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rend(const vec& v) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rend(const vec& v) { return std::reverse_iterator(begin(v)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rend(const mat& m) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rend(const mat& m) { return std::reverse_iterator(begin(m)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR std::reverse_iterator rend(const qua& q) { + GLM_FUNC_QUALIFIER constexpr std::reverse_iterator rend(const qua& q) { return std::reverse_iterator(begin(q)); } diff --git a/glm/gtx/norm.inl b/glm/gtx/norm.inl index 4a9f79645..cdaa560d0 100644 --- a/glm/gtx/norm.inl +++ b/glm/gtx/norm.inl @@ -18,28 +18,28 @@ namespace detail template GLM_FUNC_QUALIFIER genType length2(genType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'length2' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'length2' accepts only floating-point inputs"); return x * x; } template GLM_FUNC_QUALIFIER T length2(vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'length2' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'length2' accepts only floating-point inputs"); return detail::compute_length2::value>::call(v); } template GLM_FUNC_QUALIFIER T distance2(T p0, T p1) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'distance2' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'distance2' accepts only floating-point inputs"); return length2(p1 - p0); } template GLM_FUNC_QUALIFIER T distance2(vec const& p0, vec const& p1) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'distance2' accepts only floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'distance2' accepts only floating-point inputs"); return length2(p1 - p0); } diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index f51c521cc..c7817b3ba 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -35,13 +35,13 @@ namespace glm /// /// @see gtx_quaternion template - GLM_FUNC_DECL GLM_CONSTEXPR qua quat_identity(); + GLM_FUNC_DECL constexpr qua quat_identity(); /// Compute a cross product between a quaternion and a vector. /// /// @see gtx_quaternion template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> cross( + GLM_FUNC_DECL constexpr vec<3, T, Q> cross( qua const& q, vec<3, T, Q> const& v); @@ -49,7 +49,7 @@ namespace glm /// /// @see gtx_quaternion template - GLM_FUNC_DECL GLM_CONSTEXPR vec<3, T, Q> cross( + GLM_FUNC_DECL constexpr vec<3, T, Q> cross( vec<3, T, Q> const& v, qua const& q); @@ -164,7 +164,7 @@ namespace glm /// /// @see gtx_quaternion template - GLM_FUNC_DECL GLM_CONSTEXPR T length2(qua const& q); + GLM_FUNC_DECL constexpr T length2(qua const& q); /// @} }//namespace glm diff --git a/glm/gtx/quaternion.inl b/glm/gtx/quaternion.inl index 5e18899a7..560ef17ae 100644 --- a/glm/gtx/quaternion.inl +++ b/glm/gtx/quaternion.inl @@ -6,19 +6,19 @@ namespace glm { template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR qua quat_identity() + GLM_FUNC_QUALIFIER constexpr qua quat_identity() { return qua::wxyz(static_cast(1), static_cast(0), static_cast(0), static_cast(0)); } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> cross(vec<3, T, Q> const& v, qua const& q) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> cross(vec<3, T, Q> const& v, qua const& q) { return inverse(q) * v; } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR vec<3, T, Q> cross(qua const& q, vec<3, T, Q> const& v) + GLM_FUNC_QUALIFIER constexpr vec<3, T, Q> cross(qua const& q, vec<3, T, Q> const& v) { return q * v; } @@ -70,7 +70,7 @@ namespace glm } template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR T length2(qua const& q) + GLM_FUNC_QUALIFIER constexpr T length2(qua const& q) { return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w; } diff --git a/glm/gtx/structured_bindings.hpp b/glm/gtx/structured_bindings.hpp index 8475007ca..d1e2f73d9 100644 --- a/glm/gtx/structured_bindings.hpp +++ b/glm/gtx/structured_bindings.hpp @@ -32,19 +32,19 @@ namespace std { template struct tuple_element> { - GLM_STATIC_ASSERT(I < L,"Index out of bounds"); + static_assert(I < L,"Index out of bounds"); typedef T type; }; template struct tuple_element> { - GLM_STATIC_ASSERT(I < C, "Index out of bounds"); + static_assert(I < C, "Index out of bounds"); typedef glm::vec type; }; template struct tuple_element> { - GLM_STATIC_ASSERT(I < 4, "Index out of bounds"); + static_assert(I < 4, "Index out of bounds"); typedef T type; }; @@ -64,27 +64,27 @@ namespace glm /// @{ template - GLM_FUNC_DECL GLM_CONSTEXPR T& get(vec& v); + GLM_FUNC_DECL constexpr T& get(vec& v); template - GLM_FUNC_DECL GLM_CONSTEXPR T const& get(vec const& v); + GLM_FUNC_DECL constexpr T const& get(vec const& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec& get(mat& m); + GLM_FUNC_DECL constexpr vec& get(mat& m); template - GLM_FUNC_DECL GLM_CONSTEXPR vec const& get(mat const& m); + GLM_FUNC_DECL constexpr vec const& get(mat const& m); template - GLM_FUNC_DECL GLM_CONSTEXPR T& get(qua& q); + GLM_FUNC_DECL constexpr T& get(qua& q); template - GLM_FUNC_DECL GLM_CONSTEXPR T const& get(qua const& q); + GLM_FUNC_DECL constexpr T const& get(qua const& q); #if GLM_HAS_RVALUE_REFERENCES template - GLM_FUNC_DECL GLM_CONSTEXPR T get(vec const&& v); + GLM_FUNC_DECL constexpr T get(vec const&& v); template - GLM_FUNC_DECL GLM_CONSTEXPR vec get(mat const&& m); + GLM_FUNC_DECL constexpr vec get(mat const&& m); template - GLM_FUNC_DECL GLM_CONSTEXPR T get(qua const&& q); + GLM_FUNC_DECL constexpr T get(qua const&& q); #endif /// @} }//namespace glm diff --git a/glm/gtx/structured_bindings.inl b/glm/gtx/structured_bindings.inl index 54d613bd3..ea9b19998 100644 --- a/glm/gtx/structured_bindings.inl +++ b/glm/gtx/structured_bindings.inl @@ -1,53 +1,53 @@ namespace glm { template - GLM_CONSTEXPR T& get(vec& v) { - GLM_STATIC_ASSERT(I < L, "Index out of bounds"); + constexpr T& get(vec& v) { + static_assert(I < L, "Index out of bounds"); return v[I]; } template - GLM_CONSTEXPR T const& get(vec const& v) { - GLM_STATIC_ASSERT(I < L, "Index out of bounds"); + constexpr T const& get(vec const& v) { + static_assert(I < L, "Index out of bounds"); return v[I]; } template - GLM_CONSTEXPR vec& get(mat& m) { - GLM_STATIC_ASSERT(I < C, "Index out of bounds"); + constexpr vec& get(mat& m) { + static_assert(I < C, "Index out of bounds"); return m[I]; } template - GLM_CONSTEXPR vec const& get(mat const& m) { - GLM_STATIC_ASSERT(I < C, "Index out of bounds"); + constexpr vec const& get(mat const& m) { + static_assert(I < C, "Index out of bounds"); return m[I]; } template - GLM_CONSTEXPR T& get(qua& q) { - GLM_STATIC_ASSERT(I < 4, "Index out of bounds"); + constexpr T& get(qua& q) { + static_assert(I < 4, "Index out of bounds"); return q[I]; } template - GLM_CONSTEXPR T const& get(qua const& q) { - GLM_STATIC_ASSERT(I < 4, "Index out of bounds"); + constexpr T const& get(qua const& q) { + static_assert(I < 4, "Index out of bounds"); return q[I]; } #if GLM_HAS_RVALUE_REFERENCES template - GLM_CONSTEXPR T get(vec const&& v) + constexpr T get(vec const&& v) { - GLM_STATIC_ASSERT(I < L, "Index out of bounds"); + static_assert(I < L, "Index out of bounds"); return v[I]; } template - GLM_CONSTEXPR vec get(mat const&& m) { - GLM_STATIC_ASSERT(I < C, "Index out of bounds"); + constexpr vec get(mat const&& m) { + static_assert(I < C, "Index out of bounds"); return m[I]; } template - GLM_CONSTEXPR T get(qua const&& q) { - GLM_STATIC_ASSERT(I < 4, "Index out of bounds"); + constexpr T get(qua const&& q) { + static_assert(I < 4, "Index out of bounds"); return q[I]; } #endif diff --git a/glm/gtx/vector_angle.inl b/glm/gtx/vector_angle.inl index 11e1a2183..deb540524 100644 --- a/glm/gtx/vector_angle.inl +++ b/glm/gtx/vector_angle.inl @@ -9,21 +9,21 @@ namespace glm genType const& y ) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'angle' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'angle' only accept floating-point inputs"); return acos(clamp(dot(x, y), genType(-1), genType(1))); } template GLM_FUNC_QUALIFIER T angle(vec const& x, vec const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'angle' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'angle' only accept floating-point inputs"); return acos(clamp(dot(x, y), T(-1), T(1))); } template GLM_FUNC_QUALIFIER T orientedAngle(vec<2, T, Q> const& x, vec<2, T, Q> const& y) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'orientedAngle' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'orientedAngle' only accept floating-point inputs"); T const Angle(acos(clamp(dot(x, y), T(-1), T(1)))); T const partialCross = x.x * y.y - y.x * x.y; @@ -37,7 +37,7 @@ namespace glm template GLM_FUNC_QUALIFIER T orientedAngle(vec<3, T, Q> const& x, vec<3, T, Q> const& y, vec<3, T, Q> const& ref) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'orientedAngle' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559 || GLM_CONFIG_UNRESTRICTED_FLOAT, "'orientedAngle' only accept floating-point inputs"); T const Angle(acos(clamp(dot(x, y), T(-1), T(1)))); return mix(Angle, -Angle, dot(ref, cross(x, y)) < T(0)); diff --git a/glm/gtx/vector_query.inl b/glm/gtx/vector_query.inl index d1a5c9be4..299fb63fa 100644 --- a/glm/gtx/vector_query.inl +++ b/glm/gtx/vector_query.inl @@ -79,7 +79,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool areCollinear(vec const& v0, vec const& v1, T const& epsilon) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'areCollinear' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'areCollinear' only accept floating-point inputs"); return detail::compute_areCollinear::call(v0, v1, epsilon); } @@ -87,7 +87,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool areOrthogonal(vec const& v0, vec const& v1, T const& epsilon) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'areOrthogonal' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'areOrthogonal' only accept floating-point inputs"); return abs(dot(v0, v1)) <= max( static_cast(1), @@ -97,7 +97,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isNormalized(vec const& v, T const& epsilon) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'isNormalized' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'isNormalized' only accept floating-point inputs"); return abs(length(v) - static_cast(1)) <= static_cast(2) * epsilon; } @@ -105,7 +105,7 @@ namespace detail template GLM_FUNC_QUALIFIER bool isNull(vec const& v, T const& epsilon) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'isNull' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'isNull' only accept floating-point inputs"); return length(v) <= epsilon; } @@ -113,7 +113,7 @@ namespace detail template GLM_FUNC_QUALIFIER vec isCompNull(vec const& v, T const& epsilon) { - GLM_STATIC_ASSERT(std::numeric_limits::is_iec559, "'isCompNull' only accept floating-point inputs"); + static_assert(std::numeric_limits::is_iec559, "'isCompNull' only accept floating-point inputs"); return detail::compute_isCompNull::call(v, epsilon); } diff --git a/glm/simd/platform.h b/glm/simd/platform.h index a318b098f..16d0b87a2 100644 --- a/glm/simd/platform.h +++ b/glm/simd/platform.h @@ -85,6 +85,7 @@ #define GLM_COMPILER_GCC12 0x02000900 #define GLM_COMPILER_GCC13 0x02000A00 #define GLM_COMPILER_GCC14 0x02000B00 +#define GLM_COMPILER_GCC15 0x02000C00 // CUDA #define GLM_COMPILER_CUDA 0x10000000 diff --git a/glm/trigonometric.hpp b/glm/trigonometric.hpp index 51d49c132..d2d3e2eff 100644 --- a/glm/trigonometric.hpp +++ b/glm/trigonometric.hpp @@ -35,7 +35,7 @@ namespace glm /// @see GLSL radians man page /// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec radians(vec const& degrees); + GLM_FUNC_DECL constexpr vec radians(vec const& degrees); /// Converts radians to degrees and returns the result. /// @@ -46,7 +46,7 @@ namespace glm /// @see GLSL degrees man page /// @see GLSL 4.20.8 specification, section 8.1 Angle and Trigonometry Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec degrees(vec const& radians); + GLM_FUNC_DECL constexpr vec degrees(vec const& radians); /// The standard trigonometric sine function. /// The values returned by this function will range from [-1, 1]. diff --git a/glm/vector_relational.hpp b/glm/vector_relational.hpp index a0fe17eb7..f0426d39a 100644 --- a/glm/vector_relational.hpp +++ b/glm/vector_relational.hpp @@ -35,7 +35,7 @@ namespace glm /// @see GLSL lessThan man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec lessThan(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec lessThan(vec const& x, vec const& y); /// Returns the component-wise comparison of result x <= y. /// @@ -45,7 +45,7 @@ namespace glm /// @see GLSL lessThanEqual man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec lessThanEqual(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec lessThanEqual(vec const& x, vec const& y); /// Returns the component-wise comparison of result x > y. /// @@ -55,7 +55,7 @@ namespace glm /// @see GLSL greaterThan man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec greaterThan(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec greaterThan(vec const& x, vec const& y); /// Returns the component-wise comparison of result x >= y. /// @@ -65,7 +65,7 @@ namespace glm /// @see GLSL greaterThanEqual man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec greaterThanEqual(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec greaterThanEqual(vec const& x, vec const& y); /// Returns the component-wise comparison of result x == y. /// @@ -75,7 +75,7 @@ namespace glm /// @see GLSL equal man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec equal(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec equal(vec const& x, vec const& y); /// Returns the component-wise comparison of result x != y. /// @@ -85,7 +85,7 @@ namespace glm /// @see GLSL notEqual man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec notEqual(vec const& x, vec const& y); + GLM_FUNC_DECL constexpr vec notEqual(vec const& x, vec const& y); /// Returns true if any component of x is true. /// @@ -94,7 +94,7 @@ namespace glm /// @see GLSL any man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR bool any(vec const& v); + GLM_FUNC_DECL constexpr bool any(vec const& v); /// Returns true if all components of x are true. /// @@ -103,7 +103,7 @@ namespace glm /// @see GLSL all man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR bool all(vec const& v); + GLM_FUNC_DECL constexpr bool all(vec const& v); /// Returns the component-wise logical complement of x. /// /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead. @@ -113,7 +113,7 @@ namespace glm /// @see GLSL not man page /// @see GLSL 4.20.8 specification, section 8.7 Vector Relational Functions template - GLM_FUNC_DECL GLM_CONSTEXPR vec not_(vec const& v); + GLM_FUNC_DECL constexpr vec not_(vec const& v); /// @} }//namespace glm diff --git a/test/bug/bug_ms_vec_static.cpp b/test/bug/bug_ms_vec_static.cpp index 0a3518e59..8ce029805 100644 --- a/test/bug/bug_ms_vec_static.cpp +++ b/test/bug/bug_ms_vec_static.cpp @@ -10,7 +10,7 @@ struct swizzleStruct struct vec2 { - GLM_CONSTEXPR vec2() : + constexpr vec2() : x(0), y(0) {} diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp index 99eaa8798..80691491b 100644 --- a/test/core/core_func_common.cpp +++ b/test/core/core_func_common.cpp @@ -950,7 +950,7 @@ namespace sign template GLM_FUNC_QUALIFIER genFIType sign_if(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_iec559 || (std::numeric_limits::is_signed && std::numeric_limits::is_integer), "'sign' only accept signed inputs"); @@ -972,7 +972,7 @@ namespace sign template GLM_FUNC_QUALIFIER genFIType sign_alu1(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_signed && std::numeric_limits::is_integer, "'sign' only accept integer inputs"); @@ -985,7 +985,7 @@ namespace sign GLM_FUNC_QUALIFIER int sign_alu2(int x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_signed && std::numeric_limits::is_integer, "'sign' only accept integer inputs"); + static_assert(std::numeric_limits::is_signed && std::numeric_limits::is_integer, "'sign' only accept integer inputs"); # if GLM_COMPILER & GLM_COMPILER_VC # pragma warning(push) @@ -1002,7 +1002,7 @@ namespace sign template GLM_FUNC_QUALIFIER genFIType sign_sub(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_signed && std::numeric_limits::is_integer, "'sign' only accept integer inputs"); @@ -1012,7 +1012,7 @@ namespace sign template GLM_FUNC_QUALIFIER genFIType sign_cmp(genFIType x) { - GLM_STATIC_ASSERT( + static_assert( std::numeric_limits::is_signed && std::numeric_limits::is_integer, "'sign' only accept integer inputs"); diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index 268db0eae..d76018503 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -163,7 +163,7 @@ namespace bitfieldReverse template GLM_FUNC_QUALIFIER glm::vec bitfieldReverseLoop(glm::vec const& v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitfieldReverse' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitfieldReverse' only accept integer values"); glm::vec Result(0); T const BitSize = static_cast(sizeof(T) * 8); @@ -567,7 +567,7 @@ namespace findMSB template static int findMSB_intrinsic(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); if(Value == 0) return -1; @@ -582,7 +582,7 @@ namespace findMSB template static int findMSB_avx(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); if(Value == 0) return -1; @@ -594,7 +594,7 @@ namespace findMSB template static int findMSB_095(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); if(Value == genIUType(0) || Value == genIUType(-1)) return -1; @@ -618,7 +618,7 @@ namespace findMSB template static int findMSB_nlz1(genIUType x) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findMSB' only accept integer values"); if (x == 0) return -1; @@ -970,7 +970,7 @@ namespace findLSB template static int findLSB_intrinsic(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); if(Value == 0) return -1; @@ -984,7 +984,7 @@ namespace findLSB template static int findLSB_095(genIUType Value) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'findLSB' only accept integer values"); if(Value == 0) return -1; @@ -1397,7 +1397,7 @@ namespace bitCount template inline int bitCount_if(T v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); int Count(0); for(T i = 0, n = static_cast(sizeof(T) * 8); i < n; ++i) @@ -1411,7 +1411,7 @@ namespace bitCount template inline int bitCount_vec(T v) { - GLM_STATIC_ASSERT(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); + static_assert(std::numeric_limits::is_integer, "'bitCount' only accept integer values"); int Count(0); for(T i = 0, n = static_cast(sizeof(T) * 8); i < n; ++i) diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index c2e3c52be..0c01977e9 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -332,7 +332,7 @@ static int test_size() Error += glm::vec2::length() == 2 ? 0 : 1; Error += glm::dvec2::length() == 2 ? 0 : 1; - GLM_CONSTEXPR glm::length_t Length = glm::vec2::length(); + constexpr glm::length_t Length = glm::vec2::length(); Error += Length == 2 ? 0 : 1; return Error; diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 70dd7da67..a9f511c1c 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -324,7 +324,7 @@ static int test_vec3_size() Error += glm::vec3::length() == 3 ? 0 : 1; Error += glm::dvec3::length() == 3 ? 0 : 1; - GLM_CONSTEXPR glm::length_t Length = glm::vec3::length(); + constexpr glm::length_t Length = glm::vec3::length(); Error += Length == 3 ? 0 : 1; return Error; diff --git a/test/ext/ext_vec1.cpp b/test/ext/ext_vec1.cpp index 1b9ba0f25..595e34309 100644 --- a/test/ext/ext_vec1.cpp +++ b/test/ext/ext_vec1.cpp @@ -86,7 +86,7 @@ static int test_vec1_size() Error += glm::vec1::length() == 1 ? 0 : 1; Error += glm::dvec1::length() == 1 ? 0 : 1; - GLM_CONSTEXPR glm::length_t Length = glm::vec1::length(); + constexpr glm::length_t Length = glm::vec1::length(); Error += Length == 1 ? 0 : 1; return Error; diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp index b98131e16..b7f9ce727 100644 --- a/test/gtc/gtc_type_aligned.cpp +++ b/test/gtc/gtc_type_aligned.cpp @@ -10,19 +10,19 @@ #include #include -GLM_STATIC_ASSERT(glm::detail::is_aligned::value, "aligned_lowp is not aligned"); -GLM_STATIC_ASSERT(glm::detail::is_aligned::value, "aligned_mediump is not aligned"); -GLM_STATIC_ASSERT(glm::detail::is_aligned::value, "aligned_highp is not aligned"); -GLM_STATIC_ASSERT(!glm::detail::is_aligned::value, "packed_highp is aligned"); -GLM_STATIC_ASSERT(!glm::detail::is_aligned::value, "packed_mediump is aligned"); -GLM_STATIC_ASSERT(!glm::detail::is_aligned::value, "packed_lowp is aligned"); +static_assert(glm::detail::is_aligned::value, "aligned_lowp is not aligned"); +static_assert(glm::detail::is_aligned::value, "aligned_mediump is not aligned"); +static_assert(glm::detail::is_aligned::value, "aligned_highp is not aligned"); +static_assert(!glm::detail::is_aligned::value, "packed_highp is aligned"); +static_assert(!glm::detail::is_aligned::value, "packed_mediump is aligned"); +static_assert(!glm::detail::is_aligned::value, "packed_lowp is aligned"); struct my_vec4_packed { glm::uint32 a; glm::vec4 b; }; -GLM_STATIC_ASSERT(sizeof(my_vec4_packed) == sizeof(glm::uint32) + sizeof(glm::vec4), "glm::vec4 packed is not correct"); +static_assert(sizeof(my_vec4_packed) == sizeof(glm::uint32) + sizeof(glm::vec4), "glm::vec4 packed is not correct"); #if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic push @@ -34,7 +34,7 @@ struct my_vec4_aligned glm::uint32 a; glm::aligned_vec4 b; }; -GLM_STATIC_ASSERT(sizeof(my_vec4_aligned) == sizeof(glm::aligned_vec4) * 2, "glm::vec4 aligned is not correct"); +static_assert(sizeof(my_vec4_aligned) == sizeof(glm::aligned_vec4) * 2, "glm::vec4 aligned is not correct"); #if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic pop @@ -45,14 +45,14 @@ struct my_dvec4_packed glm::uint64 a; glm::dvec4 b; }; -GLM_STATIC_ASSERT(sizeof(my_dvec4_packed) == sizeof(glm::uint64) + sizeof(glm::dvec4), "glm::dvec4 packed is not correct"); +static_assert(sizeof(my_dvec4_packed) == sizeof(glm::uint64) + sizeof(glm::dvec4), "glm::dvec4 packed is not correct"); struct my_dvec4_aligned { glm::uint64 a; glm::aligned_dvec4 b; }; -//GLM_STATIC_ASSERT(sizeof(my_dvec4_aligned) == sizeof(glm::aligned_dvec4) * 2, "glm::dvec4 aligned is not correct"); +//static_assert(sizeof(my_dvec4_aligned) == sizeof(glm::aligned_dvec4) * 2, "glm::dvec4 aligned is not correct"); #if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic push @@ -69,7 +69,7 @@ struct my_ivec4_packed # pragma clang diagnostic pop #endif -GLM_STATIC_ASSERT(sizeof(my_ivec4_packed) == sizeof(glm::uint32) + sizeof(glm::ivec4), "glm::ivec4 packed is not correct"); +static_assert(sizeof(my_ivec4_packed) == sizeof(glm::uint32) + sizeof(glm::ivec4), "glm::ivec4 packed is not correct"); #if GLM_COMPILER & GLM_COMPILER_CLANG # pragma clang diagnostic push @@ -86,14 +86,14 @@ struct my_ivec4_aligned # pragma clang diagnostic pop #endif -GLM_STATIC_ASSERT(sizeof(my_ivec4_aligned) == sizeof(glm::aligned_ivec4) * 2, "glm::ivec4 aligned is not correct"); +static_assert(sizeof(my_ivec4_aligned) == sizeof(glm::aligned_ivec4) * 2, "glm::ivec4 aligned is not correct"); struct my_u8vec4_packed { glm::uint32 a; glm::u8vec4 b; }; -GLM_STATIC_ASSERT(sizeof(my_u8vec4_packed) == sizeof(glm::uint32) + sizeof(glm::u8vec4), "glm::u8vec4 packed is not correct"); +static_assert(sizeof(my_u8vec4_packed) == sizeof(glm::uint32) + sizeof(glm::u8vec4), "glm::u8vec4 packed is not correct"); static int test_copy_vec4() { diff --git a/test/gtx/gtx_load.cpp b/test/gtx/gtx_load.cpp index 7c39b7952..7a893b609 100644 --- a/test/gtx/gtx_load.cpp +++ b/test/gtx/gtx_load.cpp @@ -50,7 +50,7 @@ namespace glm template struct load_gentype<4, float, Q, true> { - GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<4, float, Q> load(float const* Mem) + GLM_FUNC_QUALIFIER constexpr static vec<4, float, Q> load(float const* Mem) { vec<4, float, Q> Result; Result.data = _mm_loadu_ps(Mem); @@ -60,7 +60,7 @@ namespace glm # endif//GLM_ARCH & GLM_ARCH_SSE_BIT template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR genType example_identity() + GLM_FUNC_QUALIFIER constexpr genType example_identity() { return detail::init_gentype::GENTYPE>::identity(); } diff --git a/test/gtx/gtx_pca.cpp b/test/gtx/gtx_pca.cpp index e084fd474..b55876842 100644 --- a/test/gtx/gtx_pca.cpp +++ b/test/gtx/gtx_pca.cpp @@ -18,9 +18,9 @@ template T myEpsilon(); template<> -GLM_INLINE GLM_CONSTEXPR float myEpsilon() { return 0.00001f; } +GLM_INLINE constexpr float myEpsilon() { return 0.00001f; } template<> -GLM_INLINE GLM_CONSTEXPR double myEpsilon() { return 0.000001; } +GLM_INLINE constexpr double myEpsilon() { return 0.000001; } template static bool vectorEpsilonEqual(glm::vec const& a, glm::vec const& b, T epsilon)