mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Fixed namespace visibility
This commit is contained in:
parent
0ffce51edf
commit
11d67b6749
57
glm/glm.hpp
57
glm/glm.hpp
@ -24,36 +24,38 @@
|
||||
#endif//GLM_MESSAGE
|
||||
|
||||
//! GLM namespace, it contains all GLSL based features.
|
||||
namespace glm{
|
||||
namespace test
|
||||
namespace glm
|
||||
{
|
||||
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
|
||||
{
|
||||
namespace precision{}
|
||||
}
|
||||
|
||||
//! 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 virtrev{}
|
||||
|
||||
//! VIRTREV extensions.
|
||||
namespace virtrev{}
|
||||
using namespace core::type;
|
||||
using namespace core::type::precision;
|
||||
using namespace core::function;
|
||||
}//namespace glm
|
||||
|
||||
#include "./core/_detail.hpp"
|
||||
@ -70,13 +72,6 @@ namespace virtrev{}
|
||||
#include "./core/func_noise.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
|
||||
#ifndef GLM_STATIC_ASSERT_NULL
|
||||
|
Loading…
Reference in New Issue
Block a user