Move content of core directory into detail directory. Reduced dependencies to glm.hpp.

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)

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

glm/core/func_exponential.inl → glm/detail/func_exponential.inl

@@ -30,6 +30,7 @@
 #include "_vectorize.hpp"
 #include <limits>
 #include <cassert>
+#include <cmath>
 
 namespace glm
 {

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

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

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

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

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 <cmath>
 #include <climits>
@@ -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

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
 {

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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