diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index ffed21a6..f3e5c46d 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -1,7 +1,6 @@ /// @ref core -/// @file glm/detail/func_integer.inl -#include "../ext/vec1.hpp" +#include "type_vec1.hpp" #include "type_vec2.hpp" #include "type_vec3.hpp" #include "type_vec4.hpp" diff --git a/glm/detail/glm.cpp b/glm/detail/glm.cpp index baaf8480..14020335 100644 --- a/glm/detail/glm.cpp +++ b/glm/detail/glm.cpp @@ -4,7 +4,7 @@ #define GLM_FORCE_MESSAGES #define GLM_ENABLE_EXPERIMENTAL #include -#include +#include #include #include diff --git a/glm/detail/qualifier.hpp b/glm/detail/qualifier.hpp index 8248cd0b..41c9fe18 100644 --- a/glm/detail/qualifier.hpp +++ b/glm/detail/qualifier.hpp @@ -40,6 +40,23 @@ namespace glm template struct mat; template struct qua; +# if GLM_HAS_TEMPLATE_ALIASES + template using tvec1 = vec<1, T, Q>; + template using tvec2 = vec<2, T, Q>; + template using tvec3 = vec<3, T, Q>; + template using tvec4 = vec<4, T, Q>; + template using tmat2x2 = mat<2, 2, T, Q>; + template using tmat2x3 = mat<2, 3, T, Q>; + template using tmat2x4 = mat<2, 4, T, Q>; + template using tmat3x2 = mat<3, 2, T, Q>; + template using tmat3x3 = mat<3, 3, T, Q>; + template using tmat3x4 = mat<3, 4, T, Q>; + template using tmat4x2 = mat<4, 2, T, Q>; + template using tmat4x3 = mat<4, 3, T, Q>; + template using tmat4x4 = mat<4, 4, T, Q>; + template using tquat = qua; +# endif + namespace detail { template diff --git a/glm/ext.hpp b/glm/ext.hpp index 5676b7cb..8b669822 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -13,7 +13,6 @@ # pragma message("GLM: All extensions included (not recommended)") #endif//GLM_MESSAGES -#include "./ext/vec1.hpp" #include "./ext/vector_relational.hpp" #include "./gtc/bitfield.hpp" diff --git a/glm/ext/matrix_dmat2x2.hpp b/glm/ext/matrix_double2x2.hpp similarity index 96% rename from glm/ext/matrix_dmat2x2.hpp rename to glm/ext/matrix_double2x2.hpp index 9d744c9e..9955d589 100644 --- a/glm/ext/matrix_dmat2x2.hpp +++ b/glm/ext/matrix_double2x2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/dmat2x2.hpp +/// @file glm/ext/matrix_double2x2.hpp #pragma once #include "../detail/type_mat2x2.hpp" diff --git a/glm/ext/matrix_dmat2x2_precision.hpp b/glm/ext/matrix_double2x2_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat2x2_precision.hpp rename to glm/ext/matrix_double2x2_precision.hpp diff --git a/glm/ext/matrix_dmat2x3.hpp b/glm/ext/matrix_double2x3.hpp similarity index 94% rename from glm/ext/matrix_dmat2x3.hpp rename to glm/ext/matrix_double2x3.hpp index 2af3a259..eff5231f 100644 --- a/glm/ext/matrix_dmat2x3.hpp +++ b/glm/ext/matrix_double2x3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat2x3.hpp +/// @file glm/ext/matrix_double2x3.hpp #pragma once #include "../detail/type_mat2x3.hpp" diff --git a/glm/ext/matrix_dmat2x3_precision.hpp b/glm/ext/matrix_double2x3_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat2x3_precision.hpp rename to glm/ext/matrix_double2x3_precision.hpp diff --git a/glm/ext/matrix_dmat2x4.hpp b/glm/ext/matrix_double2x4.hpp similarity index 94% rename from glm/ext/matrix_dmat2x4.hpp rename to glm/ext/matrix_double2x4.hpp index 235ca8ce..010ceb8c 100644 --- a/glm/ext/matrix_dmat2x4.hpp +++ b/glm/ext/matrix_double2x4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat2x4.hpp +/// @file glm/ext/matrix_double2x4.hpp #pragma once #include "../detail/type_mat2x4.hpp" diff --git a/glm/ext/matrix_dmat2x4_precision.hpp b/glm/ext/matrix_double2x4_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat2x4_precision.hpp rename to glm/ext/matrix_double2x4_precision.hpp diff --git a/glm/ext/matrix_dmat3x2.hpp b/glm/ext/matrix_double3x2.hpp similarity index 94% rename from glm/ext/matrix_dmat3x2.hpp rename to glm/ext/matrix_double3x2.hpp index fed02e30..08cd78fa 100644 --- a/glm/ext/matrix_dmat3x2.hpp +++ b/glm/ext/matrix_double3x2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat3x2.hpp +/// @file glm/ext/matrix_double3x2.hpp #pragma once #include "../detail/type_mat3x2.hpp" diff --git a/glm/ext/matrix_dmat3x2_precision.hpp b/glm/ext/matrix_double3x2_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat3x2_precision.hpp rename to glm/ext/matrix_double3x2_precision.hpp diff --git a/glm/ext/matrix_dmat3x3.hpp b/glm/ext/matrix_double3x3.hpp similarity index 96% rename from glm/ext/matrix_dmat3x3.hpp rename to glm/ext/matrix_double3x3.hpp index c7aa5316..d85d1289 100644 --- a/glm/ext/matrix_dmat3x3.hpp +++ b/glm/ext/matrix_double3x3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat3x3.hpp +/// @file glm/ext/matrix_double3x3.hpp #pragma once #include "../detail/type_mat3x3.hpp" diff --git a/glm/ext/matrix_dmat3x3_precision.hpp b/glm/ext/matrix_double3x3_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat3x3_precision.hpp rename to glm/ext/matrix_double3x3_precision.hpp diff --git a/glm/ext/matrix_dmat3x4.hpp b/glm/ext/matrix_double3x4.hpp similarity index 94% rename from glm/ext/matrix_dmat3x4.hpp rename to glm/ext/matrix_double3x4.hpp index 96f7b197..7d58bd6d 100644 --- a/glm/ext/matrix_dmat3x4.hpp +++ b/glm/ext/matrix_double3x4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat3x4.hpp +/// @file glm/ext/matrix_double3x4.hpp #pragma once #include "../detail/type_mat3x4.hpp" diff --git a/glm/ext/matrix_dmat3x4_precision.hpp b/glm/ext/matrix_double3x4_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat3x4_precision.hpp rename to glm/ext/matrix_double3x4_precision.hpp diff --git a/glm/ext/matrix_dmat4x2.hpp b/glm/ext/matrix_double4x2.hpp similarity index 94% rename from glm/ext/matrix_dmat4x2.hpp rename to glm/ext/matrix_double4x2.hpp index e0d4505b..f75f5902 100644 --- a/glm/ext/matrix_dmat4x2.hpp +++ b/glm/ext/matrix_double4x2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat4x2.hpp +/// @file glm/ext/matrix_double4x2.hpp #pragma once #include "../detail/type_mat4x2.hpp" diff --git a/glm/ext/matrix_dmat4x2_precision.hpp b/glm/ext/matrix_double4x2_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat4x2_precision.hpp rename to glm/ext/matrix_double4x2_precision.hpp diff --git a/glm/ext/matrix_dmat4x3.hpp b/glm/ext/matrix_double4x3.hpp similarity index 94% rename from glm/ext/matrix_dmat4x3.hpp rename to glm/ext/matrix_double4x3.hpp index 041f7ff2..45dd0e27 100644 --- a/glm/ext/matrix_dmat4x3.hpp +++ b/glm/ext/matrix_double4x3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat4x3.hpp +/// @file glm/ext/matrix_double4x3.hpp #pragma once #include "../detail/type_mat4x3.hpp" diff --git a/glm/ext/matrix_dmat4x3_precision.hpp b/glm/ext/matrix_double4x3_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat4x3_precision.hpp rename to glm/ext/matrix_double4x3_precision.hpp diff --git a/glm/ext/matrix_dmat4x4.hpp b/glm/ext/matrix_double4x4.hpp similarity index 96% rename from glm/ext/matrix_dmat4x4.hpp rename to glm/ext/matrix_double4x4.hpp index 8eaf7fa6..1557e927 100644 --- a/glm/ext/matrix_dmat4x4.hpp +++ b/glm/ext/matrix_double4x4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_dmat4x4.hpp +/// @file glm/ext/matrix_double4x4.hpp #pragma once #include "../detail/type_mat4x4.hpp" diff --git a/glm/ext/matrix_dmat4x4_precision.hpp b/glm/ext/matrix_double4x4_precision.hpp similarity index 100% rename from glm/ext/matrix_dmat4x4_precision.hpp rename to glm/ext/matrix_double4x4_precision.hpp diff --git a/glm/ext/matrix_mat2x2.hpp b/glm/ext/matrix_float2x2.hpp similarity index 96% rename from glm/ext/matrix_mat2x2.hpp rename to glm/ext/matrix_float2x2.hpp index 54c0d99f..6005afe2 100644 --- a/glm/ext/matrix_mat2x2.hpp +++ b/glm/ext/matrix_float2x2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat2x2.hpp +/// @file glm/ext/matrix_float2x2.hpp #pragma once #include "../detail/type_mat2x2.hpp" diff --git a/glm/ext/matrix_mat2x2_precision.hpp b/glm/ext/matrix_float2x2_precision.hpp similarity index 100% rename from glm/ext/matrix_mat2x2_precision.hpp rename to glm/ext/matrix_float2x2_precision.hpp diff --git a/glm/ext/matrix_mat2x3.hpp b/glm/ext/matrix_float2x3.hpp similarity index 94% rename from glm/ext/matrix_mat2x3.hpp rename to glm/ext/matrix_float2x3.hpp index 3d8331d2..9665abd7 100644 --- a/glm/ext/matrix_mat2x3.hpp +++ b/glm/ext/matrix_float2x3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat2x3.hpp +/// @file glm/ext/matrix_float2x3.hpp #pragma once #include "../detail/type_mat2x3.hpp" diff --git a/glm/ext/matrix_mat2x3_precision.hpp b/glm/ext/matrix_float2x3_precision.hpp similarity index 100% rename from glm/ext/matrix_mat2x3_precision.hpp rename to glm/ext/matrix_float2x3_precision.hpp diff --git a/glm/ext/matrix_mat2x4.hpp b/glm/ext/matrix_float2x4.hpp similarity index 94% rename from glm/ext/matrix_mat2x4.hpp rename to glm/ext/matrix_float2x4.hpp index 2adb3057..f298bb8d 100644 --- a/glm/ext/matrix_mat2x4.hpp +++ b/glm/ext/matrix_float2x4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat2x4.hpp +/// @file glm/ext/matrix_float2x4.hpp #pragma once #include "../detail/type_mat2x4.hpp" diff --git a/glm/ext/matrix_mat2x4_precision.hpp b/glm/ext/matrix_float2x4_precision.hpp similarity index 100% rename from glm/ext/matrix_mat2x4_precision.hpp rename to glm/ext/matrix_float2x4_precision.hpp diff --git a/glm/ext/matrix_mat3x2.hpp b/glm/ext/matrix_float3x2.hpp similarity index 94% rename from glm/ext/matrix_mat3x2.hpp rename to glm/ext/matrix_float3x2.hpp index 179cba90..5263e9a6 100644 --- a/glm/ext/matrix_mat3x2.hpp +++ b/glm/ext/matrix_float3x2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat3x2.hpp +/// @file glm/ext/matrix_float3x2.hpp #pragma once #include "../detail/type_mat3x2.hpp" diff --git a/glm/ext/matrix_mat3x2_precision.hpp b/glm/ext/matrix_float3x2_precision.hpp similarity index 100% rename from glm/ext/matrix_mat3x2_precision.hpp rename to glm/ext/matrix_float3x2_precision.hpp diff --git a/glm/ext/matrix_mat3x3.hpp b/glm/ext/matrix_float3x3.hpp similarity index 96% rename from glm/ext/matrix_mat3x3.hpp rename to glm/ext/matrix_float3x3.hpp index 9758fa04..6ae32939 100644 --- a/glm/ext/matrix_mat3x3.hpp +++ b/glm/ext/matrix_float3x3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat3x3.hpp +/// @file glm/ext/matrix_float3x3.hpp #pragma once #include "../detail/type_mat3x3.hpp" diff --git a/glm/ext/matrix_mat3x3_precision.hpp b/glm/ext/matrix_float3x3_precision.hpp similarity index 100% rename from glm/ext/matrix_mat3x3_precision.hpp rename to glm/ext/matrix_float3x3_precision.hpp diff --git a/glm/ext/matrix_mat3x4.hpp b/glm/ext/matrix_float3x4.hpp similarity index 94% rename from glm/ext/matrix_mat3x4.hpp rename to glm/ext/matrix_float3x4.hpp index ce3a2f89..802efa23 100644 --- a/glm/ext/matrix_mat3x4.hpp +++ b/glm/ext/matrix_float3x4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat3x4.hpp +/// @file glm/ext/matrix_float3x4.hpp #pragma once #include "../detail/type_mat3x4.hpp" diff --git a/glm/ext/matrix_mat3x4_precision.hpp b/glm/ext/matrix_float3x4_precision.hpp similarity index 100% rename from glm/ext/matrix_mat3x4_precision.hpp rename to glm/ext/matrix_float3x4_precision.hpp diff --git a/glm/ext/matrix_mat4x2.hpp b/glm/ext/matrix_float4x2.hpp similarity index 94% rename from glm/ext/matrix_mat4x2.hpp rename to glm/ext/matrix_float4x2.hpp index 62b5de38..6a06f349 100644 --- a/glm/ext/matrix_mat4x2.hpp +++ b/glm/ext/matrix_float4x2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat4x2.hpp +/// @file glm/ext/matrix_float4x2.hpp #pragma once #include "../detail/type_mat4x2.hpp" diff --git a/glm/ext/matrix_mat4x2_precision.hpp b/glm/ext/matrix_float4x2_precision.hpp similarity index 100% rename from glm/ext/matrix_mat4x2_precision.hpp rename to glm/ext/matrix_float4x2_precision.hpp diff --git a/glm/ext/matrix_mat4x3.hpp b/glm/ext/matrix_float4x3.hpp similarity index 94% rename from glm/ext/matrix_mat4x3.hpp rename to glm/ext/matrix_float4x3.hpp index 8879f6f2..a0550fb2 100644 --- a/glm/ext/matrix_mat4x3.hpp +++ b/glm/ext/matrix_float4x3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat4x3.hpp +/// @file glm/ext/matrix_float4x3.hpp #pragma once #include "../detail/type_mat4x3.hpp" diff --git a/glm/ext/matrix_mat4x3_precision.hpp b/glm/ext/matrix_float4x3_precision.hpp similarity index 100% rename from glm/ext/matrix_mat4x3_precision.hpp rename to glm/ext/matrix_float4x3_precision.hpp diff --git a/glm/ext/matrix_mat4x4.hpp b/glm/ext/matrix_float4x4.hpp similarity index 96% rename from glm/ext/matrix_mat4x4.hpp rename to glm/ext/matrix_float4x4.hpp index f2d6287b..8c46f69f 100644 --- a/glm/ext/matrix_mat4x4.hpp +++ b/glm/ext/matrix_float4x4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/matrix_mat4x4.hpp +/// @file glm/ext/matrix_float4x4.hpp #pragma once #include "../detail/type_mat4x4.hpp" diff --git a/glm/ext/matrix_mat4x4_precision.hpp b/glm/ext/matrix_float4x4_precision.hpp similarity index 100% rename from glm/ext/matrix_mat4x4_precision.hpp rename to glm/ext/matrix_float4x4_precision.hpp diff --git a/glm/ext/vec1.hpp b/glm/ext/vec1.hpp deleted file mode 100644 index bd77f1a0..00000000 --- a/glm/ext/vec1.hpp +++ /dev/null @@ -1,21 +0,0 @@ -/// @ref core -/// @file glm/vec1.hpp - -#pragma once -#include "vector_bvec1.hpp" -#include "vector_bvec1_precision.hpp" -#include "vector_vec1.hpp" -#include "vector_vec1_precision.hpp" -#include "vector_dvec1.hpp" -#include "vector_dvec1_precision.hpp" -#include "vector_ivec1.hpp" -#include "vector_ivec1_precision.hpp" -#include "vector_uvec1.hpp" -#include "vector_uvec1_precision.hpp" - -namespace glm -{ -# if GLM_HAS_TEMPLATE_ALIASES - template using tvec1 = vec<1, T, Q>; -# endif -}//namespace glm diff --git a/glm/ext/vector_bvec1.hpp b/glm/ext/vector_bool1.hpp similarity index 89% rename from glm/ext/vector_bvec1.hpp rename to glm/ext/vector_bool1.hpp index c2a24839..69e39c5d 100644 --- a/glm/ext/vector_bvec1.hpp +++ b/glm/ext/vector_bool1.hpp @@ -1,9 +1,9 @@ /// @ref ext_vector_bvec1 -/// @file glm/ext/vector_bvec1.hpp +/// @file glm/ext/vector_bool1.hpp /// /// @see core (dependence) /// -/// @defgroup ext_vector_bvec1 GLM_EXT_vector_bvec1 +/// @defgroup ext_vector_bool1 GLM_EXT_vector_bool1 /// @ingroup ext /// /// Include to use the features of this extension. diff --git a/glm/ext/vector_bvec1_precision.hpp b/glm/ext/vector_bool1_precision.hpp similarity index 100% rename from glm/ext/vector_bvec1_precision.hpp rename to glm/ext/vector_bool1_precision.hpp diff --git a/glm/ext/vector_bvec2.hpp b/glm/ext/vector_bool2.hpp similarity index 94% rename from glm/ext/vector_bvec2.hpp rename to glm/ext/vector_bool2.hpp index 2b37263b..4c77e669 100644 --- a/glm/ext/vector_bvec2.hpp +++ b/glm/ext/vector_bool2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/bvec2.hpp +/// @file glm/ext/vector_bool2.hpp #pragma once #include "../detail/type_vec2.hpp" diff --git a/glm/ext/vector_bvec2_precision.hpp b/glm/ext/vector_bool2_precision.hpp similarity index 100% rename from glm/ext/vector_bvec2_precision.hpp rename to glm/ext/vector_bool2_precision.hpp diff --git a/glm/ext/vector_bvec3.hpp b/glm/ext/vector_bool3.hpp similarity index 94% rename from glm/ext/vector_bvec3.hpp rename to glm/ext/vector_bool3.hpp index 87e6d71b..6d6e1460 100644 --- a/glm/ext/vector_bvec3.hpp +++ b/glm/ext/vector_bool3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/bvec3.hpp +/// @file glm/ext/vector_bool3.hpp #pragma once #include "../detail/type_vec3.hpp" diff --git a/glm/ext/vector_bvec3_precision.hpp b/glm/ext/vector_bool3_precision.hpp similarity index 100% rename from glm/ext/vector_bvec3_precision.hpp rename to glm/ext/vector_bool3_precision.hpp diff --git a/glm/ext/vector_bvec4.hpp b/glm/ext/vector_bool4.hpp similarity index 94% rename from glm/ext/vector_bvec4.hpp rename to glm/ext/vector_bool4.hpp index 59c744c5..b5d8147a 100644 --- a/glm/ext/vector_bvec4.hpp +++ b/glm/ext/vector_bool4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/bvec4.hpp +/// @file glm/ext/vector_bool4.hpp #pragma once #include "../detail/type_vec4.hpp" diff --git a/glm/ext/vector_bvec4_precision.hpp b/glm/ext/vector_bool4_precision.hpp similarity index 100% rename from glm/ext/vector_bvec4_precision.hpp rename to glm/ext/vector_bool4_precision.hpp diff --git a/glm/ext/vector_dvec1.hpp b/glm/ext/vector_double1.hpp similarity index 78% rename from glm/ext/vector_dvec1.hpp rename to glm/ext/vector_double1.hpp index 400625fb..343d82e8 100644 --- a/glm/ext/vector_dvec1.hpp +++ b/glm/ext/vector_double1.hpp @@ -1,12 +1,12 @@ -/// @ref ext_vector_dvec1 -/// @file glm/ext/vector_dvec1.hpp +/// @ref ext_vector_double1 +/// @file glm/ext/vector_double1.hpp /// /// @see core (dependence) /// -/// @defgroup ext_vector_dvec1 GLM_EXT_vector_dvec1 +/// @defgroup ext_vector_dvec1 GLM_EXT_vector_double1 /// @ingroup ext /// -/// Include to use the features of this extension. +/// Include to use the features of this extension. /// /// Expose dvec1 vector type. diff --git a/glm/ext/vector_dvec1_precision.hpp b/glm/ext/vector_double1_precision.hpp similarity index 100% rename from glm/ext/vector_dvec1_precision.hpp rename to glm/ext/vector_double1_precision.hpp diff --git a/glm/ext/vector_dvec2.hpp b/glm/ext/vector_double2.hpp similarity index 94% rename from glm/ext/vector_dvec2.hpp rename to glm/ext/vector_double2.hpp index dfa71b56..1ec88fbe 100644 --- a/glm/ext/vector_dvec2.hpp +++ b/glm/ext/vector_double2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/dvec2.hpp +/// @file glm/ext/vector_double2.hpp #pragma once #include "../detail/type_vec2.hpp" diff --git a/glm/ext/vector_dvec2_precision.hpp b/glm/ext/vector_double2_precision.hpp similarity index 100% rename from glm/ext/vector_dvec2_precision.hpp rename to glm/ext/vector_double2_precision.hpp diff --git a/glm/ext/vector_dvec3.hpp b/glm/ext/vector_double3.hpp similarity index 94% rename from glm/ext/vector_dvec3.hpp rename to glm/ext/vector_double3.hpp index 5b33137b..03717689 100644 --- a/glm/ext/vector_dvec3.hpp +++ b/glm/ext/vector_double3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/dvec3.hpp +/// @file glm/ext/vector_double3.hpp #pragma once #include "../detail/type_vec3.hpp" diff --git a/glm/ext/vector_dvec3_precision.hpp b/glm/ext/vector_double3_precision.hpp similarity index 100% rename from glm/ext/vector_dvec3_precision.hpp rename to glm/ext/vector_double3_precision.hpp diff --git a/glm/ext/vector_dvec4.hpp b/glm/ext/vector_double4.hpp similarity index 94% rename from glm/ext/vector_dvec4.hpp rename to glm/ext/vector_double4.hpp index fed6d070..53f4ae07 100644 --- a/glm/ext/vector_dvec4.hpp +++ b/glm/ext/vector_double4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/dvec4.hpp +/// @file glm/ext/vector_double4.hpp #pragma once #include "../detail/type_vec4.hpp" diff --git a/glm/ext/vector_dvec4_precision.hpp b/glm/ext/vector_double4_precision.hpp similarity index 100% rename from glm/ext/vector_dvec4_precision.hpp rename to glm/ext/vector_double4_precision.hpp diff --git a/glm/ext/vector_vec1.hpp b/glm/ext/vector_float1.hpp similarity index 100% rename from glm/ext/vector_vec1.hpp rename to glm/ext/vector_float1.hpp diff --git a/glm/ext/vector_vec1_precision.hpp b/glm/ext/vector_float1_precision.hpp similarity index 100% rename from glm/ext/vector_vec1_precision.hpp rename to glm/ext/vector_float1_precision.hpp diff --git a/glm/ext/vector_vec2.hpp b/glm/ext/vector_float2.hpp similarity index 94% rename from glm/ext/vector_vec2.hpp rename to glm/ext/vector_float2.hpp index 8750ca3c..76a41f29 100644 --- a/glm/ext/vector_vec2.hpp +++ b/glm/ext/vector_float2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/ext/vector_vec2.hpp +/// @file glm/ext/vector_float2.hpp #pragma once #include "../detail/type_vec2.hpp" diff --git a/glm/ext/vector_vec2_precision.hpp b/glm/ext/vector_float2_precision.hpp similarity index 100% rename from glm/ext/vector_vec2_precision.hpp rename to glm/ext/vector_float2_precision.hpp diff --git a/glm/ext/vector_vec3.hpp b/glm/ext/vector_float3.hpp similarity index 94% rename from glm/ext/vector_vec3.hpp rename to glm/ext/vector_float3.hpp index 0a6e66b8..5fa15052 100644 --- a/glm/ext/vector_vec3.hpp +++ b/glm/ext/vector_float3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/fvec3.hpp +/// @file glm/ext/vector_float3.hpp #pragma once #include "../detail/type_vec3.hpp" diff --git a/glm/ext/vector_vec3_precision.hpp b/glm/ext/vector_float3_precision.hpp similarity index 100% rename from glm/ext/vector_vec3_precision.hpp rename to glm/ext/vector_float3_precision.hpp diff --git a/glm/ext/vector_vec4.hpp b/glm/ext/vector_float4.hpp similarity index 94% rename from glm/ext/vector_vec4.hpp rename to glm/ext/vector_float4.hpp index 70d6becd..c03d5a7b 100644 --- a/glm/ext/vector_vec4.hpp +++ b/glm/ext/vector_float4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/fvec4.hpp +/// @file glm/ext/vector_float4.hpp #pragma once #include "../detail/type_vec4.hpp" diff --git a/glm/ext/vector_vec4_precision.hpp b/glm/ext/vector_float4_precision.hpp similarity index 100% rename from glm/ext/vector_vec4_precision.hpp rename to glm/ext/vector_float4_precision.hpp diff --git a/glm/ext/vector_ivec1.hpp b/glm/ext/vector_int1.hpp similarity index 100% rename from glm/ext/vector_ivec1.hpp rename to glm/ext/vector_int1.hpp diff --git a/glm/ext/vector_ivec1_precision.hpp b/glm/ext/vector_int1_precision.hpp similarity index 100% rename from glm/ext/vector_ivec1_precision.hpp rename to glm/ext/vector_int1_precision.hpp diff --git a/glm/ext/vector_ivec2.hpp b/glm/ext/vector_int2.hpp similarity index 94% rename from glm/ext/vector_ivec2.hpp rename to glm/ext/vector_int2.hpp index 30c7c2fa..2483bb33 100644 --- a/glm/ext/vector_ivec2.hpp +++ b/glm/ext/vector_int2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/ivec2.hpp +/// @file glm/ext/vector_int2.hpp #pragma once #include "../detail/type_vec2.hpp" diff --git a/glm/ext/vector_ivec2_precision.hpp b/glm/ext/vector_int2_precision.hpp similarity index 100% rename from glm/ext/vector_ivec2_precision.hpp rename to glm/ext/vector_int2_precision.hpp diff --git a/glm/ext/vector_ivec3.hpp b/glm/ext/vector_int3.hpp similarity index 94% rename from glm/ext/vector_ivec3.hpp rename to glm/ext/vector_int3.hpp index 2e2a484d..ccbb9fba 100644 --- a/glm/ext/vector_ivec3.hpp +++ b/glm/ext/vector_int3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/ivec3.hpp +/// @file glm/ext/vector_int3.hpp #pragma once #include "../detail/type_vec3.hpp" diff --git a/glm/ext/vector_ivec3_precision.hpp b/glm/ext/vector_int3_precision.hpp similarity index 100% rename from glm/ext/vector_ivec3_precision.hpp rename to glm/ext/vector_int3_precision.hpp diff --git a/glm/ext/vector_ivec4.hpp b/glm/ext/vector_int4.hpp similarity index 94% rename from glm/ext/vector_ivec4.hpp rename to glm/ext/vector_int4.hpp index 6c54710d..dd9fc77c 100644 --- a/glm/ext/vector_ivec4.hpp +++ b/glm/ext/vector_int4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/ivec4.hpp +/// @file glm/ext/vector_int4.hpp #pragma once #include "../detail/type_vec4.hpp" diff --git a/glm/ext/vector_ivec4_precision.hpp b/glm/ext/vector_int4_precision.hpp similarity index 100% rename from glm/ext/vector_ivec4_precision.hpp rename to glm/ext/vector_int4_precision.hpp diff --git a/glm/ext/vector_uvec1.hpp b/glm/ext/vector_uint1.hpp similarity index 96% rename from glm/ext/vector_uvec1.hpp rename to glm/ext/vector_uint1.hpp index 3e7c6a9c..bddd2c73 100644 --- a/glm/ext/vector_uvec1.hpp +++ b/glm/ext/vector_uint1.hpp @@ -1,5 +1,5 @@ /// @ref ext_vector_uvec1 -/// @file glm/ext/vector_uvec1.hpp +/// @file glm/ext/vector_uint1.hpp /// /// @see core (dependence) /// diff --git a/glm/ext/vector_uvec1_precision.hpp b/glm/ext/vector_uint1_precision.hpp similarity index 64% rename from glm/ext/vector_uvec1_precision.hpp rename to glm/ext/vector_uint1_precision.hpp index 8546119a..bfed430a 100644 --- a/glm/ext/vector_uvec1_precision.hpp +++ b/glm/ext/vector_uint1_precision.hpp @@ -1,12 +1,12 @@ -/// @ref ext_uvec1_precision -/// @file glm/ext/uvec1_precision.hpp +/// @ref ext_vector_uint1_precision +/// @file glm/ext/vector_uint1_precision.hpp /// /// @see core (dependence) /// -/// @defgroup ext_uvec1_precision GLM_EXT_uvec1_precision +/// @defgroup ext_vector_uint1_precision GLM_EXT_vector_uint1_precision /// @ingroup ext /// -/// Include to use the features of this extension. +/// Include to use the features of this extension. /// /// Add Exposes highp_uvec1, mediump_uvec1 and lowp_uvec1 types. @@ -15,12 +15,12 @@ #include "../detail/type_vec1.hpp" #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_EXT_uvec1_precision extension included") +# pragma message("GLM: GLM_EXT_vector_uint1_precision extension included") #endif namespace glm { - /// @addtogroup ext_uvec1_precision + /// @addtogroup ext_vector_uint1_precision /// @{ /// 1 component vector of unsigned integer values. diff --git a/glm/ext/vector_uvec2.hpp b/glm/ext/vector_uint2.hpp similarity index 94% rename from glm/ext/vector_uvec2.hpp rename to glm/ext/vector_uint2.hpp index be983210..85b8724c 100644 --- a/glm/ext/vector_uvec2.hpp +++ b/glm/ext/vector_uint2.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/uvec2.hpp +/// @file glm/ext/vector_uint2.hpp #pragma once #include "../detail/type_vec2.hpp" diff --git a/glm/ext/vector_uvec2_precision.hpp b/glm/ext/vector_uint2_precision.hpp similarity index 96% rename from glm/ext/vector_uvec2_precision.hpp rename to glm/ext/vector_uint2_precision.hpp index 7299df86..a36e4b19 100644 --- a/glm/ext/vector_uvec2_precision.hpp +++ b/glm/ext/vector_uint2_precision.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/uvec2_precision.hpp +/// @file glm/ext/vector_uint2_precision.hpp #pragma once #include "../detail/type_vec2.hpp" diff --git a/glm/ext/vector_uvec3.hpp b/glm/ext/vector_uint3.hpp similarity index 94% rename from glm/ext/vector_uvec3.hpp rename to glm/ext/vector_uint3.hpp index 47b6ab34..f800c5cc 100644 --- a/glm/ext/vector_uvec3.hpp +++ b/glm/ext/vector_uint3.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/uvec3.hpp +/// @file glm/ext/vector_uint3.hpp #pragma once #include "../detail/type_vec3.hpp" diff --git a/glm/ext/vector_uvec3_precision.hpp b/glm/ext/vector_uint3_precision.hpp similarity index 96% rename from glm/ext/vector_uvec3_precision.hpp rename to glm/ext/vector_uint3_precision.hpp index 6324530b..1efc5fd6 100644 --- a/glm/ext/vector_uvec3_precision.hpp +++ b/glm/ext/vector_uint3_precision.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/uvec3_precision.hpp +/// @file glm/ext/vector_uint3_precision.hpp #pragma once #include "../detail/setup.hpp" diff --git a/glm/ext/vector_uvec4.hpp b/glm/ext/vector_uint4.hpp similarity index 94% rename from glm/ext/vector_uvec4.hpp rename to glm/ext/vector_uint4.hpp index 90fbc16c..ae1e3c9e 100644 --- a/glm/ext/vector_uvec4.hpp +++ b/glm/ext/vector_uint4.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/uvec4.hpp +/// @file glm/ext/vector_uint4.hpp #pragma once #include "../detail/type_vec4.hpp" diff --git a/glm/ext/vector_uvec4_precision.hpp b/glm/ext/vector_uint4_precision.hpp similarity index 96% rename from glm/ext/vector_uvec4_precision.hpp rename to glm/ext/vector_uint4_precision.hpp index 454a424c..7548b4a9 100644 --- a/glm/ext/vector_uvec4_precision.hpp +++ b/glm/ext/vector_uint4_precision.hpp @@ -1,5 +1,5 @@ /// @ref core -/// @file glm/uvec4_precision.hpp +/// @file glm/ext/vector_uint4_precision.hpp #pragma once #include "../detail/type_vec4.hpp" diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl index f7d2588a..38befa8e 100644 --- a/glm/gtc/random.inl +++ b/glm/gtc/random.inl @@ -3,7 +3,7 @@ #include "../geometric.hpp" #include "../exponential.hpp" #include "../trigonometric.hpp" -#include "../ext/vec1.hpp" +#include "../detail/type_vec1.hpp" #include #include #include diff --git a/glm/gtc/vec1.hpp b/glm/gtc/vec1.hpp index a5afafb3..c20be874 100644 --- a/glm/gtc/vec1.hpp +++ b/glm/gtc/vec1.hpp @@ -13,7 +13,16 @@ #pragma once // Dependency: -#include "../ext/vec1.hpp" +#include "../ext/vector_bool1.hpp" +#include "../ext/vector_bool1_precision.hpp" +#include "../ext/vector_float1.hpp" +#include "../ext/vector_float1_precision.hpp" +#include "../ext/vector_double1.hpp" +#include "../ext/vector_double1_precision.hpp" +#include "../ext/vector_int1.hpp" +#include "../ext/vector_int1_precision.hpp" +#include "../ext/vector_uint1.hpp" +#include "../ext/vector_uint1_precision.hpp" #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_vec1 extension included") diff --git a/glm/mat2x2.hpp b/glm/mat2x2.hpp index 9d7e1a78..96bec96b 100644 --- a/glm/mat2x2.hpp +++ b/glm/mat2x2.hpp @@ -2,15 +2,8 @@ /// @file glm/mat2x2.hpp #pragma once -#include "./ext/matrix_dmat2x2.hpp" -#include "./ext/matrix_dmat2x2_precision.hpp" -#include "./ext/matrix_mat2x2.hpp" -#include "./ext/matrix_mat2x2_precision.hpp" +#include "./ext/matrix_double2x2.hpp" +#include "./ext/matrix_double2x2_precision.hpp" +#include "./ext/matrix_float2x2.hpp" +#include "./ext/matrix_float2x2_precision.hpp" -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat2x2 = mat<2, 2, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm diff --git a/glm/mat2x3.hpp b/glm/mat2x3.hpp index 258f45bc..d68dc25e 100644 --- a/glm/mat2x3.hpp +++ b/glm/mat2x3.hpp @@ -2,15 +2,8 @@ /// @file glm/mat2x3.hpp #pragma once -#include "./ext/matrix_dmat2x3.hpp" -#include "./ext/matrix_dmat2x3_precision.hpp" -#include "./ext/matrix_mat2x3.hpp" -#include "./ext/matrix_mat2x3_precision.hpp" +#include "./ext/matrix_double2x3.hpp" +#include "./ext/matrix_double2x3_precision.hpp" +#include "./ext/matrix_float2x3.hpp" +#include "./ext/matrix_float2x3_precision.hpp" -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat2x3 = mat<2, 3, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm diff --git a/glm/mat2x4.hpp b/glm/mat2x4.hpp index 559fece9..b04b7387 100644 --- a/glm/mat2x4.hpp +++ b/glm/mat2x4.hpp @@ -2,15 +2,8 @@ /// @file glm/mat2x4.hpp #pragma once -#include "./ext/matrix_dmat2x4.hpp" -#include "./ext/matrix_dmat2x4_precision.hpp" -#include "./ext/matrix_mat2x4.hpp" -#include "./ext/matrix_mat2x4_precision.hpp" +#include "./ext/matrix_double2x4.hpp" +#include "./ext/matrix_double2x4_precision.hpp" +#include "./ext/matrix_float2x4.hpp" +#include "./ext/matrix_float2x4_precision.hpp" -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat2x4 = mat<2, 4, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm diff --git a/glm/mat3x2.hpp b/glm/mat3x2.hpp index a376eee4..c8531537 100644 --- a/glm/mat3x2.hpp +++ b/glm/mat3x2.hpp @@ -2,15 +2,8 @@ /// @file glm/mat3x2.hpp #pragma once -#include "./ext/matrix_dmat3x2.hpp" -#include "./ext/matrix_dmat3x2_precision.hpp" -#include "./ext/matrix_mat3x2.hpp" -#include "./ext/matrix_mat3x2_precision.hpp" +#include "./ext/matrix_double3x2.hpp" +#include "./ext/matrix_double3x2_precision.hpp" +#include "./ext/matrix_float3x2.hpp" +#include "./ext/matrix_float3x2_precision.hpp" -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat3x2 = mat<3, 2, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm diff --git a/glm/mat3x3.hpp b/glm/mat3x3.hpp index 065dc132..fd4fa31c 100644 --- a/glm/mat3x3.hpp +++ b/glm/mat3x3.hpp @@ -2,15 +2,7 @@ /// @file glm/mat3x3.hpp #pragma once -#include "./ext/matrix_dmat3x3.hpp" -#include "./ext/matrix_dmat3x3_precision.hpp" -#include "./ext/matrix_mat3x3.hpp" -#include "./ext/matrix_mat3x3_precision.hpp" - -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat3x3 = mat<3, 3, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm +#include "./ext/matrix_double3x3.hpp" +#include "./ext/matrix_double3x3_precision.hpp" +#include "./ext/matrix_float3x3.hpp" +#include "./ext/matrix_float3x3_precision.hpp" diff --git a/glm/mat3x4.hpp b/glm/mat3x4.hpp index 0b55ae52..6342bf5b 100644 --- a/glm/mat3x4.hpp +++ b/glm/mat3x4.hpp @@ -2,15 +2,7 @@ /// @file glm/mat3x4.hpp #pragma once -#include "./ext/matrix_dmat3x4.hpp" -#include "./ext/matrix_dmat3x4_precision.hpp" -#include "./ext/matrix_mat3x4.hpp" -#include "./ext/matrix_mat3x4_precision.hpp" - -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat3x4 = mat<3, 4, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm +#include "./ext/matrix_double3x4.hpp" +#include "./ext/matrix_double3x4_precision.hpp" +#include "./ext/matrix_float3x4.hpp" +#include "./ext/matrix_float3x4_precision.hpp" diff --git a/glm/mat4x2.hpp b/glm/mat4x2.hpp index 77f2cf1f..e013e46b 100644 --- a/glm/mat4x2.hpp +++ b/glm/mat4x2.hpp @@ -2,15 +2,8 @@ /// @file glm/mat4x2.hpp #pragma once -#include "./ext/matrix_dmat4x2.hpp" -#include "./ext/matrix_dmat4x2_precision.hpp" -#include "./ext/matrix_mat4x2.hpp" -#include "./ext/matrix_mat4x2_precision.hpp" +#include "./ext/matrix_double4x2.hpp" +#include "./ext/matrix_double4x2_precision.hpp" +#include "./ext/matrix_float4x2.hpp" +#include "./ext/matrix_float4x2_precision.hpp" -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat4x2 = mat<4, 2, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm diff --git a/glm/mat4x3.hpp b/glm/mat4x3.hpp index adcfba4b..205725ab 100644 --- a/glm/mat4x3.hpp +++ b/glm/mat4x3.hpp @@ -2,15 +2,7 @@ /// @file glm/mat4x3.hpp #pragma once -#include "./ext/matrix_dmat4x3.hpp" -#include "./ext/matrix_dmat4x3_precision.hpp" -#include "./ext/matrix_mat4x3.hpp" -#include "./ext/matrix_mat4x3_precision.hpp" - -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat4x3 = mat<4, 3, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm +#include "./ext/matrix_double4x3.hpp" +#include "./ext/matrix_double4x3_precision.hpp" +#include "./ext/matrix_float4x3.hpp" +#include "./ext/matrix_float4x3_precision.hpp" diff --git a/glm/mat4x4.hpp b/glm/mat4x4.hpp index b0ab8c39..3515f7f3 100644 --- a/glm/mat4x4.hpp +++ b/glm/mat4x4.hpp @@ -2,15 +2,8 @@ /// @file glm/mat4x4.hpp #pragma once -#include "./ext/matrix_dmat4x4.hpp" -#include "./ext/matrix_dmat4x4_precision.hpp" -#include "./ext/matrix_mat4x4.hpp" -#include "./ext/matrix_mat4x4_precision.hpp" +#include "./ext/matrix_double4x4.hpp" +#include "./ext/matrix_double4x4_precision.hpp" +#include "./ext/matrix_float4x4.hpp" +#include "./ext/matrix_float4x4_precision.hpp" -namespace glm -{ -#if GLM_HAS_TEMPLATE_ALIASES - template using tmat4x4 = mat<4, 4, T, Q>; -#endif//GLM_HAS_TEMPLATE_ALIASES - -}//namespace glm diff --git a/glm/packing.hpp b/glm/packing.hpp index dc9ef4ae..a01a5837 100644 --- a/glm/packing.hpp +++ b/glm/packing.hpp @@ -13,9 +13,9 @@ #pragma once -#include "./ext/vector_uvec2.hpp" -#include "./ext/vector_vec2.hpp" -#include "./ext/vector_vec4.hpp" +#include "./ext/vector_uint2.hpp" +#include "./ext/vector_float2.hpp" +#include "./ext/vector_float4.hpp" namespace glm { diff --git a/glm/vec2.hpp b/glm/vec2.hpp index 44c4f9c2..be768bf5 100644 --- a/glm/vec2.hpp +++ b/glm/vec2.hpp @@ -2,20 +2,13 @@ /// @file glm/vec2.hpp #pragma once -#include "./ext/vector_bvec2.hpp" -#include "./ext/vector_bvec2_precision.hpp" -#include "./ext/vector_vec2.hpp" -#include "./ext/vector_vec2_precision.hpp" -#include "./ext/vector_dvec2.hpp" -#include "./ext/vector_dvec2_precision.hpp" -#include "./ext/vector_ivec2.hpp" -#include "./ext/vector_ivec2_precision.hpp" -#include "./ext/vector_uvec2.hpp" -#include "./ext/vector_uvec2_precision.hpp" - -namespace glm -{ -# if GLM_HAS_TEMPLATE_ALIASES - template using tvec2 = vec<2, T, Q>; -# endif -}//namespace glm +#include "./ext/vector_bool2.hpp" +#include "./ext/vector_bool2_precision.hpp" +#include "./ext/vector_float2.hpp" +#include "./ext/vector_float2_precision.hpp" +#include "./ext/vector_double2.hpp" +#include "./ext/vector_double2_precision.hpp" +#include "./ext/vector_int2.hpp" +#include "./ext/vector_int2_precision.hpp" +#include "./ext/vector_uint2.hpp" +#include "./ext/vector_uint2_precision.hpp" diff --git a/glm/vec3.hpp b/glm/vec3.hpp index a3e9dc33..f5707223 100644 --- a/glm/vec3.hpp +++ b/glm/vec3.hpp @@ -2,21 +2,13 @@ /// @file glm/vec3.hpp #pragma once -#include "./ext/vector_bvec3.hpp" -#include "./ext/vector_bvec3_precision.hpp" -#include "./ext/vector_vec3.hpp" -#include "./ext/vector_vec3_precision.hpp" -#include "./ext/vector_dvec3.hpp" -#include "./ext/vector_dvec3_precision.hpp" -#include "./ext/vector_ivec3.hpp" -#include "./ext/vector_ivec3_precision.hpp" -#include "./ext/vector_uvec3.hpp" -#include "./ext/vector_uvec3_precision.hpp" - -namespace glm -{ -# if GLM_HAS_TEMPLATE_ALIASES - template using tvec3 = vec<3, T, Q>; -# endif -}//namespace glm - +#include "./ext/vector_bool3.hpp" +#include "./ext/vector_bool3_precision.hpp" +#include "./ext/vector_float3.hpp" +#include "./ext/vector_float3_precision.hpp" +#include "./ext/vector_double3.hpp" +#include "./ext/vector_double3_precision.hpp" +#include "./ext/vector_int3.hpp" +#include "./ext/vector_int3_precision.hpp" +#include "./ext/vector_uint3.hpp" +#include "./ext/vector_uint3_precision.hpp" diff --git a/glm/vec4.hpp b/glm/vec4.hpp index 37dfd7e0..91170207 100644 --- a/glm/vec4.hpp +++ b/glm/vec4.hpp @@ -2,21 +2,14 @@ /// @file glm/vec4.hpp #pragma once -#include "./ext/vector_bvec4.hpp" -#include "./ext/vector_bvec4_precision.hpp" -#include "./ext/vector_vec4.hpp" -#include "./ext/vector_vec4_precision.hpp" -#include "./ext/vector_dvec4.hpp" -#include "./ext/vector_dvec4_precision.hpp" -#include "./ext/vector_ivec4.hpp" -#include "./ext/vector_ivec4_precision.hpp" -#include "./ext/vector_uvec4.hpp" -#include "./ext/vector_uvec4_precision.hpp" - -namespace glm -{ -# if GLM_HAS_TEMPLATE_ALIASES - template using tvec4 = vec<4, T, Q>; -# endif -}//namespace glm +#include "./ext/vector_bool4.hpp" +#include "./ext/vector_bool4_precision.hpp" +#include "./ext/vector_float4.hpp" +#include "./ext/vector_float4_precision.hpp" +#include "./ext/vector_double4.hpp" +#include "./ext/vector_double4_precision.hpp" +#include "./ext/vector_int4.hpp" +#include "./ext/vector_int4_precision.hpp" +#include "./ext/vector_uint4.hpp" +#include "./ext/vector_uint4_precision.hpp" diff --git a/test/core/core_cpp_constexpr.cpp b/test/core/core_cpp_constexpr.cpp index e7d9283a..2195a6f8 100644 --- a/test/core/core_cpp_constexpr.cpp +++ b/test/core/core_cpp_constexpr.cpp @@ -5,7 +5,9 @@ #include #include #include -#include +#include +#include +#include static int test_vec1() { diff --git a/test/core/core_cpp_defaulted_ctor.cpp b/test/core/core_cpp_defaulted_ctor.cpp index 57899032..07afd9cd 100644 --- a/test/core/core_cpp_defaulted_ctor.cpp +++ b/test/core/core_cpp_defaulted_ctor.cpp @@ -4,9 +4,9 @@ #include #include +#include #include #include -#include #include static int test_vec_memcpy() diff --git a/test/core/core_force_xyzw_only.cpp b/test/core/core_force_xyzw_only.cpp index 43576e0e..d19509de 100644 --- a/test/core/core_force_xyzw_only.cpp +++ b/test/core/core_force_xyzw_only.cpp @@ -1,8 +1,8 @@ #define GLM_FORCE_XYZW_ONLY #include +#include #include -#include #include #include #include diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp index f7212090..4eb2017b 100644 --- a/test/core/core_func_common.cpp +++ b/test/core/core_func_common.cpp @@ -1,9 +1,10 @@ #define GLM_FORCE_EXPLICIT_CTOR #include #include +#include #include #include -#include +#include #include #include #include diff --git a/test/core/core_func_exponential.cpp b/test/core/core_func_exponential.cpp index 6a49a976..ac49ac08 100644 --- a/test/core/core_func_exponential.cpp +++ b/test/core/core_func_exponential.cpp @@ -1,12 +1,12 @@ #include #include -#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include static int test_pow() { diff --git a/test/core/core_func_geometric.cpp b/test/core/core_func_geometric.cpp index 5780c800..7ef9c683 100644 --- a/test/core/core_func_geometric.cpp +++ b/test/core/core_func_geometric.cpp @@ -2,13 +2,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include namespace length diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index bbc38e9c..82cece0f 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -1,11 +1,13 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/test/core/core_type_vec1.cpp b/test/core/core_type_vec1.cpp index cef71749..77f3f84d 100644 --- a/test/core/core_type_vec1.cpp +++ b/test/core/core_type_vec1.cpp @@ -1,7 +1,7 @@ #define GLM_FORCE_SWIZZLE #include +#include #include -#include #include #include diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index 03456861..308c61f0 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -1,9 +1,10 @@ #define GLM_FORCE_SWIZZLE -#include +#include #include +#include +#include #include #include -#include #include #if GLM_HAS_TRIVIAL_QUERIES # include diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 50683022..a8774d0d 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -1,6 +1,6 @@ #define GLM_FORCE_SWIZZLE #include -#include +#include #include #include #include diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index e242948a..27e5f17e 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -1,7 +1,7 @@ #define GLM_FORCE_ALIGNED #define GLM_FORCE_SWIZZLE #include -#include +#include #include #include #include diff --git a/test/ext/ext_matrix_relational.cpp b/test/ext/ext_matrix_relational.cpp index 9846c267..7a169f9f 100644 --- a/test/ext/ext_matrix_relational.cpp +++ b/test/ext/ext_matrix_relational.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include int test_equal() { diff --git a/test/ext/ext_vec1.cpp b/test/ext/ext_vec1.cpp index 1da80a66..fc0b9318 100644 --- a/test/ext/ext_vec1.cpp +++ b/test/ext/ext_vec1.cpp @@ -1,6 +1,6 @@ #define GLM_FORCE_SWIZZLE #include -#include +#include #include static glm::vec1 g1; diff --git a/test/ext/ext_vector_bvec1.cpp b/test/ext/ext_vector_bvec1.cpp index e6251e10..43eed57b 100644 --- a/test/ext/ext_vector_bvec1.cpp +++ b/test/ext/ext_vector_bvec1.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include template static int test_operators() diff --git a/test/ext/ext_vector_dvec1.cpp b/test/ext/ext_vector_dvec1.cpp index de57e68f..8ddd1a25 100644 --- a/test/ext/ext_vector_dvec1.cpp +++ b/test/ext/ext_vector_dvec1.cpp @@ -1,11 +1,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include template static int test_operators() diff --git a/test/ext/ext_vector_ivec1.cpp b/test/ext/ext_vector_ivec1.cpp index 4af58a5d..b0d8f422 100644 --- a/test/ext/ext_vector_ivec1.cpp +++ b/test/ext/ext_vector_ivec1.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include template diff --git a/test/ext/ext_vector_uvec1.cpp b/test/ext/ext_vector_uvec1.cpp index b15d27b5..bd8e87f5 100644 --- a/test/ext/ext_vector_uvec1.cpp +++ b/test/ext/ext_vector_uvec1.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include template diff --git a/test/ext/ext_vector_vec1.cpp b/test/ext/ext_vector_vec1.cpp index 81217872..7d7fae14 100644 --- a/test/ext/ext_vector_vec1.cpp +++ b/test/ext/ext_vector_vec1.cpp @@ -1,10 +1,10 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include template static int test_operators() diff --git a/test/gtx/gtx_functions.cpp b/test/gtx/gtx_functions.cpp index 46aea526..48a6af0e 100644 --- a/test/gtx/gtx_functions.cpp +++ b/test/gtx/gtx_functions.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include int test_gauss_1d()