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

Added GLM_META_PROG_HELPERS #350

Browse Source
master
Christophe Riccio ago%!(EXTRA string=10 years)
parent 47deb9709c
commit 38c9cd6cba
18 changed files with 199 additions and 155 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. 8
      glm/detail/type_mat2x2.hpp
  2. 4
      glm/detail/type_mat2x3.hpp
  3. 2
      glm/detail/type_mat2x4.hpp
  4. 4
      glm/detail/type_mat3x2.hpp
  5. 4
      glm/detail/type_mat3x4.hpp
  6. 4
      glm/detail/type_mat4x2.hpp
  7. 4
      glm/detail/type_mat4x3.hpp
  8. 4
      glm/detail/type_mat4x4.hpp
  9. 8
      glm/detail/type_vec1.hpp
  10. 5
      glm/detail/type_vec2.hpp
  11. 5
      glm/detail/type_vec3.hpp
  12. 5
      glm/detail/type_vec4.hpp
  13. 5
      glm/gtc/quaternion.hpp
  14. 5
      glm/gtx/dual_quaternion.hpp
  15. 4
      glm/gtx/simd_mat4.hpp
  16. 5
      glm/gtx/simd_quat.hpp
  17. 5
      glm/gtx/simd_vec4.hpp
  18. 1
      readme.md

8
glm/detail/type_mat2x2.hpp
Unescape View File

@ -54,17 +54,19 @@ 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
# 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 = 2; static GLM_CONSTEXPR length_t columns = 2;
static GLM_CONSTEXPR length_t rows = 2; static GLM_CONSTEXPR length_t rows = 2;
static GLM_CONSTEXPR precision prec = P; static GLM_CONSTEXPR precision prec = P;
# else # else
static const length_t components = 2; static const length_t components = 2;
static const length_t cols = 2; static const length_t columns = 2;
static const length_t rows = 2; static const length_t rows = 2;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
private: private:
/// @cond DETAIL /// @cond DETAIL

4
glm/detail/type_mat2x3.hpp
Unescape View File

@ -50,6 +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
# 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;
@ -60,7 +61,8 @@ namespace glm
static const length_t cols = 3; static const length_t cols = 3;
static const length_t rows = 2; static const length_t rows = 2;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
private: private:
/// @cond DETAIL /// @cond DETAIL

2
glm/detail/type_mat2x4.hpp
Unescape View File

@ -50,6 +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
# 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;
@ -61,6 +62,7 @@ namespace glm
static const length_t rows = 2; static const length_t rows = 2;
static const precision prec = P; static const precision prec = P;
# endif # endif
# endif//GLM_META_PROG_HELPERS
private: private:
/// @cond DETAIL /// @cond DETAIL

4
glm/detail/type_mat3x2.hpp
Unescape View File

@ -50,6 +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
# 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;
@ -60,7 +61,8 @@ namespace glm
static const length_t cols = 2; static const length_t cols = 2;
static const length_t rows = 3; static const length_t rows = 3;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
private: private:
/// @cond DETAIL /// @cond DETAIL

4
glm/detail/type_mat3x4.hpp
Unescape View File

@ -50,6 +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
# 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;
@ -60,7 +61,8 @@ namespace glm
static const length_t cols = 4; static const length_t cols = 4;
static const length_t rows = 3; static const length_t rows = 3;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
private: private:
/// @cond DETAIL /// @cond DETAIL

4
glm/detail/type_mat4x2.hpp
Unescape View File

@ -50,6 +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
# 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;
@ -60,7 +61,8 @@ namespace glm
static const length_t cols = 2; static const length_t cols = 2;
static const length_t rows = 4; static const length_t rows = 4;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
private: private:
/// @cond DETAIL /// @cond DETAIL

4
glm/detail/type_mat4x3.hpp
Unescape View File

@ -50,6 +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
# 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;
@ -60,7 +61,8 @@ namespace glm
static const length_t cols = 3; static const length_t cols = 3;
static const length_t rows = 4; static const length_t rows = 4;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
private: private:
// Data // Data

4
glm/detail/type_mat4x4.hpp
Unescape View File

@ -49,6 +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
# 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;
@ -59,7 +60,8 @@ namespace glm
static const length_t cols = 4; static const length_t cols = 4;
static const length_t rows = 4; static const length_t rows = 4;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
template <typename U, precision Q> template <typename U, precision Q>
friend tvec4<U, Q> operator/(tmat4x4<U, Q> const & m, tvec4<U, Q> const & v); friend tvec4<U, Q> operator/(tmat4x4<U, Q> const & m, tvec4<U, Q> const & v);

