Browse Source

Refactor EXT headers

Christophe Riccio 7 years ago
parent
commit
6d34ae4c5e
100 changed files with 155 additions and 237 deletions
  1. 1 2
      glm/detail/func_integer.inl
  2. 1 1
      glm/detail/glm.cpp
  3. 17 0
      glm/detail/qualifier.hpp
  4. 0 1
      glm/ext.hpp
  5. 1 1
      glm/ext/matrix_double2x2.hpp
  6. 0 0
      glm/ext/matrix_double2x2_precision.hpp
  7. 1 1
      glm/ext/matrix_double2x3.hpp
  8. 0 0
      glm/ext/matrix_double2x3_precision.hpp
  9. 1 1
      glm/ext/matrix_double2x4.hpp
  10. 0 0
      glm/ext/matrix_double2x4_precision.hpp
  11. 1 1
      glm/ext/matrix_double3x2.hpp
  12. 0 0
      glm/ext/matrix_double3x2_precision.hpp
  13. 1 1
      glm/ext/matrix_double3x3.hpp
  14. 0 0
      glm/ext/matrix_double3x3_precision.hpp
  15. 1 1
      glm/ext/matrix_double3x4.hpp
  16. 0 0
      glm/ext/matrix_double3x4_precision.hpp
  17. 1 1
      glm/ext/matrix_double4x2.hpp
  18. 0 0
      glm/ext/matrix_double4x2_precision.hpp
  19. 1 1
      glm/ext/matrix_double4x3.hpp
  20. 0 0
      glm/ext/matrix_double4x3_precision.hpp
  21. 1 1
      glm/ext/matrix_double4x4.hpp
  22. 0 0
      glm/ext/matrix_double4x4_precision.hpp
  23. 1 1
      glm/ext/matrix_float2x2.hpp
  24. 0 0
      glm/ext/matrix_float2x2_precision.hpp
  25. 1 1
      glm/ext/matrix_float2x3.hpp
  26. 0 0
      glm/ext/matrix_float2x3_precision.hpp
  27. 1 1
      glm/ext/matrix_float2x4.hpp
  28. 0 0
      glm/ext/matrix_float2x4_precision.hpp
  29. 1 1
      glm/ext/matrix_float3x2.hpp
  30. 0 0
      glm/ext/matrix_float3x2_precision.hpp
  31. 1 1
      glm/ext/matrix_float3x3.hpp
  32. 0 0
      glm/ext/matrix_float3x3_precision.hpp
  33. 1 1
      glm/ext/matrix_float3x4.hpp
  34. 0 0
      glm/ext/matrix_float3x4_precision.hpp
  35. 1 1
      glm/ext/matrix_float4x2.hpp
  36. 0 0
      glm/ext/matrix_float4x2_precision.hpp
  37. 1 1
      glm/ext/matrix_float4x3.hpp
  38. 0 0
      glm/ext/matrix_float4x3_precision.hpp
  39. 1 1
      glm/ext/matrix_float4x4.hpp
  40. 0 0
      glm/ext/matrix_float4x4_precision.hpp
  41. 0 21
      glm/ext/vec1.hpp
  42. 2 2
      glm/ext/vector_bool1.hpp
  43. 0 0
      glm/ext/vector_bool1_precision.hpp
  44. 1 1
      glm/ext/vector_bool2.hpp
  45. 0 0
      glm/ext/vector_bool2_precision.hpp
  46. 1 1
      glm/ext/vector_bool3.hpp
  47. 0 0
      glm/ext/vector_bool3_precision.hpp
  48. 1 1
      glm/ext/vector_bool4.hpp
  49. 0 0
      glm/ext/vector_bool4_precision.hpp
  50. 4 4
      glm/ext/vector_double1.hpp
  51. 0 0
      glm/ext/vector_double1_precision.hpp
  52. 1 1
      glm/ext/vector_double2.hpp
  53. 0 0
      glm/ext/vector_double2_precision.hpp
  54. 1 1
      glm/ext/vector_double3.hpp
  55. 0 0
      glm/ext/vector_double3_precision.hpp
  56. 1 1
      glm/ext/vector_double4.hpp
  57. 0 0
      glm/ext/vector_double4_precision.hpp
  58. 0 0
      glm/ext/vector_float1.hpp
  59. 0 0
      glm/ext/vector_float1_precision.hpp
  60. 1 1
      glm/ext/vector_float2.hpp
  61. 0 0
      glm/ext/vector_float2_precision.hpp
  62. 1 1
      glm/ext/vector_float3.hpp
  63. 0 0
      glm/ext/vector_float3_precision.hpp
  64. 1 1
      glm/ext/vector_float4.hpp
  65. 0 0
      glm/ext/vector_float4_precision.hpp
  66. 0 0
      glm/ext/vector_int1.hpp
  67. 0 0
      glm/ext/vector_int1_precision.hpp
  68. 1 1
      glm/ext/vector_int2.hpp
  69. 0 0
      glm/ext/vector_int2_precision.hpp
  70. 1 1
      glm/ext/vector_int3.hpp
  71. 0 0
      glm/ext/vector_int3_precision.hpp
  72. 1 1
      glm/ext/vector_int4.hpp
  73. 0 0
      glm/ext/vector_int4_precision.hpp
  74. 1 1
      glm/ext/vector_uint1.hpp
  75. 6 6
      glm/ext/vector_uint1_precision.hpp
  76. 1 1
      glm/ext/vector_uint2.hpp
  77. 1 1
      glm/ext/vector_uint2_precision.hpp
  78. 1 1
      glm/ext/vector_uint3.hpp
  79. 1 1
      glm/ext/vector_uint3_precision.hpp
  80. 1 1
      glm/ext/vector_uint4.hpp
  81. 1 1
      glm/ext/vector_uint4_precision.hpp
  82. 1 1
      glm/gtc/random.inl
  83. 10 1
      glm/gtc/vec1.hpp
  84. 4 11
      glm/mat2x2.hpp
  85. 4 11
      glm/mat2x3.hpp
  86. 4 11
      glm/mat2x4.hpp
  87. 4 11
      glm/mat3x2.hpp
  88. 4 12
      glm/mat3x3.hpp
  89. 4 12
      glm/mat3x4.hpp
  90. 4 11
      glm/mat4x2.hpp
  91. 4 12
      glm/mat4x3.hpp
  92. 4 11
      glm/mat4x4.hpp
  93. 3 3
      glm/packing.hpp
  94. 10 17
      glm/vec2.hpp
  95. 10 18
      glm/vec3.hpp
  96. 10 17
      glm/vec4.hpp
  97. 3 1
      test/core/core_cpp_constexpr.cpp
  98. 1 1
      test/core/core_cpp_defaulted_ctor.cpp
  99. 1 1
      test/core/core_force_xyzw_only.cpp
  100. 2 1
      test/core/core_func_common.cpp

