anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Fixed build

Browse Source
master
Christophe Riccio ago%!(EXTRA string=10 years)
parent 6f1b7c24ce
commit c90f7b0973
21 changed files with 22 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      glm/detail/type_mat2x2.hpp
  2. 2
      glm/detail/type_mat2x3.hpp
  3. 2
      glm/detail/type_mat2x4.hpp
  4. 2
      glm/detail/type_mat3x2.hpp
  5. 2
      glm/detail/type_mat3x4.hpp
  6. 2
      glm/detail/type_mat4x2.hpp
  7. 2
      glm/detail/type_mat4x3.hpp
  8. 2
      glm/detail/type_mat4x4.hpp
  9. 4
      glm/detail/type_vec1.hpp
  10. 2
      glm/detail/type_vec2.hpp
  11. 2
      glm/detail/type_vec3.hpp
  12. 2
      glm/detail/type_vec4.hpp
  13. 2
      glm/gtc/quaternion.hpp
  14. 2
      glm/gtx/dual_quaternion.hpp
  15. 2
      glm/gtx/simd_mat4.hpp
  16. 2
      glm/gtx/simd_quat.hpp
  17. 2
      glm/gtx/simd_vec4.hpp
  18. 1
      test/core/core_type_vec2.cpp
  19. 1
      test/core/core_type_vec3.cpp
  20. 1
      test/core/core_type_vec4.cpp
  21. 1
      test/gtc/gtc_quaternion.cpp

2
glm/detail/type_mat2x2.hpp
Unescape View File

@ -54,7 +54,7 @@ namespace glm
template <typename U, precision Q> template <typename U, precision Q>
friend tvec2<U, Q> operator/(tvec2<U, Q> const & v, tmat2x2<U, Q> const & m); friend tvec2<U, Q> operator/(tvec2<U, Q> const & v, tmat2x2<U, Q> const & m);
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR length_t columns = 2; static GLM_CONSTEXPR length_t columns = 2;

2
glm/detail/type_mat2x3.hpp
Unescape View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat3x2<T, P> transpose_type; typedef tmat3x2<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR length_t cols = 3; static GLM_CONSTEXPR length_t cols = 3;

2
glm/detail/type_mat2x4.hpp
Unescape View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat4x2<T, P> transpose_type; typedef tmat4x2<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR length_t cols = 4; static GLM_CONSTEXPR length_t cols = 4;

2
glm/detail/type_mat3x2.hpp
Unescape View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat2x3<T, P> transpose_type; typedef tmat2x3<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 3; static GLM_CONSTEXPR length_t components = 3;
static GLM_CONSTEXPR length_t cols = 2; static GLM_CONSTEXPR length_t cols = 2;

2
glm/detail/type_mat3x4.hpp
Unescape View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat4x3<T, P> transpose_type; typedef tmat4x3<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 3; static GLM_CONSTEXPR length_t components = 3;
static GLM_CONSTEXPR length_t cols = 4; static GLM_CONSTEXPR length_t cols = 4;

2
glm/detail/type_mat4x2.hpp
Unescape View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat2x4<T, P> transpose_type; typedef tmat2x4<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 2; static GLM_CONSTEXPR length_t cols = 2;

2
glm/detail/type_mat4x3.hpp
Unescape View File

@ -50,7 +50,7 @@ namespace glm
typedef tmat3x4<T, P> transpose_type; typedef tmat3x4<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 3; static GLM_CONSTEXPR length_t cols = 3;

2
glm/detail/type_mat4x4.hpp
Unescape View File

@ -49,7 +49,7 @@ namespace glm
typedef tmat4x4<T, P> transpose_type; typedef tmat4x4<T, P> transpose_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 4; static GLM_CONSTEXPR length_t cols = 4;

4
glm/detail/type_vec1.hpp
Unescape View File

@ -55,13 +55,13 @@ namespace glm
typedef tvec1<bool, P> bool_type; typedef tvec1<bool, P> bool_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 1; static GLM_CONSTEXPR length_t components = 1;
static GLM_CONSTEXPR precision precision = P; static GLM_CONSTEXPR precision precision = P;
# else # else
static const length_t components = 1; static const length_t components = 1;
static const precision precision = P; static const precision prec = P;
# endif # endif
# endif//GLM_META_PROG_HELPERS # endif//GLM_META_PROG_HELPERS

2
glm/detail/type_vec2.hpp
Unescape View File

@ -55,7 +55,7 @@ namespace glm
typedef tvec2<bool, P> bool_type; typedef tvec2<bool, P> bool_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 2; static GLM_CONSTEXPR length_t components = 2;
static GLM_CONSTEXPR precision prec = P; static GLM_CONSTEXPR precision prec = P;