8
glm/detail/type_vec1.hpp
Unescape View File

@ -54,13 +54,17 @@ namespace glm
typedef tvec1<T, P> type; typedef tvec1<T, P> type;
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
# 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 prec = P; static GLM_CONSTEXPR precision precision = P;
# else # else
static const length_t components = 1; static const length_t components = 1;
static const precision prec = P; static const precision precision = P;
# endif # endif
# endif//GLM_META_PROG_HELPERS
////////////////////////////////////// //////////////////////////////////////
// Data // Data

5
glm/detail/type_vec2.hpp
Unescape View File

@ -54,13 +54,16 @@ namespace glm
typedef tvec2<T, P> type; typedef tvec2<T, P> type;
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
# 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;
# else # else
static const length_t components = 2; static const length_t components = 2;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
////////////////////////////////////// //////////////////////////////////////
// Data // Data

5
glm/detail/type_vec3.hpp
Unescape View File

@ -54,13 +54,16 @@ namespace glm
typedef tvec3<T, P> type; typedef tvec3<T, P> type;
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
# 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;
# else # else
static const length_t components = 3; static const length_t components = 3;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
////////////////////////////////////// //////////////////////////////////////
// Data // Data

5
glm/detail/type_vec4.hpp
Unescape View File

@ -108,13 +108,16 @@ namespace detail
typedef tvec4<T, P> type; typedef tvec4<T, P> type;
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
# 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;
# else # else
static const length_t components = 4; static const length_t components = 4;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
////////////////////////////////////// //////////////////////////////////////
// Data // Data

5
glm/gtc/quaternion.hpp
Unescape View File

@ -64,13 +64,16 @@ 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
# 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;
# else # else
static const length_t components = 4; static const length_t components = 4;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
public: public:
T x, y, z, w; T x, y, z, w;

5
glm/gtx/dual_quaternion.hpp
Unescape View File

@ -63,13 +63,16 @@ 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
# 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;
# else # else
static const length_t components = 8; static const length_t components = 8;
static const precision prec = P; static const precision prec = P;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
public: public:
glm::tquat<T, P> real, dual; glm::tquat<T, P> real, dual;

4
glm/gtx/simd_mat4.hpp
Unescape View File

@ -71,6 +71,7 @@ namespace detail
typedef fmat4x4SIMD type; typedef fmat4x4SIMD type;
typedef fmat4x4SIMD transpose_type; typedef fmat4x4SIMD transpose_type;
# if 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;
@ -81,7 +82,8 @@ namespace detail
static const length_t cols = 4; static const length_t cols = 4;
static const length_t rows = 4; static const length_t rows = 4;
static const precision prec = defaultp; static const precision prec = defaultp;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
GLM_FUNC_DECL length_t length() const; GLM_FUNC_DECL length_t length() const;

5
glm/gtx/simd_quat.hpp
Unescape View File

@ -75,13 +75,16 @@ 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
# 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;
# else # else
static const length_t components = 4; static const length_t components = 4;
static const precision prec = defaultp; static const precision prec = defaultp;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
#ifdef GLM_SIMD_ENABLE_XYZW_UNION #ifdef GLM_SIMD_ENABLE_XYZW_UNION
union union

5
glm/gtx/simd_vec4.hpp
Unescape View File

@ -98,13 +98,16 @@ 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
# 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;
# else # else
static const length_t components = 4; static const length_t components = 4;
static const precision prec = defaultp; static const precision prec = defaultp;
# endif # endif//GLM_HAS_CONSTEXPR
# endif//GLM_META_PROG_HELPERS
#ifdef GLM_SIMD_ENABLE_XYZW_UNION #ifdef GLM_SIMD_ENABLE_XYZW_UNION
union union

1
readme.md
Unescape View File

@ -58,6 +58,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Added functions eulerAngleXYZ and extractEulerAngleXYZ #311 - Added functions eulerAngleXYZ and extractEulerAngleXYZ #311
- Added <glm/gtx/hash.hpp> to perform std::hash on GLM types #320 - Added <glm/gtx/hash.hpp> to perform std::hash on GLM types #320
- Added <glm/gtx/wrap.hpp> for texcoord wrapping - Added <glm/gtx/wrap.hpp> for texcoord wrapping
- Added static components and precision members to all vector and quat types #350
##### Improvements: ##### Improvements:
- Changed usage of __has_include to support Intel compiler #307 - Changed usage of __has_include to support Intel compiler #307

Write Preview
Loading…
Cancel
Save