+ 1 - 2
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"

+ 1 - 1
glm/detail/glm.cpp

@@ -4,7 +4,7 @@
 #define GLM_FORCE_MESSAGES
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/glm.hpp>
-#include <glm/ext/vec1.hpp>
+#include <glm/gtc/vec1.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/dual_quaternion.hpp>
 

+ 17 - 0
glm/detail/qualifier.hpp

@@ -40,6 +40,23 @@ namespace glm
 	template<length_t C, length_t R, typename T, qualifier Q = defaultp> struct mat;
 	template<typename T, qualifier Q = defaultp> struct qua;
 
+#	if GLM_HAS_TEMPLATE_ALIASES
+		template <typename T, qualifier Q = defaultp> using tvec1 = vec<1, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tvec2 = vec<2, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tvec3 = vec<3, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tvec4 = vec<4, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat2x2 = mat<2, 2, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat2x3 = mat<2, 3, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat2x4 = mat<2, 4, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat3x2 = mat<3, 2, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat3x3 = mat<3, 3, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat3x4 = mat<3, 4, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat4x2 = mat<4, 2, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat4x3 = mat<4, 3, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tmat4x4 = mat<4, 4, T, Q>;
+		template <typename T, qualifier Q = defaultp> using tquat = qua<T, Q>;
+#	endif
+
 namespace detail
 {
 	template<glm::qualifier P>

+ 0 - 1
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"

+ 1 - 1
glm/ext/matrix_dmat2x2.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat2x2_precision.hpp → glm/ext/matrix_double2x2_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat2x3.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat2x3_precision.hpp → glm/ext/matrix_double2x3_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat2x4.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat2x4_precision.hpp → glm/ext/matrix_double2x4_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat3x2.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat3x2_precision.hpp → glm/ext/matrix_double3x2_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat3x3.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat3x3_precision.hpp → glm/ext/matrix_double3x3_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat3x4.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat3x4_precision.hpp → glm/ext/matrix_double3x4_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat4x2.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat4x2_precision.hpp → glm/ext/matrix_double4x2_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat4x3.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat4x3_precision.hpp → glm/ext/matrix_double4x3_precision.hpp


+ 1 - 1
glm/ext/matrix_dmat4x4.hpp → 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"

+ 0 - 0
glm/ext/matrix_dmat4x4_precision.hpp → glm/ext/matrix_double4x4_precision.hpp


+ 1 - 1
glm/ext/matrix_mat2x2.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat2x2_precision.hpp → glm/ext/matrix_float2x2_precision.hpp


+ 1 - 1
glm/ext/matrix_mat2x3.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat2x3_precision.hpp → glm/ext/matrix_float2x3_precision.hpp


+ 1 - 1
glm/ext/matrix_mat2x4.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat2x4_precision.hpp → glm/ext/matrix_float2x4_precision.hpp


+ 1 - 1
glm/ext/matrix_mat3x2.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat3x2_precision.hpp → glm/ext/matrix_float3x2_precision.hpp


+ 1 - 1
glm/ext/matrix_mat3x3.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat3x3_precision.hpp → glm/ext/matrix_float3x3_precision.hpp


+ 1 - 1
glm/ext/matrix_mat3x4.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat3x4_precision.hpp → glm/ext/matrix_float3x4_precision.hpp


+ 1 - 1
glm/ext/matrix_mat4x2.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat4x2_precision.hpp → glm/ext/matrix_float4x2_precision.hpp


+ 1 - 1
glm/ext/matrix_mat4x3.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat4x3_precision.hpp → glm/ext/matrix_float4x3_precision.hpp


+ 1 - 1
glm/ext/matrix_mat4x4.hpp → 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"

+ 0 - 0
glm/ext/matrix_mat4x4_precision.hpp → glm/ext/matrix_float4x4_precision.hpp


+ 0 - 21
glm/ext/vec1.hpp

@@ -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 <typename T, qualifier Q = defaultp> using tvec1 = vec<1, T, Q>;
-#	endif
-}//namespace glm

