diff --git a/glm/glm.hpp b/glm/glm.hpp index 394ecf4b..0e34a1c6 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -24,40 +24,37 @@ #endif//GLM_MESSAGE //! GLM namespace, it contains all GLSL based features. -namespace glm +namespace glm{ +namespace test { - namespace test - { - bool main_bug(); - bool main_core(); - }//namespace test + bool main_bug(); + bool main_core(); +}//namespace test - //! GLM core. Namespace that includes all the feature define by GLSL 4.10.6 specification. This namespace is included in glm namespace. - namespace core - { - //! Scalar, vectors and matrices - //! from section 4.1.2 Booleans, 4.1.3 Integers section, 4.1.4 Floats section, - //! 4.1.5 Vectors and section 4.1.6 Matrices of GLSL 1.30.8 specification. - //! This namespace resolves precision qualifier define in section 4.5 of GLSL 1.30.8 specification. - namespace type{} +//! GLM core. Namespace that includes all the feature define by GLSL 4.10.6 specification. This namespace is included in glm namespace. +namespace core +{ + //! Scalar, vectors and matrices + //! from section 4.1.2 Booleans, 4.1.3 Integers section, 4.1.4 Floats section, + //! 4.1.5 Vectors and section 4.1.6 Matrices of GLSL 1.30.8 specification. + //! This namespace resolves precision qualifier define in section 4.5 of GLSL 1.30.8 specification. + namespace type{} - //! Some of the functions defined in section 8 Built-in Functions of GLSL 1.30.8 specification. - //! Angle and trigonometry, exponential, common, geometric, matrix and vector relational functions. - namespace function{} - } - //namespace core + //! Some of the functions defined in section 8 Built-in Functions of GLSL 1.30.8 specification. + //! Angle and trigonometry, exponential, common, geometric, matrix and vector relational functions. + namespace function{} +}//namespace core - //! G-Truc Creation stable extensions. - namespace gtc{} +//! G-Truc Creation stable extensions. +namespace gtc{} - //! G-Truc Creation experimental extensions. - //! The interface could change between releases. - namespace gtx{} +//! G-Truc Creation experimental extensions. +//! The interface could change between releases. +namespace gtx{} - //! VIRTREV extensions. - namespace img{} - -} //namespace glm +//! VIRTREV extensions. +namespace virtrev{} +}//namespace glm #include "./core/_detail.hpp" #include "./core/type.hpp" @@ -78,7 +75,7 @@ namespace glm using namespace core::type; using namespace core::type::precision; using namespace core::function; -} //namespace glm +}//namespace glm //////////////////// // check type sizes @@ -98,4 +95,4 @@ namespace glm GLM_STATIC_ASSERT(sizeof(glm::detail::float64) == 8, "float64 size isn't 8 bytes on this platform"); #endif//GLM_STATIC_ASSERT_NULL -#endif //glm_glm +#endif//glm_glm