diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt index 1b9ac8e1..79a46074 100644 --- a/glm/CMakeLists.txt +++ b/glm/CMakeLists.txt @@ -5,9 +5,9 @@ file(GLOB ROOT_INLINE *.inl) file(GLOB ROOT_HEADER *.hpp) file(GLOB ROOT_TEXT ../*.txt) -file(GLOB_RECURSE CORE_SOURCE ./core/*.cpp) -file(GLOB_RECURSE CORE_INLINE ./core/*.inl) -file(GLOB_RECURSE CORE_HEADER ./core/*.hpp) +file(GLOB_RECURSE CORE_SOURCE ./detail/*.cpp) +file(GLOB_RECURSE CORE_INLINE ./detail/*.inl) +file(GLOB_RECURSE CORE_HEADER ./detail/*.hpp) file(GLOB_RECURSE GTC_SOURCE ./gtc/*.cpp) file(GLOB_RECURSE GTC_INLINE ./gtc/*.inl) @@ -17,10 +17,6 @@ file(GLOB_RECURSE GTX_SOURCE ./gtx/*.cpp) file(GLOB_RECURSE GTX_INLINE ./gtx/*.inl) file(GLOB_RECURSE GTX_HEADER ./gtx/*.hpp) -file(GLOB_RECURSE VIRTREV_SOURCE ./virtrev/*.cpp) -file(GLOB_RECURSE VIRTREV_INLINE ./virtrev/*.inl) -file(GLOB_RECURSE VIRTREV_HEADER ./virtrev/*.hpp) - source_group("Text Files" FILES ${ROOT_TEXT}) source_group("Core Files" FILES ${CORE_SOURCE}) source_group("Core Files" FILES ${CORE_INLINE}) @@ -31,9 +27,6 @@ source_group("GTC Files" FILES ${GTC_HEADER}) source_group("GTX Files" FILES ${GTX_SOURCE}) source_group("GTX Files" FILES ${GTX_INLINE}) source_group("GTX Files" FILES ${GTX_HEADER}) -source_group("VIRTREV Files" FILES ${VIRTREV_SOURCE}) -source_group("VIRTREV Files" FILES ${VIRTREV_INLINE}) -source_group("VIRTREV Files" FILES ${VIRTREV_HEADER}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) @@ -41,8 +34,7 @@ add_executable(${NAME} ${ROOT_TEXT} ${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER} ${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER} ${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER} - ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER} - ${VIRTREV_SOURCE} ${VIRTREV_INLINE} ${VIRTREV_HEADER}) + ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER}) -add_library(glm STATIC glm.cpp) -add_library(glm_shared SHARED glm.cpp) +#add_library(glm STATIC glm.cpp) +#add_library(glm_shared SHARED glm.cpp) diff --git a/glm/common.hpp b/glm/common.hpp index cc5b35ba..db2547ce 100644 --- a/glm/common.hpp +++ b/glm/common.hpp @@ -29,6 +29,6 @@ #ifndef GLM_COMMON_INCLUDED #define GLM_COMMON_INCLUDED -#include "core/func_common.hpp" +#include "detail/func_common.hpp" #endif//GLM_COMMON_INCLUDED diff --git a/glm/core/_features.hpp b/glm/detail/_features.hpp similarity index 100% rename from glm/core/_features.hpp rename to glm/detail/_features.hpp diff --git a/glm/core/_fixes.hpp b/glm/detail/_fixes.hpp similarity index 100% rename from glm/core/_fixes.hpp rename to glm/detail/_fixes.hpp diff --git a/glm/core/_literals.hpp b/glm/detail/_literals.hpp similarity index 100% rename from glm/core/_literals.hpp rename to glm/detail/_literals.hpp diff --git a/glm/core/_swizzle.hpp b/glm/detail/_swizzle.hpp similarity index 100% rename from glm/core/_swizzle.hpp rename to glm/detail/_swizzle.hpp diff --git a/glm/core/_swizzle_func.hpp b/glm/detail/_swizzle_func.hpp similarity index 100% rename from glm/core/_swizzle_func.hpp rename to glm/detail/_swizzle_func.hpp diff --git a/glm/core/_vectorize.hpp b/glm/detail/_vectorize.hpp similarity index 100% rename from glm/core/_vectorize.hpp rename to glm/detail/_vectorize.hpp diff --git a/glm/core/dummy.cpp b/glm/detail/dummy.cpp similarity index 100% rename from glm/core/dummy.cpp rename to glm/detail/dummy.cpp diff --git a/glm/core/func_common.hpp b/glm/detail/func_common.hpp similarity index 100% rename from glm/core/func_common.hpp rename to glm/detail/func_common.hpp diff --git a/glm/core/func_common.inl b/glm/detail/func_common.inl similarity index 100% rename from glm/core/func_common.inl rename to glm/detail/func_common.inl diff --git a/glm/core/func_exponential.hpp b/glm/detail/func_exponential.hpp similarity index 100% rename from glm/core/func_exponential.hpp rename to glm/detail/func_exponential.hpp diff --git a/glm/core/func_exponential.inl b/glm/detail/func_exponential.inl similarity index 99% rename from glm/core/func_exponential.inl rename to glm/detail/func_exponential.inl index 9c03129e..45367456 100644 --- a/glm/core/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -30,6 +30,7 @@ #include "_vectorize.hpp" #include #include +#include namespace glm { diff --git a/glm/core/func_geometric.hpp b/glm/detail/func_geometric.hpp similarity index 100% rename from glm/core/func_geometric.hpp rename to glm/detail/func_geometric.hpp diff --git a/glm/core/func_geometric.inl b/glm/detail/func_geometric.inl similarity index 100% rename from glm/core/func_geometric.inl rename to glm/detail/func_geometric.inl diff --git a/glm/core/func_integer.hpp b/glm/detail/func_integer.hpp similarity index 100% rename from glm/core/func_integer.hpp rename to glm/detail/func_integer.hpp diff --git a/glm/core/func_integer.inl b/glm/detail/func_integer.inl similarity index 100% rename from glm/core/func_integer.inl rename to glm/detail/func_integer.inl diff --git a/glm/core/func_matrix.hpp b/glm/detail/func_matrix.hpp similarity index 100% rename from glm/core/func_matrix.hpp rename to glm/detail/func_matrix.hpp diff --git a/glm/core/func_matrix.inl b/glm/detail/func_matrix.inl similarity index 100% rename from glm/core/func_matrix.inl rename to glm/detail/func_matrix.inl diff --git a/glm/core/func_noise.hpp b/glm/detail/func_noise.hpp similarity index 100% rename from glm/core/func_noise.hpp rename to glm/detail/func_noise.hpp diff --git a/glm/core/func_noise.inl b/glm/detail/func_noise.inl similarity index 100% rename from glm/core/func_noise.inl rename to glm/detail/func_noise.inl diff --git a/glm/core/func_packing.hpp b/glm/detail/func_packing.hpp similarity index 100% rename from glm/core/func_packing.hpp rename to glm/detail/func_packing.hpp diff --git a/glm/core/func_packing.inl b/glm/detail/func_packing.inl similarity index 100% rename from glm/core/func_packing.inl rename to glm/detail/func_packing.inl diff --git a/glm/core/func_trigonometric.hpp b/glm/detail/func_trigonometric.hpp similarity index 100% rename from glm/core/func_trigonometric.hpp rename to glm/detail/func_trigonometric.hpp diff --git a/glm/core/func_trigonometric.inl b/glm/detail/func_trigonometric.inl similarity index 100% rename from glm/core/func_trigonometric.inl rename to glm/detail/func_trigonometric.inl diff --git a/glm/core/func_vector_relational.hpp b/glm/detail/func_vector_relational.hpp similarity index 100% rename from glm/core/func_vector_relational.hpp rename to glm/detail/func_vector_relational.hpp diff --git a/glm/core/func_vector_relational.inl b/glm/detail/func_vector_relational.inl similarity index 100% rename from glm/core/func_vector_relational.inl rename to glm/detail/func_vector_relational.inl diff --git a/glm/glm.cpp b/glm/detail/glm.cpp similarity index 100% rename from glm/glm.cpp rename to glm/detail/glm.cpp diff --git a/glm/core/hint.hpp b/glm/detail/hint.hpp similarity index 100% rename from glm/core/hint.hpp rename to glm/detail/hint.hpp diff --git a/glm/core/intrinsic_common.hpp b/glm/detail/intrinsic_common.hpp similarity index 100% rename from glm/core/intrinsic_common.hpp rename to glm/detail/intrinsic_common.hpp diff --git a/glm/core/intrinsic_common.inl b/glm/detail/intrinsic_common.inl similarity index 100% rename from glm/core/intrinsic_common.inl rename to glm/detail/intrinsic_common.inl diff --git a/glm/core/intrinsic_exponential.hpp b/glm/detail/intrinsic_exponential.hpp similarity index 100% rename from glm/core/intrinsic_exponential.hpp rename to glm/detail/intrinsic_exponential.hpp diff --git a/glm/core/intrinsic_exponential.inl b/glm/detail/intrinsic_exponential.inl similarity index 100% rename from glm/core/intrinsic_exponential.inl rename to glm/detail/intrinsic_exponential.inl diff --git a/glm/core/intrinsic_geometric.hpp b/glm/detail/intrinsic_geometric.hpp similarity index 100% rename from glm/core/intrinsic_geometric.hpp rename to glm/detail/intrinsic_geometric.hpp diff --git a/glm/core/intrinsic_geometric.inl b/glm/detail/intrinsic_geometric.inl similarity index 100% rename from glm/core/intrinsic_geometric.inl rename to glm/detail/intrinsic_geometric.inl diff --git a/glm/core/intrinsic_integer.hpp b/glm/detail/intrinsic_integer.hpp similarity index 100% rename from glm/core/intrinsic_integer.hpp rename to glm/detail/intrinsic_integer.hpp diff --git a/glm/core/intrinsic_integer.inl b/glm/detail/intrinsic_integer.inl similarity index 100% rename from glm/core/intrinsic_integer.inl rename to glm/detail/intrinsic_integer.inl diff --git a/glm/core/intrinsic_matrix.hpp b/glm/detail/intrinsic_matrix.hpp similarity index 100% rename from glm/core/intrinsic_matrix.hpp rename to glm/detail/intrinsic_matrix.hpp diff --git a/glm/core/intrinsic_matrix.inl b/glm/detail/intrinsic_matrix.inl similarity index 100% rename from glm/core/intrinsic_matrix.inl rename to glm/detail/intrinsic_matrix.inl diff --git a/glm/core/intrinsic_trigonometric.hpp b/glm/detail/intrinsic_trigonometric.hpp similarity index 100% rename from glm/core/intrinsic_trigonometric.hpp rename to glm/detail/intrinsic_trigonometric.hpp diff --git a/glm/core/intrinsic_trigonometric.inl b/glm/detail/intrinsic_trigonometric.inl similarity index 100% rename from glm/core/intrinsic_trigonometric.inl rename to glm/detail/intrinsic_trigonometric.inl diff --git a/glm/core/intrinsic_vector_relational.hpp b/glm/detail/intrinsic_vector_relational.hpp similarity index 100% rename from glm/core/intrinsic_vector_relational.hpp rename to glm/detail/intrinsic_vector_relational.hpp diff --git a/glm/core/intrinsic_vector_relational.inl b/glm/detail/intrinsic_vector_relational.inl similarity index 100% rename from glm/core/intrinsic_vector_relational.inl rename to glm/detail/intrinsic_vector_relational.inl diff --git a/glm/core/precision.hpp b/glm/detail/precision.hpp similarity index 100% rename from glm/core/precision.hpp rename to glm/detail/precision.hpp diff --git a/glm/core/precision.inl b/glm/detail/precision.inl similarity index 100% rename from glm/core/precision.inl rename to glm/detail/precision.inl diff --git a/glm/core/setup.hpp b/glm/detail/setup.hpp similarity index 100% rename from glm/core/setup.hpp rename to glm/detail/setup.hpp diff --git a/glm/core/type_float.hpp b/glm/detail/type_float.hpp similarity index 100% rename from glm/core/type_float.hpp rename to glm/detail/type_float.hpp diff --git a/glm/core/type_gentype.hpp b/glm/detail/type_gentype.hpp similarity index 100% rename from glm/core/type_gentype.hpp rename to glm/detail/type_gentype.hpp diff --git a/glm/core/type_gentype.inl b/glm/detail/type_gentype.inl similarity index 100% rename from glm/core/type_gentype.inl rename to glm/detail/type_gentype.inl diff --git a/glm/core/type_half.hpp b/glm/detail/type_half.hpp similarity index 100% rename from glm/core/type_half.hpp rename to glm/detail/type_half.hpp diff --git a/glm/core/type_half.inl b/glm/detail/type_half.inl similarity index 100% rename from glm/core/type_half.inl rename to glm/detail/type_half.inl diff --git a/glm/core/type_int.hpp b/glm/detail/type_int.hpp similarity index 100% rename from glm/core/type_int.hpp rename to glm/detail/type_int.hpp diff --git a/glm/core/type_mat.hpp b/glm/detail/type_mat.hpp similarity index 100% rename from glm/core/type_mat.hpp rename to glm/detail/type_mat.hpp diff --git a/glm/core/type_mat.inl b/glm/detail/type_mat.inl similarity index 100% rename from glm/core/type_mat.inl rename to glm/detail/type_mat.inl diff --git a/glm/core/type_mat2x2.hpp b/glm/detail/type_mat2x2.hpp similarity index 100% rename from glm/core/type_mat2x2.hpp rename to glm/detail/type_mat2x2.hpp diff --git a/glm/core/type_mat2x2.inl b/glm/detail/type_mat2x2.inl similarity index 100% rename from glm/core/type_mat2x2.inl rename to glm/detail/type_mat2x2.inl diff --git a/glm/core/type_mat2x3.hpp b/glm/detail/type_mat2x3.hpp similarity index 100% rename from glm/core/type_mat2x3.hpp rename to glm/detail/type_mat2x3.hpp diff --git a/glm/core/type_mat2x3.inl b/glm/detail/type_mat2x3.inl similarity index 100% rename from glm/core/type_mat2x3.inl rename to glm/detail/type_mat2x3.inl diff --git a/glm/core/type_mat2x4.hpp b/glm/detail/type_mat2x4.hpp similarity index 100% rename from glm/core/type_mat2x4.hpp rename to glm/detail/type_mat2x4.hpp diff --git a/glm/core/type_mat2x4.inl b/glm/detail/type_mat2x4.inl similarity index 100% rename from glm/core/type_mat2x4.inl rename to glm/detail/type_mat2x4.inl diff --git a/glm/core/type_mat3x2.hpp b/glm/detail/type_mat3x2.hpp similarity index 100% rename from glm/core/type_mat3x2.hpp rename to glm/detail/type_mat3x2.hpp diff --git a/glm/core/type_mat3x2.inl b/glm/detail/type_mat3x2.inl similarity index 100% rename from glm/core/type_mat3x2.inl rename to glm/detail/type_mat3x2.inl diff --git a/glm/core/type_mat3x3.hpp b/glm/detail/type_mat3x3.hpp similarity index 100% rename from glm/core/type_mat3x3.hpp rename to glm/detail/type_mat3x3.hpp diff --git a/glm/core/type_mat3x3.inl b/glm/detail/type_mat3x3.inl similarity index 100% rename from glm/core/type_mat3x3.inl rename to glm/detail/type_mat3x3.inl diff --git a/glm/core/type_mat3x4.hpp b/glm/detail/type_mat3x4.hpp similarity index 100% rename from glm/core/type_mat3x4.hpp rename to glm/detail/type_mat3x4.hpp diff --git a/glm/core/type_mat3x4.inl b/glm/detail/type_mat3x4.inl similarity index 100% rename from glm/core/type_mat3x4.inl rename to glm/detail/type_mat3x4.inl diff --git a/glm/core/type_mat4x2.hpp b/glm/detail/type_mat4x2.hpp similarity index 100% rename from glm/core/type_mat4x2.hpp rename to glm/detail/type_mat4x2.hpp diff --git a/glm/core/type_mat4x2.inl b/glm/detail/type_mat4x2.inl similarity index 100% rename from glm/core/type_mat4x2.inl rename to glm/detail/type_mat4x2.inl diff --git a/glm/core/type_mat4x3.hpp b/glm/detail/type_mat4x3.hpp similarity index 100% rename from glm/core/type_mat4x3.hpp rename to glm/detail/type_mat4x3.hpp diff --git a/glm/core/type_mat4x3.inl b/glm/detail/type_mat4x3.inl similarity index 100% rename from glm/core/type_mat4x3.inl rename to glm/detail/type_mat4x3.inl diff --git a/glm/core/type_mat4x4.hpp b/glm/detail/type_mat4x4.hpp similarity index 100% rename from glm/core/type_mat4x4.hpp rename to glm/detail/type_mat4x4.hpp diff --git a/glm/core/type_mat4x4.inl b/glm/detail/type_mat4x4.inl similarity index 100% rename from glm/core/type_mat4x4.inl rename to glm/detail/type_mat4x4.inl diff --git a/glm/core/type_vec.hpp b/glm/detail/type_vec.hpp similarity index 100% rename from glm/core/type_vec.hpp rename to glm/detail/type_vec.hpp diff --git a/glm/core/type_vec.inl b/glm/detail/type_vec.inl similarity index 100% rename from glm/core/type_vec.inl rename to glm/detail/type_vec.inl diff --git a/glm/core/type_vec1.hpp b/glm/detail/type_vec1.hpp similarity index 100% rename from glm/core/type_vec1.hpp rename to glm/detail/type_vec1.hpp diff --git a/glm/core/type_vec1.inl b/glm/detail/type_vec1.inl similarity index 100% rename from glm/core/type_vec1.inl rename to glm/detail/type_vec1.inl diff --git a/glm/core/type_vec2.hpp b/glm/detail/type_vec2.hpp similarity index 100% rename from glm/core/type_vec2.hpp rename to glm/detail/type_vec2.hpp diff --git a/glm/core/type_vec2.inl b/glm/detail/type_vec2.inl similarity index 100% rename from glm/core/type_vec2.inl rename to glm/detail/type_vec2.inl diff --git a/glm/core/type_vec3.hpp b/glm/detail/type_vec3.hpp similarity index 100% rename from glm/core/type_vec3.hpp rename to glm/detail/type_vec3.hpp diff --git a/glm/core/type_vec3.inl b/glm/detail/type_vec3.inl similarity index 100% rename from glm/core/type_vec3.inl rename to glm/detail/type_vec3.inl diff --git a/glm/core/type_vec4.hpp b/glm/detail/type_vec4.hpp similarity index 100% rename from glm/core/type_vec4.hpp rename to glm/detail/type_vec4.hpp diff --git a/glm/core/type_vec4.inl b/glm/detail/type_vec4.inl similarity index 100% rename from glm/core/type_vec4.inl rename to glm/detail/type_vec4.inl diff --git a/glm/exponential.hpp b/glm/exponential.hpp index 733c54c8..20165df3 100644 --- a/glm/exponential.hpp +++ b/glm/exponential.hpp @@ -29,6 +29,6 @@ #ifndef GLM_EXPONENTIAL_INCLUDED #define GLM_EXPONENTIAL_INCLUDED -#include "core/func_exponential.hpp" +#include "detail/func_exponential.hpp" #endif//GLM_EXPONENTIAL_INCLUDED diff --git a/glm/ext.hpp b/glm/ext.hpp index 2e491766..656fba11 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -55,8 +55,8 @@ /// (http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showprofile&User=22660). /////////////////////////////////////////////////////////////////////////////////// -#ifndef glm_ext -#define glm_ext +#ifndef GLM_EXT_INCLUDED +#define GLM_EXT_INCLUDED #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED)) # define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED @@ -133,9 +133,4 @@ # include "./gtx/simd_mat4.hpp" #endif -#include "./virtrev/xstream.hpp" - -//const float goldenRatio = 1.618033988749894848f; -//const float pi = 3.141592653589793238f; - -#endif //glm_ext +#endif //GLM_EXT_INCLUDED diff --git a/glm/fwd.hpp b/glm/fwd.hpp index 326de73e..f9567c2a 100644 --- a/glm/fwd.hpp +++ b/glm/fwd.hpp @@ -29,10 +29,10 @@ #ifndef GLM_FWD_INCLUDED #define GLM_FWD_INCLUDED -#include "core/type_int.hpp" -#include "core/type_float.hpp" -#include "core/type_vec.hpp" -#include "core/type_mat.hpp" +#include "detail/type_int.hpp" +#include "detail/type_float.hpp" +#include "detail/type_vec.hpp" +#include "detail/type_mat.hpp" ////////////////////// // GLM_GTC_quaternion diff --git a/glm/geometric.hpp b/glm/geometric.hpp index b586fe6f..6c874e3b 100644 --- a/glm/geometric.hpp +++ b/glm/geometric.hpp @@ -29,6 +29,6 @@ #ifndef GLM_GEOMETRIC_INCLUDED #define GLM_GEOMETRIC_INCLUDED -#include "core/func_geometric.hpp" +#include "detail/func_geometric.hpp" #endif//GLM_GEOMETRIC_INCLUDED diff --git a/glm/glm.hpp b/glm/glm.hpp index 7d28b3a4..9efabe20 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -75,10 +75,10 @@ /// @ingroup core /////////////////////////////////////////////////////////////////////////////////// -#include "core/_fixes.hpp" +#include "detail/_fixes.hpp" -#ifndef glm_glm -#define glm_glm +#ifndef GLM_INCLUDED +#define GLM_INCLUDED #include #include @@ -92,14 +92,14 @@ # pragma message("GLM: Core library included") #endif//GLM_MESSAGE -#include "./core/func_trigonometric.hpp" -#include "./core/func_exponential.hpp" -#include "./core/func_common.hpp" -#include "./core/func_packing.hpp" -#include "./core/func_geometric.hpp" -#include "./core/func_matrix.hpp" -#include "./core/func_vector_relational.hpp" -#include "./core/func_integer.hpp" -#include "./core/func_noise.hpp" +#include "./detail/func_trigonometric.hpp" +#include "./detail/func_exponential.hpp" +#include "./detail/func_common.hpp" +#include "./detail/func_packing.hpp" +#include "./detail/func_geometric.hpp" +#include "./detail/func_matrix.hpp" +#include "./detail/func_vector_relational.hpp" +#include "./detail/func_integer.hpp" +#include "./detail/func_noise.hpp" -#endif//glm_glm +#endif//GLM_INCLUDED diff --git a/glm/gtc/angle.hpp b/glm/gtc/angle.hpp index f7b41374..9b17124f 100644 --- a/glm/gtc/angle.hpp +++ b/glm/gtc/angle.hpp @@ -37,7 +37,11 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_angle -#define GLM_GTC_angle GLM_VERSION +#define GLM_GTC_angle + +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +# pragma message("GLM: GLM_GTC_angle extension included") +#endif namespace glm { diff --git a/glm/gtc/constants.hpp b/glm/gtc/constants.hpp index 45367cf0..cf0235b6 100644 --- a/glm/gtc/constants.hpp +++ b/glm/gtc/constants.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_constants -#define GLM_GTC_constants GLM_VERSION +#define GLM_GTC_constants // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_constants extension included") #endif diff --git a/glm/gtc/epsilon.hpp b/glm/gtc/epsilon.hpp index d37d9c54..92b65939 100644 --- a/glm/gtc/epsilon.hpp +++ b/glm/gtc/epsilon.hpp @@ -38,13 +38,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_epsilon -#define GLM_GTC_epsilon GLM_VERSION +#define GLM_GTC_epsilon // Dependency: #include "../glm.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_epsilon extension included") #endif diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index 84839fd5..04a99f81 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -35,12 +35,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_access -#define GLM_GTC_matrix_access GLM_VERSION +#define GLM_GTC_matrix_access // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_matrix_access extension included") #endif diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index da8272c0..dc7f2df6 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -35,12 +35,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_integer -#define GLM_GTC_matrix_integer GLM_VERSION +#define GLM_GTC_matrix_integer // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_matrix_integer extension included") #endif diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp index 6ccfe352..5785b699 100644 --- a/glm/gtc/matrix_inverse.hpp +++ b/glm/gtc/matrix_inverse.hpp @@ -35,12 +35,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_inverse -#define GLM_GTC_matrix_inverse GLM_VERSION +#define GLM_GTC_matrix_inverse // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_matrix_inverse extension included") #endif diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index dfe12219..2d7d878e 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -44,12 +44,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_transform -#define GLM_GTC_matrix_transform GLM_VERSION +#define GLM_GTC_matrix_transform // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_matrix_transform extension included") #endif diff --git a/glm/gtc/noise.hpp b/glm/gtc/noise.hpp index f30a2f25..9fd157db 100644 --- a/glm/gtc/noise.hpp +++ b/glm/gtc/noise.hpp @@ -39,12 +39,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_noise -#define GLM_GTC_noise GLM_VERSION +#define GLM_GTC_noise // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_noise extension included") #endif diff --git a/glm/gtc/packing.hpp b/glm/gtc/packing.hpp index 9433d54e..2db41e6b 100644 --- a/glm/gtc/packing.hpp +++ b/glm/gtc/packing.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_packing -#define GLM_GTC_packing GLM_VERSION +#define GLM_GTC_packing // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_packing extension included") #endif diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index cc3c76ad..7bcd5a40 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -38,13 +38,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_quaternion -#define GLM_GTC_quaternion GLM_VERSION +#define GLM_GTC_quaternion // Dependency: #include "../glm.hpp" #include "../gtc/constants.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_quaternion extension included") #endif diff --git a/glm/gtc/random.hpp b/glm/gtc/random.hpp index 6748cfab..2e5dbc11 100644 --- a/glm/gtc/random.hpp +++ b/glm/gtc/random.hpp @@ -38,12 +38,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_random -#define GLM_GTC_random GLM_VERSION +#define GLM_GTC_random // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_random extension included") #endif diff --git a/glm/gtc/reciprocal.hpp b/glm/gtc/reciprocal.hpp index 22d32c1d..8a4d00db 100644 --- a/glm/gtc/reciprocal.hpp +++ b/glm/gtc/reciprocal.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_reciprocal -#define GLM_GTC_reciprocal GLM_VERSION +#define GLM_GTC_reciprocal // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_reciprocal extension included") #endif diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp index 5894bc58..368ecbc3 100644 --- a/glm/gtc/type_precision.hpp +++ b/glm/gtc/type_precision.hpp @@ -41,13 +41,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_type_precision -#define GLM_GTC_type_precision GLM_VERSION +#define GLM_GTC_type_precision // Dependency: #include "../glm.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_type_precision extension included") #endif diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index c7736f8a..adae75d1 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -57,14 +57,14 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_type_ptr -#define GLM_GTC_type_ptr GLM_VERSION +#define GLM_GTC_type_ptr // Dependency: #include "../glm.hpp" #include "../gtc/quaternion.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_type_ptr extension included") #endif diff --git a/glm/gtc/ulp.hpp b/glm/gtc/ulp.hpp index 4cbb175d..eadd5156 100644 --- a/glm/gtc/ulp.hpp +++ b/glm/gtc/ulp.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_ulp -#define GLM_GTC_ulp GLM_VERSION +#define GLM_GTC_ulp // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTC_ulp extension included") #endif diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 7283b695..dbf57bf5 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_associated_min_max -#define GLM_GTX_associated_min_max GLM_VERSION +#define GLM_GTX_associated_min_max // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_associated_min_max extension included") #endif diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index caa14751..4427af5f 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_bit -#define GLM_GTX_bit GLM_VERSION +#define GLM_GTX_bit // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_bit extension included") #endif diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index 787ee1aa..eac3725a 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_closest_point -#define GLM_GTX_closest_point GLM_VERSION +#define GLM_GTX_closest_point // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_closest_point extension included") #endif diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index 6c32cfb9..1554a164 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_color_space -#define GLM_GTX_color_space GLM_VERSION +#define GLM_GTX_color_space // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_color_space extension included") #endif diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index 1ab96149..bb12a98b 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef glm_gtx_color_space_YCoCg -#define glm_gtx_color_space_YCoCg GLM_VERSION +#define glm_gtx_color_space_YCoCg // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_color_space_YCoCg extension included") #endif diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index 8e076a78..3a39ae3a 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_compatibility -#define GLM_GTX_compatibility GLM_VERSION +#define GLM_GTX_compatibility // Dependency: #include "../glm.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_compatibility extension included") #endif diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index d3274be7..2440301c 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_component_wise -#define GLM_GTX_component_wise GLM_VERSION +#define GLM_GTX_component_wise // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_component_wise extension included") #endif diff --git a/glm/gtx/constants.hpp b/glm/gtx/constants.hpp index 78356ffa..818fba39 100644 --- a/glm/gtx/constants.hpp +++ b/glm/gtx/constants.hpp @@ -22,7 +22,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_constants -#define GLM_GTX_constants GLM_VERSION +#define GLM_GTX_constants #include "../gtc/constants.hpp" diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index e22d124a..b99150df 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -39,14 +39,14 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_dual_quaternion -#define GLM_GTX_dual_quaternion GLM_VERSION +#define GLM_GTX_dual_quaternion // Dependency: #include "../glm.hpp" #include "../gtc/constants.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_dual_quaternion extension included") #endif diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index d16afff6..6d99c889 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_euler_angles -#define GLM_GTX_euler_angles GLM_VERSION +#define GLM_GTX_euler_angles // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_euler_angles extension included") #endif diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index 8b3afe14..b388bd29 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_extend -#define GLM_GTX_extend GLM_VERSION +#define GLM_GTX_extend // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_extend extension included") #endif diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp index b9c4c7c9..9dafa811 100644 --- a/glm/gtx/extented_min_max.hpp +++ b/glm/gtx/extented_min_max.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_extented_min_max -#define GLM_GTX_extented_min_max GLM_VERSION +#define GLM_GTX_extented_min_max // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_extented_min_max extension included") #endif diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index c3c29c45..f2b1e73b 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_fast_exponential -#define GLM_GTX_fast_exponential GLM_VERSION +#define GLM_GTX_fast_exponential // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_fast_exponential extension included") #endif diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index a49ae947..8a67111a 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -38,12 +38,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_fast_square_root -#define GLM_GTX_fast_square_root GLM_VERSION +#define GLM_GTX_fast_square_root // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_fast_square_root extension included") #endif diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index 16f326d8..edab7283 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_fast_trigonometry -#define GLM_GTX_fast_trigonometry GLM_VERSION +#define GLM_GTX_fast_trigonometry // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_fast_trigonometry extension included") #endif diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 993b1795..1a9276ba 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -36,13 +36,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_gradient_paint -#define GLM_GTX_gradient_paint GLM_VERSION +#define GLM_GTX_gradient_paint // Dependency: #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_gradient_paint extension included") #endif diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index 6a1e7aa8..2fa8bba2 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_handed_coordinate_space -#define GLM_GTX_handed_coordinate_space GLM_VERSION +#define GLM_GTX_handed_coordinate_space // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_handed_coordinate_space extension included") #endif diff --git a/glm/gtx/inertia.hpp b/glm/gtx/inertia.hpp index 6cf9b334..ffe9cdb6 100644 --- a/glm/gtx/inertia.hpp +++ b/glm/gtx/inertia.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_inertia -#define GLM_GTX_inertia GLM_VERSION +#define GLM_GTX_inertia // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_inertia extension included") #endif diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp index f67a665a..006f2f22 100644 --- a/glm/gtx/int_10_10_10_2.hpp +++ b/glm/gtx/int_10_10_10_2.hpp @@ -22,7 +22,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_int_10_10_10_2 -#define GLM_GTX_int_10_10_10_2 GLM_VERSION +#define GLM_GTX_int_10_10_10_2 // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index b3e21fd6..e4606c53 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_integer -#define GLM_GTX_integer GLM_VERSION +#define GLM_GTX_integer // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_integer extension included") #endif diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index e3319eec..cfc4e50c 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_intersect -#define GLM_GTX_intersect GLM_VERSION +#define GLM_GTX_intersect // Dependency: #include "../glm.hpp" #include "../gtx/closest_point.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_closest_point extension included") #endif diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index d3bcb3db..e5608712 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_io -#define GLM_GTX_io GLM_VERSION +#define GLM_GTX_io // Dependency: #include "../glm.hpp" #include "../gtx/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_io extension included") #endif diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index 0f2033e9..f743fd02 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_log_base -#define GLM_GTX_log_base GLM_VERSION +#define GLM_GTX_log_base // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_log_base extension included") #endif diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index eac96b9f..addb00d4 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_cross_product -#define GLM_GTX_matrix_cross_product GLM_VERSION +#define GLM_GTX_matrix_cross_product // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_matrix_cross_product extension included") #endif diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index daf66075..7a57e2b3 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_interpolation -#define GLM_GTX_matrix_interpolation GLM_VERSION +#define GLM_GTX_matrix_interpolation // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_matrix_interpolation extension included") #endif diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 747b7088..e8fd24ff 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_major_storage -#define GLM_GTX_matrix_major_storage GLM_VERSION +#define GLM_GTX_matrix_major_storage // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_matrix_major_storage extension included") #endif diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index 43a3de62..b9d765de 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_operation -#define GLM_GTX_matrix_operation GLM_VERSION +#define GLM_GTX_matrix_operation // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_matrix_operation extension included") #endif diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index fb546574..5342a43e 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -37,14 +37,14 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_query -#define GLM_GTX_matrix_query GLM_VERSION +#define GLM_GTX_matrix_query // Dependency: #include "../glm.hpp" #include "../gtx/vector_query.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_matrix_query extension included") #endif diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index e1bbb62a..2a1d9757 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_mixed_product -#define GLM_GTX_mixed_product GLM_VERSION +#define GLM_GTX_mixed_product // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_mixed_product extension included") #endif diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp index 25645457..9a44275e 100644 --- a/glm/gtx/multiple.hpp +++ b/glm/gtx/multiple.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_multiple -#define GLM_GTX_multiple GLM_VERSION +#define GLM_GTX_multiple // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_multiple extension included") #endif diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 1967965f..04ad054c 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_norm -#define GLM_GTX_norm GLM_VERSION +#define GLM_GTX_norm // Dependency: #include "../glm.hpp" #include "../gtx/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_norm extension included") #endif diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 1a43ab80..de5a9729 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_normal -#define GLM_GTX_normal GLM_VERSION +#define GLM_GTX_normal // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_normal extension included") #endif diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 1ba027ac..6e716f1b 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_normalize_dot -#define GLM_GTX_normalize_dot GLM_VERSION +#define GLM_GTX_normalize_dot // Dependency: #include "../glm.hpp" #include "../gtx/fast_square_root.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_normalize_dot extension included") #endif diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 7d116119..b0e209a5 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -38,13 +38,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_number_precision -#define GLM_GTX_number_precision GLM_VERSION +#define GLM_GTX_number_precision // Dependency: #include "../glm.hpp" #include "../gtc/type_precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_number_precision extension included") #endif diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index d32609bd..8b3b79f9 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_optimum_pow -#define GLM_GTX_optimum_pow GLM_VERSION +#define GLM_GTX_optimum_pow // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_optimum_pow extension included") #endif diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index d81b4e38..e79ad896 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -37,12 +37,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_orthonormalize -#define GLM_GTX_orthonormalize GLM_VERSION +#define GLM_GTX_orthonormalize // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_orthonormalize extension included") #endif diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index f6515ab9..13392607 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_perpendicular -#define GLM_GTX_perpendicular GLM_VERSION +#define GLM_GTX_perpendicular // Dependency: #include "../glm.hpp" #include "../gtx/projection.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_perpendicular extension included") #endif diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index 04a9fc0c..04cb50e4 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_polar_coordinates -#define GLM_GTX_polar_coordinates GLM_VERSION +#define GLM_GTX_polar_coordinates // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_polar_coordinates extension included") #endif diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index 6e209225..1e846d34 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_projection -#define GLM_GTX_projection GLM_VERSION +#define GLM_GTX_projection // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_projection extension included") #endif diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index e87cec39..5eecfded 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_quaternion -#define GLM_GTX_quaternion GLM_VERSION +#define GLM_GTX_quaternion // Dependency: #include "../glm.hpp" @@ -45,7 +45,7 @@ #include "../gtc/quaternion.hpp" #include "../gtx/norm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_quaternion extension included") #endif diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index 4ec6cf01..6be7f9cb 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -36,13 +36,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_raw_data -#define GLM_GTX_raw_data GLM_VERSION +#define GLM_GTX_raw_data // Dependency: #include "../glm.hpp" #include "../gtc/type_precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_raw_data extension included") #endif diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp index 38007a78..ecd7aa72 100644 --- a/glm/gtx/rotate_normalized_axis.hpp +++ b/glm/gtx/rotate_normalized_axis.hpp @@ -38,14 +38,14 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_rotate_normalized_axis -#define GLM_GTX_rotate_normalized_axis GLM_VERSION +#define GLM_GTX_rotate_normalized_axis // Dependency: #include "../glm.hpp" #include "../gtc/epsilon.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included") #endif diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index c2ccc989..e9abb5fa 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_rotate_vector -#define GLM_GTX_rotate_vector GLM_VERSION +#define GLM_GTX_rotate_vector // Dependency: #include "../glm.hpp" #include "../gtx/transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_rotate_vector extension included") #endif diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp index f1b01aa7..487c5ca2 100644 --- a/glm/gtx/scalar_relational.hpp +++ b/glm/gtx/scalar_relational.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_scalar_relational -#define GLM_GTX_scalar_relational GLM_VERSION +#define GLM_GTX_scalar_relational // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_extend extension included") #endif diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index b557eda5..ae6fe9a6 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_simd_mat4 -#define GLM_GTX_simd_mat4 GLM_VERSION +#define GLM_GTX_simd_mat4 // Dependency: #include "../glm.hpp" @@ -50,7 +50,7 @@ # error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics" #endif -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_simd_mat4 extension included") #endif diff --git a/glm/gtx/simd_quat.hpp b/glm/gtx/simd_quat.hpp index a3921cb3..c616ae3e 100644 --- a/glm/gtx/simd_quat.hpp +++ b/glm/gtx/simd_quat.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_simd_quat -#define GLM_GTX_simd_quat GLM_VERSION +#define GLM_GTX_simd_quat // Dependency: #include "../glm.hpp" @@ -53,7 +53,7 @@ # error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics" #endif -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_simd_quat extension included") #endif diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 47f6b65b..afaa702a 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_simd_vec4 -#define GLM_GTX_simd_vec4 GLM_VERSION +#define GLM_GTX_simd_vec4 // Dependency: #include "../glm.hpp" @@ -51,7 +51,7 @@ # error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" #endif -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_simd_vec4 extension included") #endif diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index f2c5e040..205db052 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -36,13 +36,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_spline -#define GLM_GTX_spline GLM_VERSION +#define GLM_GTX_spline // Dependency: #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_spline extension included") #endif diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index b2756de8..c35a04e5 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -36,13 +36,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_std_based_type -#define GLM_GTX_std_based_type GLM_VERSION +#define GLM_GTX_std_based_type // Dependency: #include "../glm.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_std_based_type extension included") #endif diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 79845a52..4738b93b 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -39,7 +39,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_string_cast -#define GLM_GTX_string_cast GLM_VERSION +#define GLM_GTX_string_cast // Dependency: #include "../glm.hpp" @@ -47,7 +47,7 @@ #include "../gtx/quaternion.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_string_cast extension included") #endif diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index 59397399..832f5c3b 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -39,13 +39,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_transform -#define GLM_GTX_transform GLM_VERSION +#define GLM_GTX_transform // Dependency: #include "../glm.hpp" #include "../gtc/matrix_transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_transform extension included") #endif diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index cdd196e4..0e3168d2 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -37,13 +37,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_transform2 -#define GLM_GTX_transform2 GLM_VERSION +#define GLM_GTX_transform2 // Dependency: #include "../glm.hpp" #include "../gtx/transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_transform2 extension included") #endif diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp index ddf9880d..468a8a66 100644 --- a/glm/gtx/vec1.hpp +++ b/glm/gtx/vec1.hpp @@ -35,13 +35,13 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vec1 -#define GLM_GTX_vec1 GLM_VERSION +#define GLM_GTX_vec1 // Dependency: #include "../glm.hpp" -#include "../core/type_vec1.hpp" +#include "../detail/type_vec1.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_vec1 extension included") #endif diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index 424c6920..4a200b73 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -38,7 +38,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vector_angle -#define GLM_GTX_vector_angle GLM_VERSION +#define GLM_GTX_vector_angle // Dependency: #include "../glm.hpp" @@ -46,7 +46,7 @@ #include "../gtx/quaternion.hpp" #include "../gtx/rotate_vector.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_vector_angle extension included") #endif diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 046badf4..724f68e6 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -36,14 +36,14 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vector_query -#define GLM_GTX_vector_query GLM_VERSION +#define GLM_GTX_vector_query // Dependency: #include "../glm.hpp" #include #include -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_vector_query extension included") #endif diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index cf4e991f..ceeb3d5e 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -36,12 +36,12 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_wrap -#define GLM_GTX_wrap GLM_VERSION +#define GLM_GTX_wrap // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_wrap extension included") #endif diff --git a/glm/integer.hpp b/glm/integer.hpp index 68767f76..f421fe4d 100644 --- a/glm/integer.hpp +++ b/glm/integer.hpp @@ -29,6 +29,6 @@ #ifndef GLM_INTEGER_INCLUDED #define GLM_INTEGER_INCLUDED -#include "core/func_integer.hpp" +#include "detail/func_integer.hpp" #endif//GLM_INTEGER_INCLUDED diff --git a/glm/mat2x2.hpp b/glm/mat2x2.hpp index f018fe00..503602e4 100644 --- a/glm/mat2x2.hpp +++ b/glm/mat2x2.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT2X2_INCLUDED #define GLM_MAT2X2_INCLUDED -#include "core/type_mat2x2.hpp" +#include "detail/type_mat2x2.hpp" #endif//GLM_MAT2X2_INCLUDED diff --git a/glm/mat2x3.hpp b/glm/mat2x3.hpp index 2f617578..e17bd036 100644 --- a/glm/mat2x3.hpp +++ b/glm/mat2x3.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT2X3_INCLUDED #define GLM_MAT2X3_INCLUDED -#include "core/type_mat2x3.hpp" +#include "detail/type_mat2x3.hpp" #endif//GLM_MAT2X3_INCLUDED diff --git a/glm/mat2x4.hpp b/glm/mat2x4.hpp index f85ad273..527d5055 100644 --- a/glm/mat2x4.hpp +++ b/glm/mat2x4.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT2X4_INCLUDED #define GLM_MAT2X4_INCLUDED -#include "core/type_mat2x4.hpp" +#include "detail/type_mat2x4.hpp" #endif//GLM_MAT2X4_INCLUDED diff --git a/glm/mat3x2.hpp b/glm/mat3x2.hpp index 6ad5adde..cf21420f 100644 --- a/glm/mat3x2.hpp +++ b/glm/mat3x2.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT3X2_INCLUDED #define GLM_MAT3X2_INCLUDED -#include "core/type_mat3x2.hpp" +#include "detail/type_mat3x2.hpp" #endif//GLM_MAT3X2_INCLUDED diff --git a/glm/mat3x3.hpp b/glm/mat3x3.hpp index b730564e..f9f0a55f 100644 --- a/glm/mat3x3.hpp +++ b/glm/mat3x3.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT3X3_INCLUDED #define GLM_MAT3X3_INCLUDED -#include "core/type_mat3x3.hpp" +#include "detail/type_mat3x3.hpp" #endif//GLM_MAT3X3_INCLUDED diff --git a/glm/mat3x4.hpp b/glm/mat3x4.hpp index 9349c308..0ef198cc 100644 --- a/glm/mat3x4.hpp +++ b/glm/mat3x4.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT3X4_INCLUDED #define GLM_MAT3X4_INCLUDED -#include "core/type_mat3x4.hpp" +#include "detail/type_mat3x4.hpp" #endif//GLM_MAT3X4_INCLUDED diff --git a/glm/mat4x2.hpp b/glm/mat4x2.hpp index 5064431c..f098a616 100644 --- a/glm/mat4x2.hpp +++ b/glm/mat4x2.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT4X2_INCLUDED #define GLM_MAT4X2_INCLUDED -#include "core/type_mat4x2.hpp" +#include "detail/type_mat4x2.hpp" #endif//GLM_MAT4X2_INCLUDED diff --git a/glm/mat4x3.hpp b/glm/mat4x3.hpp index 85a45d34..b2c88bb3 100644 --- a/glm/mat4x3.hpp +++ b/glm/mat4x3.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT4X3_INCLUDED #define GLM_MAT4X3_INCLUDED -#include "core/type_mat4x3.hpp" +#include "detail/type_mat4x3.hpp" #endif//GLM_MAT4X3_INCLUDED diff --git a/glm/mat4x4.hpp b/glm/mat4x4.hpp index 45b3bc83..7ea47268 100644 --- a/glm/mat4x4.hpp +++ b/glm/mat4x4.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MAT4X4_INCLUDED #define GLM_MAT4X4_INCLUDED -#include "core/type_mat4x4.hpp" +#include "detail/type_mat4x4.hpp" #endif//GLM_MAT4X4_INCLUDED diff --git a/glm/matrix.hpp b/glm/matrix.hpp index 47c48bf3..d7bfd407 100644 --- a/glm/matrix.hpp +++ b/glm/matrix.hpp @@ -29,6 +29,6 @@ #ifndef GLM_MATRIX_INCLUDED #define GLM_MATRIX_INCLUDED -#include "core/matrix.hpp" +#include "detail/func_matrix.hpp" #endif//GLM_MATRIX_INCLUDED diff --git a/glm/packing.hpp b/glm/packing.hpp index bb239918..1d09b0d9 100644 --- a/glm/packing.hpp +++ b/glm/packing.hpp @@ -29,6 +29,6 @@ #ifndef GLM_PACKING_INCLUDED #define GLM_PACKING_INCLUDED -#include "core/func_packing.hpp" +#include "detail/func_packing.hpp" #endif//GLM_PACKING_INCLUDED diff --git a/glm/trigonometric.hpp b/glm/trigonometric.hpp index 276ca6a6..76ae5731 100644 --- a/glm/trigonometric.hpp +++ b/glm/trigonometric.hpp @@ -29,6 +29,6 @@ #ifndef GLM_TRIGONOMETRIC_INCLUDED #define GLM_TRIGONOMETRIC_INCLUDED -#include "core/func_trigonometric.hpp" +#include "detail/func_trigonometric.hpp" #endif//GLM_TRIGONOMETRIC_INCLUDED diff --git a/glm/vec2.hpp b/glm/vec2.hpp index b6cfd9c3..85a20800 100644 --- a/glm/vec2.hpp +++ b/glm/vec2.hpp @@ -29,6 +29,6 @@ #ifndef GLM_VEC2_INCLUDED #define GLM_VEC2_INCLUDED -#include "core/type_vec2.hpp" +#include "detail/type_vec2.hpp" #endif//GLM_VEC2_INCLUDED diff --git a/glm/vec3.hpp b/glm/vec3.hpp index 8aae9904..d085e137 100644 --- a/glm/vec3.hpp +++ b/glm/vec3.hpp @@ -29,6 +29,6 @@ #ifndef GLM_VEC3_INCLUDED #define GLM_VEC3_INCLUDED -#include "core/type_vec3.hpp" +#include "detail/type_vec3.hpp" #endif//GLM_VEC3_INCLUDED diff --git a/glm/vec4.hpp b/glm/vec4.hpp index 32019acc..da159bf0 100644 --- a/glm/vec4.hpp +++ b/glm/vec4.hpp @@ -29,6 +29,6 @@ #ifndef GLM_VEC4_INCLUDED #define GLM_VEC4_INCLUDED -#include "core/type_vec4.hpp" +#include "detail/type_vec4.hpp" #endif//GLM_VEC4_INCLUDED diff --git a/glm/vector_relational.hpp b/glm/vector_relational.hpp index 81253215..40a11b15 100644 --- a/glm/vector_relational.hpp +++ b/glm/vector_relational.hpp @@ -29,6 +29,6 @@ #ifndef GLM_VECTOR_RELATIONAL_INCLUDED #define GLM_VECTOR_RELATIONAL_INCLUDED -#include "core/vector_relational.hpp" +#include "detail/func_vector_relational.hpp" #endif//GLM_VECTOR_RELATIONAL_INCLUDED diff --git a/test/core/core_func_exponential.cpp b/test/core/core_func_exponential.cpp index 022fea80..df83f67e 100644 --- a/test/core/core_func_exponential.cpp +++ b/test/core/core_func_exponential.cpp @@ -7,7 +7,7 @@ // File : test/core/func_exponential.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include int main() { diff --git a/test/core/core_func_geometric.cpp b/test/core/core_func_geometric.cpp index 304a7ae2..aee11a62 100644 --- a/test/core/core_func_geometric.cpp +++ b/test/core/core_func_geometric.cpp @@ -7,7 +7,7 @@ // File : test/core/func_geometric.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include #include int test_reflect() diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index ac803c0a..1f4cf61e 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -7,7 +7,7 @@ // File : test/core/func_integer.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include #include enum result diff --git a/test/core/core_func_matrix.cpp b/test/core/core_func_matrix.cpp index e2aa6b4e..0b092444 100644 --- a/test/core/core_func_matrix.cpp +++ b/test/core/core_func_matrix.cpp @@ -7,7 +7,7 @@ // File : test/core/func_matrix.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include int test_matrixCompMult() { diff --git a/test/core/core_func_noise.cpp b/test/core/core_func_noise.cpp index 24bcb4a2..99eaa2bf 100644 --- a/test/core/core_func_noise.cpp +++ b/test/core/core_func_noise.cpp @@ -7,8 +7,6 @@ // File : test/core/func_noise.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include - int main() { int Failed = 0; diff --git a/test/core/core_func_packing.cpp b/test/core/core_func_packing.cpp index c149d7b1..4d7b1dc4 100644 --- a/test/core/core_func_packing.cpp +++ b/test/core/core_func_packing.cpp @@ -7,9 +7,9 @@ // File : test/core/func_packing.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include #include #include +#include #include int test_packUnorm2x16() diff --git a/test/core/core_type_mat2x2.cpp b/test/core/core_type_mat2x2.cpp index 5c27e191..fc93c3dc 100644 --- a/test/core/core_type_mat2x2.cpp +++ b/test/core/core_type_mat2x2.cpp @@ -8,8 +8,8 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #include -#include -#include +#include +#include #include int test_operators() diff --git a/test/core/core_type_mat2x3.cpp b/test/core/core_type_mat2x3.cpp index 0a1684ab..c9608f17 100644 --- a/test/core/core_type_mat2x3.cpp +++ b/test/core/core_type_mat2x3.cpp @@ -7,8 +7,8 @@ // File : test/core/type_mat2x3.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include static int test_operators() diff --git a/test/core/core_type_mat2x4.cpp b/test/core/core_type_mat2x4.cpp index 3e88dacb..3d523dd2 100644 --- a/test/core/core_type_mat2x4.cpp +++ b/test/core/core_type_mat2x4.cpp @@ -7,8 +7,8 @@ // File : test/core/type_mat2x4.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include static int test_operators() diff --git a/test/core/core_type_mat3x2.cpp b/test/core/core_type_mat3x2.cpp index 225007d6..df1ead0c 100644 --- a/test/core/core_type_mat3x2.cpp +++ b/test/core/core_type_mat3x2.cpp @@ -7,8 +7,8 @@ // File : test/core/type_mat3x2.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include static bool test_operators() diff --git a/test/core/core_type_mat3x3.cpp b/test/core/core_type_mat3x3.cpp index 3edf8ab6..e9b5804c 100644 --- a/test/core/core_type_mat3x3.cpp +++ b/test/core/core_type_mat3x3.cpp @@ -7,7 +7,7 @@ // File : test/core/type_mat3x3.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include #include #include #include diff --git a/test/core/core_type_mat3x4.cpp b/test/core/core_type_mat3x4.cpp index dd91bf20..85ca204b 100644 --- a/test/core/core_type_mat3x4.cpp +++ b/test/core/core_type_mat3x4.cpp @@ -7,8 +7,8 @@ // File : test/core/type_mat3x4.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include static bool test_operators() diff --git a/test/core/core_type_mat4x2.cpp b/test/core/core_type_mat4x2.cpp index 8e85acbb..421c4d82 100644 --- a/test/core/core_type_mat4x2.cpp +++ b/test/core/core_type_mat4x2.cpp @@ -7,8 +7,8 @@ // File : test/core/type_mat4x2.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include static int test_operators() diff --git a/test/core/core_type_mat4x3.cpp b/test/core/core_type_mat4x3.cpp index a806f709..365a73d0 100644 --- a/test/core/core_type_mat4x3.cpp +++ b/test/core/core_type_mat4x3.cpp @@ -7,8 +7,8 @@ // File : test/core/type_mat4x3.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include #include static int test_operators() diff --git a/test/core/core_type_mat4x4.cpp b/test/core/core_type_mat4x4.cpp index 5d3278fa..999a3c50 100644 --- a/test/core/core_type_mat4x4.cpp +++ b/test/core/core_type_mat4x4.cpp @@ -7,7 +7,7 @@ // File : test/core/type_mat4x4.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include +#include #include #include #include diff --git a/test/core/core_type_vec2.cpp b/test/core/core_type_vec2.cpp index 103b0505..bbfd2e5b 100644 --- a/test/core/core_type_vec2.cpp +++ b/test/core/core_type_vec2.cpp @@ -7,8 +7,8 @@ // File : test/core/type_vec2.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include +#include +#include int test_vec2_operators() { diff --git a/test/core/core_type_vec3.cpp b/test/core/core_type_vec3.cpp index 36ea1d05..7e8a1556 100644 --- a/test/core/core_type_vec3.cpp +++ b/test/core/core_type_vec3.cpp @@ -8,11 +8,11 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #define GLM_SWIZZLE -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/test/core/core_type_vec4.cpp b/test/core/core_type_vec4.cpp index cd4f05e1..0fa2b4ec 100644 --- a/test/core/core_type_vec4.cpp +++ b/test/core/core_type_vec4.cpp @@ -2,15 +2,15 @@ // OpenGL Mathematics Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-08-31 -// Updated : 2008-08-31 +// Updated : 2013-12-24 // Licence : This source is under MIT License // File : test/core/type_vec4.cpp /////////////////////////////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include