+ 2 - 2
glm/ext/vector_bvec1.hpp → 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 <glm/ext/vector_bvec1.hpp> to use the features of this extension.

+ 0 - 0
glm/ext/vector_bvec1_precision.hpp → glm/ext/vector_bool1_precision.hpp


+ 1 - 1
glm/ext/vector_bvec2.hpp → 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"

+ 0 - 0
glm/ext/vector_bvec2_precision.hpp → glm/ext/vector_bool2_precision.hpp


+ 1 - 1
glm/ext/vector_bvec3.hpp → 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"

+ 0 - 0
glm/ext/vector_bvec3_precision.hpp → glm/ext/vector_bool3_precision.hpp


+ 1 - 1
glm/ext/vector_bvec4.hpp → 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"

+ 0 - 0
glm/ext/vector_bvec4_precision.hpp → glm/ext/vector_bool4_precision.hpp


+ 4 - 4
glm/ext/vector_dvec1.hpp → 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 <glm/ext/vector_dvec1.hpp> to use the features of this extension.
+/// Include <glm/ext/vector_double1.hpp> to use the features of this extension.
 ///
 /// Expose dvec1 vector type.
 

+ 0 - 0
glm/ext/vector_dvec1_precision.hpp → glm/ext/vector_double1_precision.hpp


+ 1 - 1
glm/ext/vector_dvec2.hpp → 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"

+ 0 - 0
glm/ext/vector_dvec2_precision.hpp → glm/ext/vector_double2_precision.hpp


+ 1 - 1
glm/ext/vector_dvec3.hpp → 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"

+ 0 - 0
glm/ext/vector_dvec3_precision.hpp → glm/ext/vector_double3_precision.hpp


+ 1 - 1
glm/ext/vector_dvec4.hpp → 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"

+ 0 - 0
glm/ext/vector_dvec4_precision.hpp → glm/ext/vector_double4_precision.hpp


+ 0 - 0
glm/ext/vector_vec1.hpp → glm/ext/vector_float1.hpp


+ 0 - 0
glm/ext/vector_vec1_precision.hpp → glm/ext/vector_float1_precision.hpp


+ 1 - 1
glm/ext/vector_vec2.hpp → 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"

+ 0 - 0
glm/ext/vector_vec2_precision.hpp → glm/ext/vector_float2_precision.hpp


+ 1 - 1
glm/ext/vector_vec3.hpp → 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"

+ 0 - 0
glm/ext/vector_vec3_precision.hpp → glm/ext/vector_float3_precision.hpp


+ 1 - 1
glm/ext/vector_vec4.hpp → 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"

+ 0 - 0
glm/ext/vector_vec4_precision.hpp → glm/ext/vector_float4_precision.hpp


+ 0 - 0
glm/ext/vector_ivec1.hpp → glm/ext/vector_int1.hpp


+ 0 - 0
glm/ext/vector_ivec1_precision.hpp → glm/ext/vector_int1_precision.hpp


+ 1 - 1
glm/ext/vector_ivec2.hpp → 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"

+ 0 - 0
glm/ext/vector_ivec2_precision.hpp → glm/ext/vector_int2_precision.hpp


+ 1 - 1
glm/ext/vector_ivec3.hpp → 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"

