mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-27 02:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2011-06-02 15:54:04 +01:00
commit 76e8fc1f18
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
glm/glm.hpp
View File

@ -44,36 +44,38 @@
#endif//GLM_MESSAGE #endif//GLM_MESSAGE
//! GLM namespace, it contains all GLSL based features. //! GLM namespace, it contains all GLSL based features.
namespace glm{ namespace glm
namespace test
{ {
bool main_bug(); //! GLM core. Namespace that includes all the feature define by GLSL 4.10.6 specification. This namespace is included in glm namespace.
bool main_core(); namespace core
}//namespace test {
//! 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
{
namespace precision{}
}
/// GLM core. Namespace that includes all the features define by GLSL 4.10.6 specification. This namespace is included in glm namespace. //! Some of the functions defined in section 8 Built-in Functions of GLSL 1.30.8 specification.
namespace core //! Angle and trigonometry, exponential, common, geometric, matrix and vector relational functions.
{ namespace function{}
//! Scalar, vectors and matrices }//namespace core
//! 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. //! G-Truc Creation stable extensions.
//! Angle and trigonometry, exponential, common, geometric, matrix and vector relational functions. namespace gtc{}
namespace function{}
}//namespace core
//! G-Truc Creation stable extensions. //! G-Truc Creation experimental extensions.
namespace gtc{} //! The interface could change between releases.
namespace gtx{}
//! G-Truc Creation experimental extensions. //! VIRTREV extensions.
//! The interface could change between releases. namespace virtrev{}
namespace gtx{}
//! VIRTREV extensions. using namespace core::type;
namespace virtrev{} using namespace core::type::precision;
using namespace core::function;
}//namespace glm }//namespace glm
#include "./core/_detail.hpp" #include "./core/_detail.hpp"
@ -90,13 +92,6 @@ namespace virtrev{}
#include "./core/func_noise.hpp" #include "./core/func_noise.hpp"
#include "./core/_swizzle.hpp" #include "./core/_swizzle.hpp"
namespace glm
{
using namespace core::type;
using namespace core::type::precision;
using namespace core::function;
}//namespace glm
//////////////////// ////////////////////
// check type sizes // check type sizes
#ifndef GLM_STATIC_ASSERT_NULL #ifndef GLM_STATIC_ASSERT_NULL