2
glm/detail/type_vec3.hpp
Unescape View File

@ -55,7 +55,7 @@ namespace glm
typedef tvec3<bool, P> bool_type; typedef tvec3<bool, P> bool_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 3; static GLM_CONSTEXPR length_t components = 3;
static GLM_CONSTEXPR precision prec = P; static GLM_CONSTEXPR precision prec = P;

2
glm/detail/type_vec4.hpp
Unescape View File

@ -109,7 +109,7 @@ namespace detail
typedef tvec4<bool, P> bool_type; typedef tvec4<bool, P> bool_type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = P; static GLM_CONSTEXPR precision prec = P;

2
glm/gtc/quaternion.hpp
Unescape View File

@ -65,7 +65,7 @@ namespace glm
typedef tquat<T, P> type; typedef tquat<T, P> type;
typedef T value_type; typedef T value_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = P; static GLM_CONSTEXPR precision prec = P;

2
glm/gtx/dual_quaternion.hpp
Unescape View File

@ -64,7 +64,7 @@ namespace glm
typedef T value_type; typedef T value_type;
typedef glm::tquat<T, P> part_type; typedef glm::tquat<T, P> part_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 8; static GLM_CONSTEXPR length_t components = 8;
static GLM_CONSTEXPR precision prec = P; static GLM_CONSTEXPR precision prec = P;

2
glm/gtx/simd_mat4.hpp
Unescape View File

@ -71,7 +71,7 @@ namespace detail
typedef fmat4x4SIMD type; typedef fmat4x4SIMD type;
typedef fmat4x4SIMD transpose_type; typedef fmat4x4SIMD transpose_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR length_t cols = 4; static GLM_CONSTEXPR length_t cols = 4;

2
glm/gtx/simd_quat.hpp
Unescape View File

@ -76,7 +76,7 @@ namespace detail
typedef fquatSIMD type; typedef fquatSIMD type;
typedef tquat<bool, defaultp> bool_type; typedef tquat<bool, defaultp> bool_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = defaultp; static GLM_CONSTEXPR precision prec = defaultp;

2
glm/gtx/simd_vec4.hpp
Unescape View File

@ -99,7 +99,7 @@ namespace detail
typedef fvec4SIMD type; typedef fvec4SIMD type;
typedef tvec4<bool, highp> bool_type; typedef tvec4<bool, highp> bool_type;
# if GLM_META_PROG_HELPERS # ifdef GLM_META_PROG_HELPERS
# if GLM_HAS_CONSTEXPR # if GLM_HAS_CONSTEXPR
static GLM_CONSTEXPR length_t components = 4; static GLM_CONSTEXPR length_t components = 4;
static GLM_CONSTEXPR precision prec = defaultp; static GLM_CONSTEXPR precision prec = defaultp;

1
test/core/core_type_vec2.cpp
Unescape View File

@ -29,6 +29,7 @@
/// @author Christophe Riccio /// @author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#define GLM_SWIZZLE #define GLM_SWIZZLE
#include <glm/vector_relational.hpp> #include <glm/vector_relational.hpp>
#include <glm/vec2.hpp> #include <glm/vec2.hpp>

1
test/core/core_type_vec3.cpp
Unescape View File

@ -29,6 +29,7 @@
/// @author Christophe Riccio /// @author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#define GLM_SWIZZLE #define GLM_SWIZZLE
#include <glm/vector_relational.hpp> #include <glm/vector_relational.hpp>
#include <glm/geometric.hpp> #include <glm/geometric.hpp>

1
test/core/core_type_vec4.cpp
Unescape View File

@ -30,6 +30,7 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
//#define GLM_FORCE_AVX2 //#define GLM_FORCE_AVX2
#define GLM_META_PROG_HELPERS
#define GLM_SWIZZLE #define GLM_SWIZZLE
#include <glm/vector_relational.hpp> #include <glm/vector_relational.hpp>
#include <glm/vec2.hpp> #include <glm/vec2.hpp>

1
test/gtc/gtc_quaternion.cpp
Unescape View File

@ -29,6 +29,7 @@
/// @author Christophe Riccio /// @author Christophe Riccio
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#define GLM_META_PROG_HELPERS
#include <glm/gtc/quaternion.hpp> #include <glm/gtc/quaternion.hpp>
#include <glm/gtc/epsilon.hpp> #include <glm/gtc/epsilon.hpp>
#include <glm/vector_relational.hpp> #include <glm/vector_relational.hpp>

Write Preview
Loading…
Cancel
Save