From 310b8405c9bdc46ca7e89305ba87307b8bb52836 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 7 Aug 2018 10:46:09 +0200 Subject: [PATCH] Refactor split headers as extension files --- glm/detail/func_vector_relational.inl | 4 ---- glm/{ => ext}/matrix_dmat2x2.hpp | 0 glm/{ => ext}/matrix_dmat2x2_precision.hpp | 0 glm/{ => ext}/matrix_dmat2x3.hpp | 0 glm/{ => ext}/matrix_dmat2x3_precision.hpp | 0 glm/{ => ext}/matrix_dmat2x4.hpp | 0 glm/{ => ext}/matrix_dmat2x4_precision.hpp | 0 glm/{ => ext}/matrix_dmat3x2.hpp | 0 glm/{ => ext}/matrix_dmat3x2_precision.hpp | 0 glm/{ => ext}/matrix_dmat3x3.hpp | 0 glm/{ => ext}/matrix_dmat3x3_precision.hpp | 0 glm/{ => ext}/matrix_dmat3x4.hpp | 0 glm/{ => ext}/matrix_dmat3x4_precision.hpp | 0 glm/{ => ext}/matrix_dmat4x2.hpp | 0 glm/{ => ext}/matrix_dmat4x2_precision.hpp | 0 glm/{ => ext}/matrix_dmat4x3.hpp | 0 glm/{ => ext}/matrix_dmat4x3_precision.hpp | 0 glm/{ => ext}/matrix_dmat4x4.hpp | 0 glm/{ => ext}/matrix_dmat4x4_precision.hpp | 0 glm/{ => ext}/matrix_mat2x2.hpp | 0 glm/{ => ext}/matrix_mat2x2_precision.hpp | 0 glm/{ => ext}/matrix_mat2x3.hpp | 0 glm/{ => ext}/matrix_mat2x3_precision.hpp | 0 glm/{ => ext}/matrix_mat2x4.hpp | 0 glm/{ => ext}/matrix_mat2x4_precision.hpp | 0 glm/{ => ext}/matrix_mat3x2.hpp | 0 glm/{ => ext}/matrix_mat3x2_precision.hpp | 0 glm/{ => ext}/matrix_mat3x3.hpp | 0 glm/{ => ext}/matrix_mat3x3_precision.hpp | 0 glm/{ => ext}/matrix_mat3x4.hpp | 0 glm/{ => ext}/matrix_mat3x4_precision.hpp | 0 glm/{ => ext}/matrix_mat4x2.hpp | 0 glm/{ => ext}/matrix_mat4x2_precision.hpp | 0 glm/{ => ext}/matrix_mat4x3.hpp | 2 +- glm/{ => ext}/matrix_mat4x3_precision.hpp | 0 glm/{ => ext}/matrix_mat4x4.hpp | 0 glm/{ => ext}/matrix_mat4x4_precision.hpp | 0 glm/{ => ext}/vector_bvec2.hpp | 0 glm/{ => ext}/vector_bvec2_precision.hpp | 0 glm/{ => ext}/vector_bvec3.hpp | 0 glm/{ => ext}/vector_bvec3_precision.hpp | 0 glm/{ => ext}/vector_bvec4.hpp | 0 glm/{ => ext}/vector_bvec4_precision.hpp | 0 glm/{ => ext}/vector_dvec2.hpp | 2 +- glm/{ => ext}/vector_dvec2_precision.hpp | 0 glm/{ => ext}/vector_dvec3.hpp | 2 +- glm/{ => ext}/vector_dvec3_precision.hpp | 0 glm/{ => ext}/vector_dvec4.hpp | 2 +- glm/{ => ext}/vector_dvec4_precision.hpp | 0 glm/{ => ext}/vector_ivec2.hpp | 2 +- glm/{ => ext}/vector_ivec2_precision.hpp | 0 glm/{ => ext}/vector_ivec3.hpp | 2 +- glm/{ => ext}/vector_ivec3_precision.hpp | 0 glm/{ => ext}/vector_ivec4.hpp | 2 +- glm/{ => ext}/vector_ivec4_precision.hpp | 0 glm/{ => ext}/vector_uvec2.hpp | 2 +- glm/{ => ext}/vector_uvec2_precision.hpp | 0 glm/{ => ext}/vector_uvec3.hpp | 2 +- glm/{ => ext}/vector_uvec3_precision.hpp | 0 glm/{ => ext}/vector_uvec4.hpp | 2 +- glm/{ => ext}/vector_uvec4_precision.hpp | 0 glm/{ => ext}/vector_vec2.hpp | 4 ++-- glm/{ => ext}/vector_vec2_precision.hpp | 0 glm/{ => ext}/vector_vec3.hpp | 2 +- glm/{ => ext}/vector_vec3_precision.hpp | 0 glm/{ => ext}/vector_vec4.hpp | 2 +- glm/{ => ext}/vector_vec4_precision.hpp | 0 glm/mat2x2.hpp | 8 ++++---- glm/mat2x3.hpp | 8 ++++---- glm/mat2x4.hpp | 8 ++++---- glm/mat3x2.hpp | 8 ++++---- glm/mat3x3.hpp | 8 ++++---- glm/mat3x4.hpp | 8 ++++---- glm/mat4x2.hpp | 8 ++++---- glm/mat4x3.hpp | 8 ++++---- glm/mat4x4.hpp | 8 ++++---- glm/packing.hpp | 6 +++--- glm/vec2.hpp | 20 ++++++++++---------- glm/vec3.hpp | 20 ++++++++++---------- glm/vec4.hpp | 20 ++++++++++---------- test/core/core_func_common.cpp | 8 +++----- test/core/core_func_geometric.cpp | 12 ++++++------ test/core/core_func_integer.cpp | 12 ++++++------ test/ext/ext_matrix_relational.cpp | 4 ++-- test/ext/ext_vector_dvec1.cpp | 6 +++--- test/ext/ext_vector_ivec1.cpp | 6 +++--- test/ext/ext_vector_uvec1.cpp | 8 ++++---- test/ext/ext_vector_vec1.cpp | 6 +++--- test/gtx/gtx_functions.cpp | 2 +- 89 files changed, 114 insertions(+), 120 deletions(-) rename glm/{ => ext}/matrix_dmat2x2.hpp (100%) rename glm/{ => ext}/matrix_dmat2x2_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat2x3.hpp (100%) rename glm/{ => ext}/matrix_dmat2x3_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat2x4.hpp (100%) rename glm/{ => ext}/matrix_dmat2x4_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat3x2.hpp (100%) rename glm/{ => ext}/matrix_dmat3x2_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat3x3.hpp (100%) rename glm/{ => ext}/matrix_dmat3x3_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat3x4.hpp (100%) rename glm/{ => ext}/matrix_dmat3x4_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat4x2.hpp (100%) rename glm/{ => ext}/matrix_dmat4x2_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat4x3.hpp (100%) rename glm/{ => ext}/matrix_dmat4x3_precision.hpp (100%) rename glm/{ => ext}/matrix_dmat4x4.hpp (100%) rename glm/{ => ext}/matrix_dmat4x4_precision.hpp (100%) rename glm/{ => ext}/matrix_mat2x2.hpp (100%) rename glm/{ => ext}/matrix_mat2x2_precision.hpp (100%) rename glm/{ => ext}/matrix_mat2x3.hpp (100%) rename glm/{ => ext}/matrix_mat2x3_precision.hpp (100%) rename glm/{ => ext}/matrix_mat2x4.hpp (100%) rename glm/{ => ext}/matrix_mat2x4_precision.hpp (100%) rename glm/{ => ext}/matrix_mat3x2.hpp (100%) rename glm/{ => ext}/matrix_mat3x2_precision.hpp (100%) rename glm/{ => ext}/matrix_mat3x3.hpp (100%) rename glm/{ => ext}/matrix_mat3x3_precision.hpp (100%) rename glm/{ => ext}/matrix_mat3x4.hpp (100%) rename glm/{ => ext}/matrix_mat3x4_precision.hpp (100%) rename glm/{ => ext}/matrix_mat4x2.hpp (100%) rename glm/{ => ext}/matrix_mat4x2_precision.hpp (100%) rename glm/{ => ext}/matrix_mat4x3.hpp (94%) rename glm/{ => ext}/matrix_mat4x3_precision.hpp (100%) rename glm/{ => ext}/matrix_mat4x4.hpp (100%) rename glm/{ => ext}/matrix_mat4x4_precision.hpp (100%) rename glm/{ => ext}/vector_bvec2.hpp (100%) rename glm/{ => ext}/vector_bvec2_precision.hpp (100%) rename glm/{ => ext}/vector_bvec3.hpp (100%) rename glm/{ => ext}/vector_bvec3_precision.hpp (100%) rename glm/{ => ext}/vector_bvec4.hpp (100%) rename glm/{ => ext}/vector_bvec4_precision.hpp (100%) rename glm/{ => ext}/vector_dvec2.hpp (94%) rename glm/{ => ext}/vector_dvec2_precision.hpp (100%) rename glm/{ => ext}/vector_dvec3.hpp (94%) rename glm/{ => ext}/vector_dvec3_precision.hpp (100%) rename glm/{ => ext}/vector_dvec4.hpp (94%) rename glm/{ => ext}/vector_dvec4_precision.hpp (100%) rename glm/{ => ext}/vector_ivec2.hpp (94%) rename glm/{ => ext}/vector_ivec2_precision.hpp (100%) rename glm/{ => ext}/vector_ivec3.hpp (94%) rename glm/{ => ext}/vector_ivec3_precision.hpp (100%) rename glm/{ => ext}/vector_ivec4.hpp (94%) rename glm/{ => ext}/vector_ivec4_precision.hpp (100%) rename glm/{ => ext}/vector_uvec2.hpp (94%) rename glm/{ => ext}/vector_uvec2_precision.hpp (100%) rename glm/{ => ext}/vector_uvec3.hpp (94%) rename glm/{ => ext}/vector_uvec3_precision.hpp (100%) rename glm/{ => ext}/vector_uvec4.hpp (94%) rename glm/{ => ext}/vector_uvec4_precision.hpp (100%) rename glm/{ => ext}/vector_vec2.hpp (89%) rename glm/{ => ext}/vector_vec2_precision.hpp (100%) rename glm/{ => ext}/vector_vec3.hpp (94%) rename glm/{ => ext}/vector_vec3_precision.hpp (100%) rename glm/{ => ext}/vector_vec4.hpp (94%) rename glm/{ => ext}/vector_vec4_precision.hpp (100%) diff --git a/glm/detail/func_vector_relational.inl b/glm/detail/func_vector_relational.inl index c6cee24b..c38e48b3 100644 --- a/glm/detail/func_vector_relational.inl +++ b/glm/detail/func_vector_relational.inl @@ -122,8 +122,6 @@ namespace detail } }; - - template struct reduce_relational { @@ -143,8 +141,6 @@ namespace detail {} }; - - template struct loop_relational { diff --git a/glm/matrix_dmat2x2.hpp b/glm/ext/matrix_dmat2x2.hpp similarity index 100% rename from glm/matrix_dmat2x2.hpp rename to glm/ext/matrix_dmat2x2.hpp diff --git a/glm/matrix_dmat2x2_precision.hpp b/glm/ext/matrix_dmat2x2_precision.hpp similarity index 100% rename from glm/matrix_dmat2x2_precision.hpp rename to glm/ext/matrix_dmat2x2_precision.hpp diff --git a/glm/matrix_dmat2x3.hpp b/glm/ext/matrix_dmat2x3.hpp similarity index 100% rename from glm/matrix_dmat2x3.hpp rename to glm/ext/matrix_dmat2x3.hpp diff --git a/glm/matrix_dmat2x3_precision.hpp b/glm/ext/matrix_dmat2x3_precision.hpp similarity index 100% rename from glm/matrix_dmat2x3_precision.hpp rename to glm/ext/matrix_dmat2x3_precision.hpp diff --git a/glm/matrix_dmat2x4.hpp b/glm/ext/matrix_dmat2x4.hpp similarity index 100% rename from glm/matrix_dmat2x4.hpp rename to glm/ext/matrix_dmat2x4.hpp diff --git a/glm/matrix_dmat2x4_precision.hpp b/glm/ext/matrix_dmat2x4_precision.hpp similarity index 100% rename from glm/matrix_dmat2x4_precision.hpp rename to glm/ext/matrix_dmat2x4_precision.hpp diff --git a/glm/matrix_dmat3x2.hpp b/glm/ext/matrix_dmat3x2.hpp similarity index 100% rename from glm/matrix_dmat3x2.hpp rename to glm/ext/matrix_dmat3x2.hpp diff --git a/glm/matrix_dmat3x2_precision.hpp b/glm/ext/matrix_dmat3x2_precision.hpp similarity index 100% rename from glm/matrix_dmat3x2_precision.hpp rename to glm/ext/matrix_dmat3x2_precision.hpp diff --git a/glm/matrix_dmat3x3.hpp b/glm/ext/matrix_dmat3x3.hpp similarity index 100% rename from glm/matrix_dmat3x3.hpp rename to glm/ext/matrix_dmat3x3.hpp diff --git a/glm/matrix_dmat3x3_precision.hpp b/glm/ext/matrix_dmat3x3_precision.hpp similarity index 100% rename from glm/matrix_dmat3x3_precision.hpp rename to glm/ext/matrix_dmat3x3_precision.hpp diff --git a/glm/matrix_dmat3x4.hpp b/glm/ext/matrix_dmat3x4.hpp similarity index 100% rename from glm/matrix_dmat3x4.hpp rename to glm/ext/matrix_dmat3x4.hpp diff --git a/glm/matrix_dmat3x4_precision.hpp b/glm/ext/matrix_dmat3x4_precision.hpp similarity index 100% rename from glm/matrix_dmat3x4_precision.hpp rename to glm/ext/matrix_dmat3x4_precision.hpp diff --git a/glm/matrix_dmat4x2.hpp b/glm/ext/matrix_dmat4x2.hpp similarity index 100% rename from glm/matrix_dmat4x2.hpp rename to glm/ext/matrix_dmat4x2.hpp diff --git a/glm/matrix_dmat4x2_precision.hpp b/glm/ext/matrix_dmat4x2_precision.hpp similarity index 100% rename from glm/matrix_dmat4x2_precision.hpp rename to glm/ext/matrix_dmat4x2_precision.hpp diff --git a/glm/matrix_dmat4x3.hpp b/glm/ext/matrix_dmat4x3.hpp similarity index 100% rename from glm/matrix_dmat4x3.hpp rename to glm/ext/matrix_dmat4x3.hpp diff --git a/glm/matrix_dmat4x3_precision.hpp b/glm/ext/matrix_dmat4x3_precision.hpp similarity index 100% rename from glm/matrix_dmat4x3_precision.hpp rename to glm/ext/matrix_dmat4x3_precision.hpp diff --git a/glm/matrix_dmat4x4.hpp b/glm/ext/matrix_dmat4x4.hpp similarity index 100% rename from glm/matrix_dmat4x4.hpp rename to glm/ext/matrix_dmat4x4.hpp diff --git a/glm/matrix_dmat4x4_precision.hpp b/glm/ext/matrix_dmat4x4_precision.hpp similarity index 100% rename from glm/matrix_dmat4x4_precision.hpp rename to glm/ext/matrix_dmat4x4_precision.hpp diff --git a/glm/matrix_mat2x2.hpp b/glm/ext/matrix_mat2x2.hpp similarity index 100% rename from glm/matrix_mat2x2.hpp rename to glm/ext/matrix_mat2x2.hpp diff --git a/glm/matrix_mat2x2_precision.hpp b/glm/ext/matrix_mat2x2_precision.hpp similarity index 100% rename from glm/matrix_mat2x2_precision.hpp rename to glm/ext/matrix_mat2x2_precision.hpp diff --git a/glm/matrix_mat2x3.hpp b/glm/ext/matrix_mat2x3.hpp similarity index 100% rename from glm/matrix_mat2x3.hpp rename to glm/ext/matrix_mat2x3.hpp diff --git a/glm/matrix_mat2x3_precision.hpp b/glm/ext/matrix_mat2x3_precision.hpp similarity index 100% rename from glm/matrix_mat2x3_precision.hpp rename to glm/ext/matrix_mat2x3_precision.hpp diff --git a/glm/matrix_mat2x4.hpp b/glm/ext/matrix_mat2x4.hpp similarity index 100% rename from glm/matrix_mat2x4.hpp rename to glm/ext/matrix_mat2x4.hpp diff --git a/glm/matrix_mat2x4_precision.hpp b/glm/ext/matrix_mat2x4_precision.hpp similarity index 100% rename from glm/matrix_mat2x4_precision.hpp rename to glm/ext/matrix_mat2x4_precision.hpp diff --git a/glm/matrix_mat3x2.hpp b/glm/ext/matrix_mat3x2.hpp similarity index 100% rename from glm/matrix_mat3x2.hpp rename to glm/ext/matrix_mat3x2.hpp diff --git a/glm/matrix_mat3x2_precision.hpp b/glm/ext/matrix_mat3x2_precision.hpp similarity index 100% rename from glm/matrix_mat3x2_precision.hpp rename to glm/ext/matrix_mat3x2_precision.hpp diff --git a/glm/matrix_mat3x3.hpp b/glm/ext/matrix_mat3x3.hpp similarity index 100% rename from glm/matrix_mat3x3.hpp rename to glm/ext/matrix_mat3x3.hpp diff --git a/glm/matrix_mat3x3_precision.hpp b/glm/ext/matrix_mat3x3_precision.hpp similarity index 100% rename from glm/matrix_mat3x3_precision.hpp rename to glm/ext/matrix_mat3x3_precision.hpp diff --git a/glm/matrix_mat3x4.hpp b/glm/ext/matrix_mat3x4.hpp similarity index 100% rename from glm/matrix_mat3x4.hpp rename to glm/ext/matrix_mat3x4.hpp diff --git a/glm/matrix_mat3x4_precision.hpp b/glm/ext/matrix_mat3x4_precision.hpp similarity index 100% rename from glm/matrix_mat3x4_precision.hpp rename to glm/ext/matrix_mat3x4_precision.hpp diff --git a/glm/matrix_mat4x2.hpp b/glm/ext/matrix_mat4x2.hpp similarity index 100% rename from glm/matrix_mat4x2.hpp rename to glm/ext/matrix_mat4x2.hpp diff --git a/glm/matrix_mat4x2_precision.hpp b/glm/ext/matrix_mat4x2_precision.hpp similarity index 100% rename from glm/matrix_mat4x2_precision.hpp rename to glm/ext/matrix_mat4x2_precision.hpp diff --git a/glm/matrix_mat4x3.hpp b/glm/ext/matrix_mat4x3.hpp similarity index 94% rename from glm/matrix_mat4x3.hpp rename to glm/ext/matrix_mat4x3.hpp index f1f51aba..8879f6f2 100644 --- a/glm/matrix_mat4x3.hpp +++ b/glm/ext/matrix_mat4x3.hpp @@ -2,7 +2,7 @@ /// @file glm/matrix_mat4x3.hpp #pragma once -#include "detail/type_mat4x3.hpp" +#include "../detail/type_mat4x3.hpp" namespace glm { diff --git a/glm/matrix_mat4x3_precision.hpp b/glm/ext/matrix_mat4x3_precision.hpp similarity index 100% rename from glm/matrix_mat4x3_precision.hpp rename to glm/ext/matrix_mat4x3_precision.hpp diff --git a/glm/matrix_mat4x4.hpp b/glm/ext/matrix_mat4x4.hpp similarity index 100% rename from glm/matrix_mat4x4.hpp rename to glm/ext/matrix_mat4x4.hpp diff --git a/glm/matrix_mat4x4_precision.hpp b/glm/ext/matrix_mat4x4_precision.hpp similarity index 100% rename from glm/matrix_mat4x4_precision.hpp rename to glm/ext/matrix_mat4x4_precision.hpp diff --git a/glm/vector_bvec2.hpp b/glm/ext/vector_bvec2.hpp similarity index 100% rename from glm/vector_bvec2.hpp rename to glm/ext/vector_bvec2.hpp diff --git a/glm/vector_bvec2_precision.hpp b/glm/ext/vector_bvec2_precision.hpp similarity index 100% rename from glm/vector_bvec2_precision.hpp rename to glm/ext/vector_bvec2_precision.hpp diff --git a/glm/vector_bvec3.hpp b/glm/ext/vector_bvec3.hpp similarity index 100% rename from glm/vector_bvec3.hpp rename to glm/ext/vector_bvec3.hpp diff --git a/glm/vector_bvec3_precision.hpp b/glm/ext/vector_bvec3_precision.hpp similarity index 100% rename from glm/vector_bvec3_precision.hpp rename to glm/ext/vector_bvec3_precision.hpp diff --git a/glm/vector_bvec4.hpp b/glm/ext/vector_bvec4.hpp similarity index 100% rename from glm/vector_bvec4.hpp rename to glm/ext/vector_bvec4.hpp diff --git a/glm/vector_bvec4_precision.hpp b/glm/ext/vector_bvec4_precision.hpp similarity index 100% rename from glm/vector_bvec4_precision.hpp rename to glm/ext/vector_bvec4_precision.hpp diff --git a/glm/vector_dvec2.hpp b/glm/ext/vector_dvec2.hpp similarity index 94% rename from glm/vector_dvec2.hpp rename to glm/ext/vector_dvec2.hpp index cf0626ee..dfa71b56 100644 --- a/glm/vector_dvec2.hpp +++ b/glm/ext/vector_dvec2.hpp @@ -2,7 +2,7 @@ /// @file glm/dvec2.hpp #pragma once -#include "detail/type_vec2.hpp" +#include "../detail/type_vec2.hpp" namespace glm { diff --git a/glm/vector_dvec2_precision.hpp b/glm/ext/vector_dvec2_precision.hpp similarity index 100% rename from glm/vector_dvec2_precision.hpp rename to glm/ext/vector_dvec2_precision.hpp diff --git a/glm/vector_dvec3.hpp b/glm/ext/vector_dvec3.hpp similarity index 94% rename from glm/vector_dvec3.hpp rename to glm/ext/vector_dvec3.hpp index 943576cd..5b33137b 100644 --- a/glm/vector_dvec3.hpp +++ b/glm/ext/vector_dvec3.hpp @@ -2,7 +2,7 @@ /// @file glm/dvec3.hpp #pragma once -#include "detail/type_vec3.hpp" +#include "../detail/type_vec3.hpp" namespace glm { diff --git a/glm/vector_dvec3_precision.hpp b/glm/ext/vector_dvec3_precision.hpp similarity index 100% rename from glm/vector_dvec3_precision.hpp rename to glm/ext/vector_dvec3_precision.hpp diff --git a/glm/vector_dvec4.hpp b/glm/ext/vector_dvec4.hpp similarity index 94% rename from glm/vector_dvec4.hpp rename to glm/ext/vector_dvec4.hpp index 76830efb..fed6d070 100644 --- a/glm/vector_dvec4.hpp +++ b/glm/ext/vector_dvec4.hpp @@ -2,7 +2,7 @@ /// @file glm/dvec4.hpp #pragma once -#include "detail/type_vec4.hpp" +#include "../detail/type_vec4.hpp" namespace glm { diff --git a/glm/vector_dvec4_precision.hpp b/glm/ext/vector_dvec4_precision.hpp similarity index 100% rename from glm/vector_dvec4_precision.hpp rename to glm/ext/vector_dvec4_precision.hpp diff --git a/glm/vector_ivec2.hpp b/glm/ext/vector_ivec2.hpp similarity index 94% rename from glm/vector_ivec2.hpp rename to glm/ext/vector_ivec2.hpp index 1b6bb608..30c7c2fa 100644 --- a/glm/vector_ivec2.hpp +++ b/glm/ext/vector_ivec2.hpp @@ -2,7 +2,7 @@ /// @file glm/ivec2.hpp #pragma once -#include "detail/type_vec2.hpp" +#include "../detail/type_vec2.hpp" namespace glm { diff --git a/glm/vector_ivec2_precision.hpp b/glm/ext/vector_ivec2_precision.hpp similarity index 100% rename from glm/vector_ivec2_precision.hpp rename to glm/ext/vector_ivec2_precision.hpp diff --git a/glm/vector_ivec3.hpp b/glm/ext/vector_ivec3.hpp similarity index 94% rename from glm/vector_ivec3.hpp rename to glm/ext/vector_ivec3.hpp index 29e9c64b..2e2a484d 100644 --- a/glm/vector_ivec3.hpp +++ b/glm/ext/vector_ivec3.hpp @@ -2,7 +2,7 @@ /// @file glm/ivec3.hpp #pragma once -#include "detail/type_vec3.hpp" +#include "../detail/type_vec3.hpp" namespace glm { diff --git a/glm/vector_ivec3_precision.hpp b/glm/ext/vector_ivec3_precision.hpp similarity index 100% rename from glm/vector_ivec3_precision.hpp rename to glm/ext/vector_ivec3_precision.hpp diff --git a/glm/vector_ivec4.hpp b/glm/ext/vector_ivec4.hpp similarity index 94% rename from glm/vector_ivec4.hpp rename to glm/ext/vector_ivec4.hpp index ed55b55d..6c54710d 100644 --- a/glm/vector_ivec4.hpp +++ b/glm/ext/vector_ivec4.hpp @@ -2,7 +2,7 @@ /// @file glm/ivec4.hpp #pragma once -#include "detail/type_vec4.hpp" +#include "../detail/type_vec4.hpp" namespace glm { diff --git a/glm/vector_ivec4_precision.hpp b/glm/ext/vector_ivec4_precision.hpp similarity index 100% rename from glm/vector_ivec4_precision.hpp rename to glm/ext/vector_ivec4_precision.hpp diff --git a/glm/vector_uvec2.hpp b/glm/ext/vector_uvec2.hpp similarity index 94% rename from glm/vector_uvec2.hpp rename to glm/ext/vector_uvec2.hpp index 2e13fdd3..be983210 100644 --- a/glm/vector_uvec2.hpp +++ b/glm/ext/vector_uvec2.hpp @@ -2,7 +2,7 @@ /// @file glm/uvec2.hpp #pragma once -#include "detail/type_vec2.hpp" +#include "../detail/type_vec2.hpp" namespace glm { diff --git a/glm/vector_uvec2_precision.hpp b/glm/ext/vector_uvec2_precision.hpp similarity index 100% rename from glm/vector_uvec2_precision.hpp rename to glm/ext/vector_uvec2_precision.hpp diff --git a/glm/vector_uvec3.hpp b/glm/ext/vector_uvec3.hpp similarity index 94% rename from glm/vector_uvec3.hpp rename to glm/ext/vector_uvec3.hpp index 7dd36993..47b6ab34 100644 --- a/glm/vector_uvec3.hpp +++ b/glm/ext/vector_uvec3.hpp @@ -2,7 +2,7 @@ /// @file glm/uvec3.hpp #pragma once -#include "detail/type_vec3.hpp" +#include "../detail/type_vec3.hpp" namespace glm { diff --git a/glm/vector_uvec3_precision.hpp b/glm/ext/vector_uvec3_precision.hpp similarity index 100% rename from glm/vector_uvec3_precision.hpp rename to glm/ext/vector_uvec3_precision.hpp diff --git a/glm/vector_uvec4.hpp b/glm/ext/vector_uvec4.hpp similarity index 94% rename from glm/vector_uvec4.hpp rename to glm/ext/vector_uvec4.hpp index 8933e2d0..90fbc16c 100644 --- a/glm/vector_uvec4.hpp +++ b/glm/ext/vector_uvec4.hpp @@ -2,7 +2,7 @@ /// @file glm/uvec4.hpp #pragma once -#include "detail/type_vec4.hpp" +#include "../detail/type_vec4.hpp" namespace glm { diff --git a/glm/vector_uvec4_precision.hpp b/glm/ext/vector_uvec4_precision.hpp similarity index 100% rename from glm/vector_uvec4_precision.hpp rename to glm/ext/vector_uvec4_precision.hpp diff --git a/glm/vector_vec2.hpp b/glm/ext/vector_vec2.hpp similarity index 89% rename from glm/vector_vec2.hpp rename to glm/ext/vector_vec2.hpp index b0e62b98..8750ca3c 100644 --- a/glm/vector_vec2.hpp +++ b/glm/ext/vector_vec2.hpp @@ -1,8 +1,8 @@ /// @ref core -/// @file glm/fvec2.hpp +/// @file glm/ext/vector_vec2.hpp #pragma once -#include "detail/type_vec2.hpp" +#include "../detail/type_vec2.hpp" namespace glm { diff --git a/glm/vector_vec2_precision.hpp b/glm/ext/vector_vec2_precision.hpp similarity index 100% rename from glm/vector_vec2_precision.hpp rename to glm/ext/vector_vec2_precision.hpp diff --git a/glm/vector_vec3.hpp b/glm/ext/vector_vec3.hpp similarity index 94% rename from glm/vector_vec3.hpp rename to glm/ext/vector_vec3.hpp index 34be3f21..0a6e66b8 100644 --- a/glm/vector_vec3.hpp +++ b/glm/ext/vector_vec3.hpp @@ -2,7 +2,7 @@ /// @file glm/fvec3.hpp #pragma once -#include "detail/type_vec3.hpp" +#include "../detail/type_vec3.hpp" namespace glm { diff --git a/glm/vector_vec3_precision.hpp b/glm/ext/vector_vec3_precision.hpp similarity index 100% rename from glm/vector_vec3_precision.hpp rename to glm/ext/vector_vec3_precision.hpp diff --git a/glm/vector_vec4.hpp b/glm/ext/vector_vec4.hpp similarity index 94% rename from glm/vector_vec4.hpp rename to glm/ext/vector_vec4.hpp index 336833f7..70d6becd 100644 --- a/glm/vector_vec4.hpp +++ b/glm/ext/vector_vec4.hpp @@ -2,7 +2,7 @@ /// @file glm/fvec4.hpp #pragma once -#include "detail/type_vec4.hpp" +#include "../detail/type_vec4.hpp" namespace glm { diff --git a/glm/vector_vec4_precision.hpp b/glm/ext/vector_vec4_precision.hpp similarity index 100% rename from glm/vector_vec4_precision.hpp rename to glm/ext/vector_vec4_precision.hpp diff --git a/glm/mat2x2.hpp b/glm/mat2x2.hpp index 980a2e42..9d7e1a78 100644 --- a/glm/mat2x2.hpp +++ b/glm/mat2x2.hpp @@ -2,10 +2,10 @@ /// @file glm/mat2x2.hpp #pragma once -#include "matrix_dmat2x2.hpp" -#include "matrix_dmat2x2_precision.hpp" -#include "matrix_mat2x2.hpp" -#include "matrix_mat2x2_precision.hpp" +#include "./ext/matrix_dmat2x2.hpp" +#include "./ext/matrix_dmat2x2_precision.hpp" +#include "./ext/matrix_mat2x2.hpp" +#include "./ext/matrix_mat2x2_precision.hpp" namespace glm { diff --git a/glm/mat2x3.hpp b/glm/mat2x3.hpp index 3f3f9316..258f45bc 100644 --- a/glm/mat2x3.hpp +++ b/glm/mat2x3.hpp @@ -2,10 +2,10 @@ /// @file glm/mat2x3.hpp #pragma once -#include "matrix_dmat2x3.hpp" -#include "matrix_dmat2x3_precision.hpp" -#include "matrix_mat2x3.hpp" -#include "matrix_mat2x3_precision.hpp" +#include "./ext/matrix_dmat2x3.hpp" +#include "./ext/matrix_dmat2x3_precision.hpp" +#include "./ext/matrix_mat2x3.hpp" +#include "./ext/matrix_mat2x3_precision.hpp" namespace glm { diff --git a/glm/mat2x4.hpp b/glm/mat2x4.hpp index b0998184..559fece9 100644 --- a/glm/mat2x4.hpp +++ b/glm/mat2x4.hpp @@ -2,10 +2,10 @@ /// @file glm/mat2x4.hpp #pragma once -#include "matrix_dmat2x4.hpp" -#include "matrix_dmat2x4_precision.hpp" -#include "matrix_mat2x4.hpp" -#include "matrix_mat2x4_precision.hpp" +#include "./ext/matrix_dmat2x4.hpp" +#include "./ext/matrix_dmat2x4_precision.hpp" +#include "./ext/matrix_mat2x4.hpp" +#include "./ext/matrix_mat2x4_precision.hpp" namespace glm { diff --git a/glm/mat3x2.hpp b/glm/mat3x2.hpp index eb571bcd..a376eee4 100644 --- a/glm/mat3x2.hpp +++ b/glm/mat3x2.hpp @@ -2,10 +2,10 @@ /// @file glm/mat3x2.hpp #pragma once -#include "matrix_dmat3x2.hpp" -#include "matrix_dmat3x2_precision.hpp" -#include "matrix_mat3x2.hpp" -#include "matrix_mat3x2_precision.hpp" +#include "./ext/matrix_dmat3x2.hpp" +#include "./ext/matrix_dmat3x2_precision.hpp" +#include "./ext/matrix_mat3x2.hpp" +#include "./ext/matrix_mat3x2_precision.hpp" namespace glm { diff --git a/glm/mat3x3.hpp b/glm/mat3x3.hpp index a10f8bcd..065dc132 100644 --- a/glm/mat3x3.hpp +++ b/glm/mat3x3.hpp @@ -2,10 +2,10 @@ /// @file glm/mat3x3.hpp #pragma once -#include "matrix_dmat3x3.hpp" -#include "matrix_dmat3x3_precision.hpp" -#include "matrix_mat3x3.hpp" -#include "matrix_mat3x3_precision.hpp" +#include "./ext/matrix_dmat3x3.hpp" +#include "./ext/matrix_dmat3x3_precision.hpp" +#include "./ext/matrix_mat3x3.hpp" +#include "./ext/matrix_mat3x3_precision.hpp" namespace glm { diff --git a/glm/mat3x4.hpp b/glm/mat3x4.hpp index 0975e2e3..0b55ae52 100644 --- a/glm/mat3x4.hpp +++ b/glm/mat3x4.hpp @@ -2,10 +2,10 @@ /// @file glm/mat3x4.hpp #pragma once -#include "matrix_dmat3x4.hpp" -#include "matrix_dmat3x4_precision.hpp" -#include "matrix_mat3x4.hpp" -#include "matrix_mat3x4_precision.hpp" +#include "./ext/matrix_dmat3x4.hpp" +#include "./ext/matrix_dmat3x4_precision.hpp" +#include "./ext/matrix_mat3x4.hpp" +#include "./ext/matrix_mat3x4_precision.hpp" namespace glm { diff --git a/glm/mat4x2.hpp b/glm/mat4x2.hpp index 883283da..77f2cf1f 100644 --- a/glm/mat4x2.hpp +++ b/glm/mat4x2.hpp @@ -2,10 +2,10 @@ /// @file glm/mat4x2.hpp #pragma once -#include "matrix_dmat4x2.hpp" -#include "matrix_dmat4x2_precision.hpp" -#include "matrix_mat4x2.hpp" -#include "matrix_mat4x2_precision.hpp" +#include "./ext/matrix_dmat4x2.hpp" +#include "./ext/matrix_dmat4x2_precision.hpp" +#include "./ext/matrix_mat4x2.hpp" +#include "./ext/matrix_mat4x2_precision.hpp" namespace glm { diff --git a/glm/mat4x3.hpp b/glm/mat4x3.hpp index 62518422..adcfba4b 100644 --- a/glm/mat4x3.hpp +++ b/glm/mat4x3.hpp @@ -2,10 +2,10 @@ /// @file glm/mat4x3.hpp #pragma once -#include "matrix_dmat4x3.hpp" -#include "matrix_dmat4x3_precision.hpp" -#include "matrix_mat4x3.hpp" -#include "matrix_mat4x3_precision.hpp" +#include "./ext/matrix_dmat4x3.hpp" +#include "./ext/matrix_dmat4x3_precision.hpp" +#include "./ext/matrix_mat4x3.hpp" +#include "./ext/matrix_mat4x3_precision.hpp" namespace glm { diff --git a/glm/mat4x4.hpp b/glm/mat4x4.hpp index fd41eb8d..b0ab8c39 100644 --- a/glm/mat4x4.hpp +++ b/glm/mat4x4.hpp @@ -2,10 +2,10 @@ /// @file glm/mat4x4.hpp #pragma once -#include "matrix_dmat4x4.hpp" -#include "matrix_dmat4x4_precision.hpp" -#include "matrix_mat4x4.hpp" -#include "matrix_mat4x4_precision.hpp" +#include "./ext/matrix_dmat4x4.hpp" +#include "./ext/matrix_dmat4x4_precision.hpp" +#include "./ext/matrix_mat4x4.hpp" +#include "./ext/matrix_mat4x4_precision.hpp" namespace glm { diff --git a/glm/packing.hpp b/glm/packing.hpp index b2e55307..dc9ef4ae 100644 --- a/glm/packing.hpp +++ b/glm/packing.hpp @@ -13,9 +13,9 @@ #pragma once -#include "vector_uvec2.hpp" -#include "vector_vec2.hpp" -#include "vector_vec4.hpp" +#include "./ext/vector_uvec2.hpp" +#include "./ext/vector_vec2.hpp" +#include "./ext/vector_vec4.hpp" namespace glm { diff --git a/glm/vec2.hpp b/glm/vec2.hpp index 0abb69c4..44c4f9c2 100644 --- a/glm/vec2.hpp +++ b/glm/vec2.hpp @@ -2,16 +2,16 @@ /// @file glm/vec2.hpp #pragma once -#include "vector_bvec2.hpp" -#include "vector_bvec2_precision.hpp" -#include "vector_vec2.hpp" -#include "vector_vec2_precision.hpp" -#include "vector_dvec2.hpp" -#include "vector_dvec2_precision.hpp" -#include "vector_ivec2.hpp" -#include "vector_ivec2_precision.hpp" -#include "vector_uvec2.hpp" -#include "vector_uvec2_precision.hpp" +#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 { diff --git a/glm/vec3.hpp b/glm/vec3.hpp index 26287022..a3e9dc33 100644 --- a/glm/vec3.hpp +++ b/glm/vec3.hpp @@ -2,16 +2,16 @@ /// @file glm/vec3.hpp #pragma once -#include "vector_bvec3.hpp" -#include "vector_bvec3_precision.hpp" -#include "vector_vec3.hpp" -#include "vector_vec3_precision.hpp" -#include "vector_dvec3.hpp" -#include "vector_dvec3_precision.hpp" -#include "vector_ivec3.hpp" -#include "vector_ivec3_precision.hpp" -#include "vector_uvec3.hpp" -#include "vector_uvec3_precision.hpp" +#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 { diff --git a/glm/vec4.hpp b/glm/vec4.hpp index 673ff0b1..37dfd7e0 100644 --- a/glm/vec4.hpp +++ b/glm/vec4.hpp @@ -2,16 +2,16 @@ /// @file glm/vec4.hpp #pragma once -#include "vector_bvec4.hpp" -#include "vector_bvec4_precision.hpp" -#include "vector_vec4.hpp" -#include "vector_vec4_precision.hpp" -#include "vector_dvec4.hpp" -#include "vector_dvec4_precision.hpp" -#include "vector_ivec4.hpp" -#include "vector_ivec4_precision.hpp" -#include "vector_uvec4.hpp" -#include "vector_uvec4_precision.hpp" +#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 { diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp index c6055e93..f7212090 100644 --- a/test/core/core_func_common.cpp +++ b/test/core/core_func_common.cpp @@ -1,12 +1,10 @@ #define GLM_FORCE_EXPLICIT_CTOR +#include +#include #include #include +#include #include -#include -#include -#include -#include -#include #include #include #include diff --git a/test/core/core_func_geometric.cpp b/test/core/core_func_geometric.cpp index c415b26d..5780c800 100644 --- a/test/core/core_func_geometric.cpp +++ b/test/core/core_func_geometric.cpp @@ -3,12 +3,12 @@ #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 e3747cf1..bbc38e9c 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -1,11 +1,11 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/test/ext/ext_matrix_relational.cpp b/test/ext/ext_matrix_relational.cpp index 3e2d0408..9846c267 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_vector_dvec1.cpp b/test/ext/ext_vector_dvec1.cpp index 4289b012..de57e68f 100644 --- a/test/ext/ext_vector_dvec1.cpp +++ b/test/ext/ext_vector_dvec1.cpp @@ -3,9 +3,9 @@ #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 de2378b1..4af58a5d 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 template diff --git a/test/ext/ext_vector_uvec1.cpp b/test/ext/ext_vector_uvec1.cpp index 48245385..b15d27b5 100644 --- a/test/ext/ext_vector_uvec1.cpp +++ b/test/ext/ext_vector_uvec1.cpp @@ -1,9 +1,9 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include template static int test_operators() diff --git a/test/ext/ext_vector_vec1.cpp b/test/ext/ext_vector_vec1.cpp index 4835b7f8..81217872 100644 --- a/test/ext/ext_vector_vec1.cpp +++ b/test/ext/ext_vector_vec1.cpp @@ -2,9 +2,9 @@ #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 f7c6f637..46aea526 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()