+ 0 - 0
glm/ext/vector_ivec3_precision.hpp → glm/ext/vector_int3_precision.hpp


+ 1 - 1
glm/ext/vector_ivec4.hpp → 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"

+ 0 - 0
glm/ext/vector_ivec4_precision.hpp → glm/ext/vector_int4_precision.hpp


+ 1 - 1
glm/ext/vector_uvec1.hpp → 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)
 ///

+ 6 - 6
glm/ext/vector_uvec1_precision.hpp → 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 <glm/ext/uvec1_precision.hpp> to use the features of this extension.
+/// Include <glm/ext/vector_uint1_precision.hpp> 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.

+ 1 - 1
glm/ext/vector_uvec2.hpp → 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"

+ 1 - 1
glm/ext/vector_uvec2_precision.hpp → 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"

+ 1 - 1
glm/ext/vector_uvec3.hpp → 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"

+ 1 - 1
glm/ext/vector_uvec3_precision.hpp → 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"

+ 1 - 1
glm/ext/vector_uvec4.hpp → 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"

+ 1 - 1
glm/ext/vector_uvec4_precision.hpp → 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"

+ 1 - 1
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 <cstdlib>
 #include <ctime>
 #include <cassert>

+ 10 - 1
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")

+ 4 - 11
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 <typename T, qualifier Q = defaultp> using tmat2x2 = mat<2, 2, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-}//namespace glm

+ 4 - 11
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 <typename T, qualifier Q = defaultp> using tmat2x3 = mat<2, 3, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-}//namespace glm

+ 4 - 11
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 <typename T, qualifier Q = defaultp> using tmat2x4 = mat<2, 4, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-}//namespace glm

+ 4 - 11
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 <typename T, qualifier Q = defaultp> using tmat3x2 = mat<3, 2, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-}//namespace glm

+ 4 - 12
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 <typename T, qualifier Q = defaultp> 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"

+ 4 - 12
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 <typename T, qualifier Q = defaultp> 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"

+ 4 - 11
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 <typename T, qualifier Q = defaultp> using tmat4x2 = mat<4, 2, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-}//namespace glm

+ 4 - 12
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 <typename T, qualifier Q = defaultp> 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"

+ 4 - 11
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 <typename T, qualifier Q = defaultp> using tmat4x4 = mat<4, 4, T, Q>;
-#endif//GLM_HAS_TEMPLATE_ALIASES
-
-}//namespace glm

+ 3 - 3
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
 {

+ 10 - 17
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 <typename T, qualifier Q = defaultp> 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"

+ 10 - 18
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 <typename T, qualifier Q = defaultp> 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"

+ 10 - 17
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 <typename T, qualifier Q = defaultp> 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"
 

+ 3 - 1
test/core/core_cpp_constexpr.cpp

@@ -5,7 +5,9 @@
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/ext/vector_relational.hpp>
-#include <glm/ext/vec1.hpp>
+#include <glm/ext/vector_int1.hpp>
+#include <glm/ext/vector_bool1.hpp>
+#include <glm/ext/vector_float1.hpp>
 
 static int test_vec1()
 {

+ 1 - 1
test/core/core_cpp_defaulted_ctor.cpp

@@ -4,9 +4,9 @@
 
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/quaternion.hpp>
+#include <glm/gtc/vec1.hpp>
 #include <glm/ext/matrix_relational.hpp>
 #include <glm/ext/vector_relational.hpp>
-#include <glm/ext/vec1.hpp>
 #include <cstring>
 
 static int test_vec_memcpy()

+ 1 - 1
test/core/core_force_xyzw_only.cpp

@@ -1,8 +1,8 @@
 #define GLM_FORCE_XYZW_ONLY
 
 #include <glm/gtc/constants.hpp>
+#include <glm/gtc/vec1.hpp>
 #include <glm/ext/vector_relational.hpp>
-#include <glm/ext/vec1.hpp>
 #include <glm/vec2.hpp>
 #include <glm/vec3.hpp>
 #include <glm/vec4.hpp>

+ 2 - 1
test/core/core_func_common.cpp

@@ -1,9 +1,10 @@
 #define GLM_FORCE_EXPLICIT_CTOR
 #include <glm/gtc/constants.hpp>
 #include <glm/gtc/random.hpp>
+#include <glm/gtc/vec1.hpp>
 #include <glm/ext/scalar_relational.hpp>
 #include <glm/ext/vector_relational.hpp>
-#include <glm/ext/vec1.hpp>
+#include <glm/ext/vector_float1.hpp>
 #include <glm/common.hpp>
 #include <glm/vec4.hpp>
 #include <glm/vec3.hpp>

Some files were not shown because too many files changed in this diff