From 6215aff4b47d2c23d2f6d51408d474adf62e6142 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 6 Jun 2011 13:47:42 +0100 Subject: [PATCH] Removed namespaces --- glm/core/func_common.hpp | 214 ++++++++++++++++------------ glm/core/func_common.inl | 63 ++++---- glm/core/func_exponential.hpp | 13 +- glm/core/func_exponential.inl | 7 - glm/core/func_geometric.hpp | 9 +- glm/core/func_geometric.inl | 7 - glm/core/func_integer.hpp | 9 +- glm/core/func_integer.inl | 13 -- glm/core/func_matrix.hpp | 9 +- glm/core/func_matrix.inl | 9 +- glm/core/func_noise.hpp | 9 +- glm/core/func_noise.inl | 8 -- glm/core/func_packing.hpp | 11 +- glm/core/func_packing.inl | 12 -- glm/core/func_trigonometric.hpp | 12 +- glm/core/func_trigonometric.inl | 7 - glm/core/func_vector_relational.hpp | 11 +- glm/core/func_vector_relational.inl | 6 - glm/core/type.hpp | 152 ++++++++++---------- glm/core/type_float.hpp | 57 ++++---- glm/core/type_int.hpp | 29 ++-- glm/core/type_mat2x2.hpp | 7 - glm/core/type_mat2x3.hpp | 10 +- glm/core/type_mat2x4.hpp | 8 +- glm/core/type_mat3x2.hpp | 10 +- glm/core/type_mat3x3.hpp | 7 - glm/core/type_mat3x4.hpp | 7 - glm/core/type_mat4x2.hpp | 7 - glm/core/type_mat4x3.hpp | 7 - glm/core/type_mat4x4.hpp | 7 - glm/core/type_vec1.hpp | 18 +-- glm/core/type_vec2.hpp | 7 - glm/core/type_vec3.hpp | 7 - glm/core/type_vec4.hpp | 7 - 34 files changed, 292 insertions(+), 484 deletions(-) diff --git a/glm/core/func_common.hpp b/glm/core/func_common.hpp index a3eb7ff0..8a1de5ad 100644 --- a/glm/core/func_common.hpp +++ b/glm/core/func_common.hpp @@ -1,51 +1,71 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Created : 2008-03-08 -// Updated : 2010-01-26 -// Licence : This source is under MIT License -// File : glm/core/func_common.hpp -/////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) +/// Permission is hereby granted, free of charge, to any person obtaining a copy +/// of this software and associated documentation files (the "Software"), to deal +/// in the Software without restriction, including without limitation the rights +/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +/// copies of the Software, and to permit persons to whom the Software is +/// furnished to do so, subject to the following conditions: +/// +/// The above copyright notice and this permission notice shall be included in +/// all copies or substantial portions of the Software. +/// +/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/// THE SOFTWARE. +/// +/// @ref core +/// @file glm/core/func_common.hpp +/// @date 2008-03-08 / 2010-01-26 +/// @author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// #ifndef glm_core_func_common #define glm_core_func_common #include "_fixes.hpp" -namespace glm{ -namespace core{ -namespace function{ -namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 specification. Included in glm namespace. +namespace glm { - /// \addtogroup core_funcs - ///@{ + /// @addtogroup core_funcs + /// @{ - //! Returns x if x >= 0; otherwise, it returns -x. - //! - //! \li GLSL abs man page - //! \li GLSL 1.30.08 specification, section 8.3 - template + /// Returns x if x >= 0; otherwise, it returns -x. + /// + /// @see + /// @li GLSL abs man page + /// @li GLSL 1.30.08 specification, section 8.3 + template genFIType abs(genFIType const & x); - //! Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. - //! - //! \li GLSL sign man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. + /// + /// @see + /// @li GLSL sign man page + /// @li GLSL 1.30.08 specification, section 8.3 template genFIType sign(genFIType const & x); //! Returns a value equal to the nearest integer that is less then or equal to x. //! - //! \li GLSL floor man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL floor man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType floor(genType const & x); //! Returns a value equal to the nearest integer to x //! whose absolute value is not larger than the absolute value of x. //! - //! \li GLSL trunc man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL trunc man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType trunc(genType const & x); @@ -55,8 +75,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! This includes the possibility that round(x) returns the //! same value as roundEven(x) for all values of x. //! - //! \li GLSL round man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL round man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType round(genType const & x); @@ -64,31 +85,35 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! A fractional part of 0.5 will round toward the nearest even //! integer. (Both 3.5 and 4.5 for x will return 4.0.) //! - //! \li GLSL roundEven man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL roundEven man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType roundEven(genType const & x); //! Returns a value equal to the nearest integer //! that is greater than or equal to x. //! - //! \li GLSL ceil man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL ceil man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType ceil(genType const & x); //! Return x - floor(x). //! - //! \li GLSL fract man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL fract man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType fract(genType const & x); //! Modulus. Returns x - y * floor(x / y) //! for each component in x using the floating point value y. //! - //! \li GLSL mod man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL mod man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType mod( genType const & x, @@ -97,8 +122,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! Modulus. Returns x - y * floor(x / y) //! for each component in x using the floating point value y. //! - //! \li GLSL mod man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL mod man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType mod( genType const & x, @@ -109,17 +135,19 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! return value and the output parameter will have the same //! sign as x. //! - //! \li GLSL modf man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + /// @li GLSL modf man page + /// @li GLSL 1.30.08 specification, section 8.3 template genType modf( genType const & x, genType & i); - //! Returns y if y < x; otherwise, it returns x. - //! - //! \li GLSL min man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// Returns y if y < x; otherwise, it returns x. + /// + /// @see + /// @li GLSL min man page + /// @li GLSL 1.30.08 specification, section 8.3 template genType min( genType const & x, @@ -130,10 +158,11 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp genType const & x, typename genType::value_type const & y); - //! Returns y if x < y; otherwise, it returns x. - //! - //! \li GLSL max man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// Returns y if x < y; otherwise, it returns x. + /// + /// @see + /// @li GLSL max man page + /// @li GLSL 1.30.08 specification, section 8.3 template genType max( genType const & x, @@ -147,8 +176,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! Returns min(max(x, minVal), maxVal) for each component in x //! using the floating-point values minVal and maxVal. //! - //! \li GLSL clamp man page - //! \li GLSL 1.30.08 specification, section 8.3 + /// @see + //! @li GLSL clamp man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType clamp( genType const & x, @@ -161,12 +191,12 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp typename genType::value_type const & minVal, typename genType::value_type const & maxVal); - //! \return If genTypeU is a floating scalar or vector: + //! @return If genTypeU is a floating scalar or vector: //! Returns x * (1.0 - a) + y * a, i.e., the linear blend of //! x and y using the floating-point value a. //! The value for a is not restricted to the range [0, 1]. - //! - //! \return If genTypeU is a boolean scalar or vector: + //! + //! @return If genTypeU is a boolean scalar or vector: //! Selects which vector each returned component comes //! from. For a component of a that is false, the //! corresponding component of x is returned. For a @@ -178,21 +208,23 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! genType mix(genType x, genType y, genType(a)) //! where a is a Boolean vector. //! - //! \li GLSL mix man page - //! \li GLSL 1.30.08 specification, section 8.3 + //! @see + //! @li GLSL mix man page + //! @li GLSL 1.30.08 specification, section 8.3 //! - //! \param[in] x Floating point scalar or vector. - //! \param[in] y Floating point scalar or vector. - //! \param[in] a Floating point or boolean scalar or vector. + //! @param[in] x Floating point scalar or vector. + //! @param[in] y Floating point scalar or vector. + //! @param[in] a Floating point or boolean scalar or vector. //! - // \todo Test when 'a' is a boolean. + //! @todo Test when 'a' is a boolean. template genTypeT mix(genTypeT const & x, genTypeT const & y, genTypeU const & a); //! Returns 0.0 if x < edge, otherwise it returns 1.0. - //! - //! \li GLSL step man page - //! \li GLSL 1.30.08 specification, section 8.3 + //! + //! @see + //! @li GLSL step man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType step( genType const & edge, @@ -213,8 +245,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! return t * t * (3 – 2 * t); //! Results are undefined if edge0 >= edge1. //! - //! \li GLSL smoothstep man page - //! \li GLSL 1.30.08 specification, section 8.3 + //! @see + //! @li GLSL smoothstep man page + //! @li GLSL 1.30.08 specification, section 8.3 template genType smoothstep( genType const & edge0, @@ -233,8 +266,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! including for implementations with no NaN //! representations. //! - //! \li GLSL isnan man page - //! \li GLSL 1.30.08 specification, section 8.3 + //! @see + //! @li GLSL isnan man page + //! @li GLSL 1.30.08 specification, section 8.3 template typename genType::bool_type isnan(genType const & x); @@ -244,8 +278,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! otherwise, including for implementations with no infinity //! representations. //! - //! \li GLSL isinf man page - //! \li GLSL 1.30.08 specification, section 8.3 + //! @see + //! @li GLSL isinf man page + //! @li GLSL 1.30.08 specification, section 8.3 template typename genType::bool_type isinf(genType const & x); @@ -253,8 +288,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! the encoding of a floating-point value. The floatingpoint //! value's bit-level representation is preserved. //! - //! \li GLSL floatBitsToInt man page - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL floatBitsToInt man page + //! @li GLSL 4.00.08 specification, section 8.3 template genIType floatBitsToInt(genType const & value); @@ -262,8 +298,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! the encoding of a floating-point value. The floatingpoint //! value's bit-level representation is preserved. //! - //! \li GLSL floatBitsToUint man page - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL floatBitsToUint man page + //! @li GLSL 4.00.08 specification, section 8.3 template genUType floatBitsToUint(genType const & value); @@ -273,8 +310,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! resulting floating point value is unspecified. Otherwise, //! the bit-level representation is preserved. //! - //! \li GLSL intBitsToFloat man page - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL intBitsToFloat man page + //! @li GLSL 4.00.08 specification, section 8.3 template genType intBitsToFloat(genIType const & value); @@ -284,15 +322,17 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! resulting floating point value is unspecified. Otherwise, //! the bit-level representation is preserved. //! - //! \li GLSL uintBitsToFloat man page - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL uintBitsToFloat man page + //! @li GLSL 4.00.08 specification, section 8.3 template genType uintBitsToFloat(genUType const & value); //! Computes and returns a * b + c. //! - //! \li GLSL fma man page - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL fma man page + //! @li GLSL 4.00.08 specification, section 8.3 template genType fma(genType const & a, genType const & b, genType const & c); @@ -306,8 +346,9 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! are both zero. For a floating-point value that is an //! infinity or is not a number, the results are undefined. //! - //! \li GLSL frexp man page - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL frexp man page + //! @li GLSL 4.00.08 specification, section 8.3 template genType frexp(genType const & x, genIType & exp); @@ -318,16 +359,13 @@ namespace common //!< Define common functions from Section 8.3 of GLSL 1.30.8 sp //! If this product is too large to be represented in the //! floating-point type, the result is undefined. //! - //! \li GLSL ldexp man page; - //! \li GLSL 4.00.08 specification, section 8.3 + //! @see + //! @li GLSL ldexp man page; + //! @li GLSL 4.00.08 specification, section 8.3 template genType ldexp(genType const & x, genIType const & exp); - ///@} -}//namespace common -}//namespace function -}//namespace core - using namespace core::function::common; + /// @} }//namespace glm #include "func_common.inl" diff --git a/glm/core/func_common.inl b/glm/core/func_common.inl index df572cf4..cceac54e 100644 --- a/glm/core/func_common.inl +++ b/glm/core/func_common.inl @@ -7,43 +7,36 @@ // File : glm/core/func_common.inl /////////////////////////////////////////////////////////////////////////////////////////////////// -namespace glm +namespace glm{ +namespace detail { - namespace detail - { - template - struct Abs_ - { - }; + template + struct Abs_ + {}; - template - struct Abs_ - { - static genFIType get(genFIType const & x) - { - GLM_STATIC_ASSERT( - detail::type::is_float || - detail::type::is_int, "'abs' only accept floating-point and integer inputs"); - return x >= genFIType(0) ? x : -x; - } - }; + template + struct Abs_ + { + static genFIType get(genFIType const & x) + { + GLM_STATIC_ASSERT( + detail::type::is_float || + detail::type::is_int, "'abs' only accept floating-point and integer inputs"); + return x >= genFIType(0) ? x : -x; + } + }; - template - struct Abs_ - { - static genFIType get(genFIType const & x) - { - GLM_STATIC_ASSERT( + template + struct Abs_ + { + static genFIType get(genFIType const & x) + { + GLM_STATIC_ASSERT( detail::type::is_uint, "'abs' only accept floating-point and integer inputs"); - - return x; - } - }; - }//namespace detail - - namespace core{ - namespace function{ - namespace common{ + return x; + } + }; +}//namespace detail // abs template @@ -1570,8 +1563,4 @@ namespace glm { return std::frexp(x, exp); } - - }//namespace common - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_exponential.hpp b/glm/core/func_exponential.hpp index 46e84e1b..6d917a22 100644 --- a/glm/core/func_exponential.hpp +++ b/glm/core/func_exponential.hpp @@ -10,13 +10,10 @@ #ifndef glm_core_func_exponential #define glm_core_func_exponential -namespace glm{ -namespace core{ -namespace function{ -namespace exponential //!< Define all exponential functions from Section 8.2 of GLSL 1.30.8 specification. Included in glm namespace. +namespace glm { /// \addtogroup core_funcs - ///@{ + /// @{ //! Returns x raised to the y power. //! @@ -70,11 +67,7 @@ namespace exponential //!< Define all exponential functions from Section 8.2 of template genType inversesqrt(genType const & x); - ///@} -}//namespace exponential -}//namespace function -}//namespace core - using namespace core::function::exponential; + /// @} }//namespace glm #include "func_exponential.inl" diff --git a/glm/core/func_exponential.inl b/glm/core/func_exponential.inl index d3bc59ea..cf6c3c91 100644 --- a/glm/core/func_exponential.inl +++ b/glm/core/func_exponential.inl @@ -9,10 +9,6 @@ namespace glm { - namespace core{ - namespace function{ - namespace exponential{ - // pow template GLM_FUNC_QUALIFIER genType pow @@ -352,7 +348,4 @@ namespace glm inversesqrt(x.w)); } - }//namespace exponential - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_geometric.hpp b/glm/core/func_geometric.hpp index 0cd2ee30..728e9553 100644 --- a/glm/core/func_geometric.hpp +++ b/glm/core/func_geometric.hpp @@ -10,10 +10,7 @@ #ifndef glm_core_func_geometric #define glm_core_func_geometric -namespace glm{ -namespace core{ -namespace function{ -namespace geometric //!< Define all geometric functions from Section 8.4 of GLSL 1.30.8 specification. Included in glm namespace. +namespace glm { /// \addtogroup core_funcs /// @{ @@ -94,10 +91,6 @@ namespace geometric //!< Define all geometric functions from Section 8.4 of GLSL typename genType::value_type const & eta); /// @} -}//namespace geometric -}//namespace function -}//namespace core - using namespace core::function::geometric; }//namespace glm #include "func_geometric.inl" diff --git a/glm/core/func_geometric.inl b/glm/core/func_geometric.inl index 086b5220..35b25711 100644 --- a/glm/core/func_geometric.inl +++ b/glm/core/func_geometric.inl @@ -9,10 +9,6 @@ namespace glm { - namespace core{ - namespace function{ - namespace geometric{ - // length template GLM_FUNC_QUALIFIER genType length @@ -284,7 +280,4 @@ namespace glm return eta * I - (eta * dotValue + sqrt(k)) * N; } - }//namespace geometric - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_integer.hpp b/glm/core/func_integer.hpp index c4801d69..8ae1df4b 100644 --- a/glm/core/func_integer.hpp +++ b/glm/core/func_integer.hpp @@ -10,10 +10,7 @@ #ifndef glm_core_func_integer #define glm_core_func_integer -namespace glm{ -namespace core{ -namespace function{ -namespace integer //!< Define integer functions from Section 8.8 of GLSL 4.00.8 specification. +namespace glm { /// \addtogroup core_funcs /// @{ @@ -142,10 +139,6 @@ namespace integer //!< Define integer functions from Section 8.8 of GLSL 4.00.8 typename C::signed_type findMSB(C const & Value); /// @} -}//namespace integer -}//namespace function -}//namespace core - using namespace core::function::integer; }//namespace glm #include "func_integer.inl" diff --git a/glm/core/func_integer.inl b/glm/core/func_integer.inl index 0e30aa2a..93f41f82 100644 --- a/glm/core/func_integer.inl +++ b/glm/core/func_integer.inl @@ -9,15 +9,6 @@ namespace glm { - namespace detail - { - - }//namespace detail - - namespace core{ - namespace function{ - namespace integer - { // uaddCarry template GLM_FUNC_QUALIFIER genUType uaddCarry @@ -590,8 +581,4 @@ namespace glm findMSB(value[2]), findMSB(value[3])); } - - }//namespace integer - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_matrix.hpp b/glm/core/func_matrix.hpp index c2276af1..39039cf0 100644 --- a/glm/core/func_matrix.hpp +++ b/glm/core/func_matrix.hpp @@ -10,10 +10,7 @@ #ifndef glm_core_func_matrix #define glm_core_func_matrix -namespace glm{ -namespace core{ -namespace function{ -namespace matrix //!< Define all matrix functions from Section 8.5 of GLSL 1.30.8 specification. Included in glm namespace. +namespace glm { /// \addtogroup core_funcs /// @{ @@ -96,10 +93,6 @@ namespace matrix //!< Define all matrix functions from Section 8.5 of GLSL 1.30. detail::tmat4x4 const & m); /// @} -}//namespace matrix -}//namespace function -}//namespace core - using namespace core::function::matrix; }//namespace glm #include "func_matrix.inl" diff --git a/glm/core/func_matrix.inl b/glm/core/func_matrix.inl index d775d96b..29fbb4b3 100644 --- a/glm/core/func_matrix.inl +++ b/glm/core/func_matrix.inl @@ -7,11 +7,7 @@ // File : glm/core/func_matrix.inl /////////////////////////////////////////////////////////////////////////////////////////////////// -namespace glm -{ - namespace core{ - namespace function{ - namespace matrix{ +namespace glm{ // matrixCompMult template @@ -565,7 +561,4 @@ namespace glm return Inverse; } - }//namespace matrix - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_noise.hpp b/glm/core/func_noise.hpp index dfb9c95c..b677e41a 100644 --- a/glm/core/func_noise.hpp +++ b/glm/core/func_noise.hpp @@ -10,10 +10,7 @@ #ifndef glm_core_func_noise #define glm_core_func_noise -namespace glm{ -namespace core{ -namespace function{ -namespace noise //< Define all noise functions from Section 8.9 of GLSL 1.30.8 specification. Included in glm namespace. +namespace glm { /// \addtogroup core_funcs /// @{ @@ -47,10 +44,6 @@ namespace noise //< Define all noise functions from Section 8.9 of GLSL 1.30.8 s detail::tvec4 noise4(genType const & x); /// @} -}//namespace noise -}//namespace function -}//namespace core - using namespace core::function::noise; }//namespace glm #include "func_noise.inl" diff --git a/glm/core/func_noise.inl b/glm/core/func_noise.inl index 8e009643..2f117647 100644 --- a/glm/core/func_noise.inl +++ b/glm/core/func_noise.inl @@ -9,13 +9,5 @@ namespace glm { - namespace core{ - namespace function{ - namespace noise{ - - - }//namespace noise - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_packing.hpp b/glm/core/func_packing.hpp index 4b5d13c2..42392e31 100644 --- a/glm/core/func_packing.hpp +++ b/glm/core/func_packing.hpp @@ -10,10 +10,7 @@ #ifndef glm_core_func_packing #define glm_core_func_packing -namespace glm{ -namespace core{ -namespace function{ -namespace packing //!< Define packing functions from section 8.4 floating-point pack and unpack functions of GLSL 4.00.8 specification +namespace glm { /// \addtogroup core_funcs ///@{ @@ -115,11 +112,7 @@ namespace packing //!< Define packing functions from section 8.4 floating-point //! \li GLSL 4.00.08 specification, section 8.4 detail::tvec2 unpackDouble2x32(double const & v); - ///@} -}//namespace packing -}//namespace function -}//namespace core - using namespace core::function::packing; + /// @} }//namespace glm #include "func_packing.inl" diff --git a/glm/core/func_packing.inl b/glm/core/func_packing.inl index 672e67bf..962d7d06 100644 --- a/glm/core/func_packing.inl +++ b/glm/core/func_packing.inl @@ -9,15 +9,6 @@ namespace glm { - namespace detail - { - - }//namespace detail - - namespace core{ - namespace function{ - namespace packing - { GLM_FUNC_QUALIFIER detail::uint32 packUnorm2x16(detail::tvec2 const & v) { detail::uint16 A((detail::uint16)round(clamp(v.x, 0.0f, 1.0f) * 65535.0f)); @@ -88,7 +79,4 @@ namespace glm return *(detail::tvec2*)&v; } - }//namespace packing - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_trigonometric.hpp b/glm/core/func_trigonometric.hpp index 2f8d7638..089e19ea 100644 --- a/glm/core/func_trigonometric.hpp +++ b/glm/core/func_trigonometric.hpp @@ -10,13 +10,7 @@ #ifndef glm_core_func_trigonometric #define glm_core_func_trigonometric -namespace glm{ -namespace core{ -namespace function{ -//! Define Angle and trigonometry functions -//! from Section 8.1 of GLSL 1.30.8 specification. -//! Included in glm namespace. -namespace trigonometric +namespace glm { /// \addtogroup core_funcs /// @{ @@ -140,10 +134,6 @@ namespace trigonometric genType atanh(genType const & x); /// @} -}//namespace trigonometric -}//namespace function -}//namespace core - using namespace core::function::trigonometric; }//namespace glm #include "func_trigonometric.inl" diff --git a/glm/core/func_trigonometric.inl b/glm/core/func_trigonometric.inl index 05846014..4b59bfc7 100644 --- a/glm/core/func_trigonometric.inl +++ b/glm/core/func_trigonometric.inl @@ -9,10 +9,6 @@ namespace glm { - namespace core{ - namespace function{ - namespace trigonometric{ - // radians template GLM_FUNC_QUALIFIER genType radians @@ -739,7 +735,4 @@ namespace glm atanh(x.w)); } - }//namespace trigonometric - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/func_vector_relational.hpp b/glm/core/func_vector_relational.hpp index 83a8cff9..ce698014 100644 --- a/glm/core/func_vector_relational.hpp +++ b/glm/core/func_vector_relational.hpp @@ -12,12 +12,7 @@ #include "_detail.hpp" -namespace glm{ -namespace core{ -namespace function{ -//! Define vector relational functions from Section 8.6 of GLSL 1.30.8 specification. -//! Included in glm namespace. -namespace vector_relational +namespace glm { /// \addtogroup core_funcs /// @{ @@ -201,10 +196,6 @@ namespace vector_relational } /// @} -}//namespace vector_relational -}//namespace function -}//namespace core - using namespace core::function::vector_relational; }//namespace glm #include "func_vector_relational.inl" diff --git a/glm/core/func_vector_relational.inl b/glm/core/func_vector_relational.inl index 728c8049..ac998c92 100644 --- a/glm/core/func_vector_relational.inl +++ b/glm/core/func_vector_relational.inl @@ -9,12 +9,6 @@ namespace glm { - namespace core{ - namespace function{ - namespace vector_relational{ - }//namespace vector_relational - }//namespace function - }//namespace core }//namespace glm diff --git a/glm/core/type.hpp b/glm/core/type.hpp index 0117c3c4..bece87a4 100644 --- a/glm/core/type.hpp +++ b/glm/core/type.hpp @@ -2,7 +2,7 @@ // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net) /////////////////////////////////////////////////////////////////////////////////////////////////// // Created : 2008-01-08 -// Updated : 2008-01-08 +// Updated : 2011-06-06 // Licence : This source is under MIT License // File : glm/core/type.hpp /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -31,112 +31,110 @@ #include "type_mat4x3.hpp" #include "type_mat4x4.hpp" -namespace glm{ -namespace core{ -namespace type +namespace glm { ////////////////////////// // Float definition #if(defined(GLM_PRECISION_HIGHP_FLOAT)) - typedef precision::highp_vec2 vec2; - typedef precision::highp_vec3 vec3; - typedef precision::highp_vec4 vec4; - typedef precision::highp_mat2x2 mat2x2; - typedef precision::highp_mat2x3 mat2x3; - typedef precision::highp_mat2x4 mat2x4; - typedef precision::highp_mat3x2 mat3x2; - typedef precision::highp_mat3x3 mat3x3; - typedef precision::highp_mat3x4 mat3x4; - typedef precision::highp_mat4x2 mat4x2; - typedef precision::highp_mat4x3 mat4x3; - typedef precision::highp_mat4x4 mat4x4; + typedef highp_vec2 vec2; + typedef highp_vec3 vec3; + typedef highp_vec4 vec4; + typedef highp_mat2x2 mat2x2; + typedef highp_mat2x3 mat2x3; + typedef highp_mat2x4 mat2x4; + typedef highp_mat3x2 mat3x2; + typedef highp_mat3x3 mat3x3; + typedef highp_mat3x4 mat3x4; + typedef highp_mat4x2 mat4x2; + typedef highp_mat4x3 mat4x3; + typedef highp_mat4x4 mat4x4; #elif(defined(GLM_PRECISION_MEDIUMP_FLOAT)) - typedef precision::mediump_vec2 vec2; - typedef precision::mediump_vec3 vec3; - typedef precision::mediump_vec4 vec4; - typedef precision::mediump_mat2x2 mat2x2; - typedef precision::mediump_mat2x3 mat2x3; - typedef precision::mediump_mat2x4 mat2x4; - typedef precision::mediump_mat3x2 mat3x2; - typedef precision::mediump_mat3x3 mat3x3; - typedef precision::mediump_mat3x4 mat3x4; - typedef precision::mediump_mat4x2 mat4x2; - typedef precision::mediump_mat4x3 mat4x3; - typedef precision::mediump_mat4x4 mat4x4; + typedef mediump_vec2 vec2; + typedef mediump_vec3 vec3; + typedef mediump_vec4 vec4; + typedef mediump_mat2x2 mat2x2; + typedef mediump_mat2x3 mat2x3; + typedef mediump_mat2x4 mat2x4; + typedef mediump_mat3x2 mat3x2; + typedef mediump_mat3x3 mat3x3; + typedef mediump_mat3x4 mat3x4; + typedef mediump_mat4x2 mat4x2; + typedef mediump_mat4x3 mat4x3; + typedef mediump_mat4x4 mat4x4; #elif(defined(GLM_PRECISION_LOWP_FLOAT)) - typedef precision::lowp_vec2 vec2; - typedef precision::lowp_vec3 vec3; - typedef precision::lowp_vec4 vec4; - typedef precision::lowp_mat2x2 mat2x2; - typedef precision::lowp_mat2x3 mat2x3; - typedef precision::lowp_mat2x4 mat2x4; - typedef precision::lowp_mat3x2 mat3x2; - typedef precision::lowp_mat3x3 mat3x3; - typedef precision::lowp_mat3x4 mat3x4; - typedef precision::lowp_mat4x2 mat4x2; - typedef precision::lowp_mat4x3 mat4x3; - typedef precision::lowp_mat4x4 mat4x4; + typedef lowp_vec2 vec2; + typedef lowp_vec3 vec3; + typedef lowp_vec4 vec4; + typedef lowp_mat2x2 mat2x2; + typedef lowp_mat2x3 mat2x3; + typedef lowp_mat2x4 mat2x4; + typedef lowp_mat3x2 mat3x2; + typedef lowp_mat3x3 mat3x3; + typedef lowp_mat3x4 mat3x4; + typedef lowp_mat4x2 mat4x2; + typedef lowp_mat4x3 mat4x3; + typedef lowp_mat4x4 mat4x4; #else //! 2 components vector of floating-point numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_vec2 vec2; + typedef mediump_vec2 vec2; //! 3 components vector of floating-point numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_vec3 vec3; + typedef mediump_vec3 vec3; //! 4 components vector of floating-point numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_vec4 vec4; + typedef mediump_vec4 vec4; //! 2 columns of 2 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat2x2 mat2x2; + typedef mediump_mat2x2 mat2x2; //! 2 columns of 3 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat2x3 mat2x3; + typedef mediump_mat2x3 mat2x3; //! 2 columns of 4 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat2x4 mat2x4; + typedef mediump_mat2x4 mat2x4; //! 3 columns of 2 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat3x2 mat3x2; + typedef mediump_mat3x2 mat3x2; //! 3 columns of 3 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat3x3 mat3x3; + typedef mediump_mat3x3 mat3x3; //! 3 columns of 4 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat3x4 mat3x4; + typedef mediump_mat3x4 mat3x4; //! 4 columns of 2 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat4x2 mat4x2; + typedef mediump_mat4x2 mat4x2; //! 4 columns of 3 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat4x3 mat4x3; + typedef mediump_mat4x3 mat4x3; //! 4 columns of 4 components matrix of floating-point numbers. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices) //! \ingroup core_types - typedef precision::mediump_mat4x4 mat4x4; + typedef mediump_mat4x4 mat4x4; #endif//GLM_PRECISION @@ -159,64 +157,64 @@ namespace type // Signed integer definition #if(defined(GLM_PRECISION_HIGHP_INT)) - typedef precision::highp_ivec2 ivec2; - typedef precision::highp_ivec3 ivec3; - typedef precision::highp_ivec4 ivec4; + typedef highp_ivec2 ivec2; + typedef highp_ivec3 ivec3; + typedef highp_ivec4 ivec4; #elif(defined(GLM_PRECISION_MEDIUMP_INT)) - typedef precision::mediump_ivec2 ivec2; - typedef precision::mediump_ivec3 ivec3; - typedef precision::mediump_ivec4 ivec4; + typedef mediump_ivec2 ivec2; + typedef mediump_ivec3 ivec3; + typedef mediump_ivec4 ivec4; #elif(defined(GLM_PRECISION_LOWP_INT)) - typedef precision::lowp_ivec2 ivec2; - typedef precision::lowp_ivec3 ivec3; - typedef precision::lowp_ivec4 ivec4; + typedef lowp_ivec2 ivec2; + typedef lowp_ivec3 ivec3; + typedef lowp_ivec4 ivec4; #else //! 2 components vector of signed integer numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_ivec2 ivec2; + typedef mediump_ivec2 ivec2; //! 3 components vector of signed integer numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_ivec3 ivec3; + typedef mediump_ivec3 ivec3; //! 4 components vector of signed integer numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_ivec4 ivec4; + typedef mediump_ivec4 ivec4; #endif//GLM_PRECISION ////////////////////////// // Unsigned integer definition #if(defined(GLM_PRECISION_HIGHP_UINT)) - typedef precision::highp_uvec2 uvec2; - typedef precision::highp_uvec3 uvec3; - typedef precision::highp_uvec4 uvec4; + typedef highp_uvec2 uvec2; + typedef highp_uvec3 uvec3; + typedef highp_uvec4 uvec4; #elif(defined(GLM_PRECISION_MEDIUMP_UINT)) - typedef precision::mediump_uvec2 uvec2; - typedef precision::mediump_uvec3 uvec3; - typedef precision::mediump_uvec4 uvec4; + typedef mediump_uvec2 uvec2; + typedef mediump_uvec3 uvec3; + typedef mediump_uvec4 uvec4; #elif(defined(GLM_PRECISION_LOWP_UINT)) - typedef precision::lowp_uvec2 uvec2; - typedef precision::lowp_uvec3 uvec3; - typedef precision::lowp_uvec4 uvec4; + typedef lowp_uvec2 uvec2; + typedef lowp_uvec3 uvec3; + typedef lowp_uvec4 uvec4; #else //! 2 components vector of unsigned integer numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_uvec2 uvec2; + typedef mediump_uvec2 uvec2; //! 3 components vector of unsigned integer numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_uvec3 uvec3; + typedef mediump_uvec3 uvec3; //! 4 components vector of unsigned integer numbers. //! From GLSL 1.30.8 specification, section 4.1.5 Vectors. //! \ingroup core_types - typedef precision::mediump_uvec4 uvec4; + typedef mediump_uvec4 uvec4; #endif//GLM_PRECISION ////////////////////////// @@ -315,8 +313,6 @@ namespace type //! \ingroup core_types typedef detail::tmat4x4 dmat4x4; -}//namespace type -}//namespace core }//namespace glm #endif//glm_core_type diff --git a/glm/core/type_float.hpp b/glm/core/type_float.hpp index 673797ae..06f18d30 100644 --- a/glm/core/type_float.hpp +++ b/glm/core/type_float.hpp @@ -24,51 +24,44 @@ namespace glm } //namespace detail - namespace core{ - namespace type{ - - namespace precision - { #ifdef GLM_USE_HALF_SCALAR - typedef detail::thalf lowp_float_t; + typedef detail::thalf lowp_float_t; #else//GLM_USE_HALF_SCALAR - typedef float lowp_float_t; + typedef float lowp_float_t; #endif//GLM_USE_HALF_SCALAR - typedef float mediump_float_t; - typedef double highp_float_t; + typedef float mediump_float_t; + typedef double highp_float_t; - //! Low precision floating-point numbers. - //! There is no guarantee on the actual precision. - //! From GLSL 1.30.8 specification - //! \ingroup core_precision - typedef lowp_float_t lowp_float; - //! Medium precision floating-point numbers. - //! There is no guarantee on the actual precision. - //! From GLSL 1.30.8 specification - //! \ingroup core_precision - typedef mediump_float_t mediump_float; - //! High precision floating-point numbers. - //! There is no guarantee on the actual precision. - //! From GLSL 1.30.8 specification - //! \ingroup core_precision - typedef highp_float_t highp_float; - } - //namespace precision + //! Low precision floating-point numbers. + //! There is no guarantee on the actual precision. + //! From GLSL 1.30.8 specification + //! \ingroup core_precision + typedef lowp_float_t lowp_float; + + //! Medium precision floating-point numbers. + //! There is no guarantee on the actual precision. + //! From GLSL 1.30.8 specification + //! \ingroup core_precision + typedef mediump_float_t mediump_float; + + //! High precision floating-point numbers. + //! There is no guarantee on the actual precision. + //! From GLSL 1.30.8 specification + //! \ingroup core_precision + typedef highp_float_t highp_float; #if(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) - typedef precision::mediump_float float_t; + typedef mediump_float float_t; #elif(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) - typedef precision::highp_float float_t; + typedef highp_float float_t; #elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT)) - typedef precision::mediump_float float_t; + typedef mediump_float float_t; #elif(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && defined(GLM_PRECISION_LOWP_FLOAT)) - typedef precision::lowp_float float_t; + typedef lowp_float float_t; #else # error "GLM error: multiple default precision requested for floating-point types" #endif - }//namespace type - }//namespace core }//namespace glm #endif//glm_core_type_float diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp index eb4ed513..90094d8a 100644 --- a/glm/core/type_int.hpp +++ b/glm/core/type_int.hpp @@ -37,20 +37,18 @@ namespace detail GLM_DETAIL_IS_UINT(highp_uint_t); }//namespace detail -namespace core{ -namespace type{ -namespace precision //!< Namespace for precision stuff. -{ //! Low precision signed integer. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. //! \ingroup core_precision typedef detail::lowp_int_t lowp_int; + //! Medium precision signed integer. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. //! \ingroup core_precision - typedef detail::mediump_int_t mediump_int; + typedef detail::mediump_int_t mediump_int; + //! High precision signed integer. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. @@ -62,38 +60,39 @@ namespace precision //!< Namespace for precision stuff. //! From GLSL 1.30.8 specification. //! \ingroup core_precision typedef detail::lowp_uint_t lowp_uint; + //! Medium precision unsigned integer. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. //! \ingroup core_precision typedef detail::mediump_uint_t mediump_uint; + //! High precision unsigned integer. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification. //! \ingroup core_precision typedef detail::highp_uint_t highp_uint; -}//namespace precision #if(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT)) - typedef precision::mediump_int int_t; + typedef mediump_int int_t; #elif(defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT)) - typedef precision::highp_int int_t; + typedef highp_int int_t; #elif(!defined(GLM_PRECISION_HIGHP_INT) && defined(GLM_PRECISION_MEDIUMP_INT) && !defined(GLM_PRECISION_LOWP_INT)) - typedef precision::mediump_int int_t; + typedef mediump_int int_t; #elif(!defined(GLM_PRECISION_HIGHP_INT) && !defined(GLM_PRECISION_MEDIUMP_INT) && defined(GLM_PRECISION_LOWP_INT)) - typedef precision::lowp_int int_t; + typedef lowp_int int_t; #else # error "GLM error: multiple default precision requested for signed interger types" #endif #if(!defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT)) - typedef precision::mediump_uint uint_t; + typedef mediump_uint uint_t; #elif(defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT)) - typedef precision::highp_uint uint_t; + typedef highp_uint uint_t; #elif(!defined(GLM_PRECISION_HIGHP_UINT) && defined(GLM_PRECISION_MEDIUMP_UINT) && !defined(GLM_PRECISION_LOWP_UINT)) - typedef precision::mediump_uint uint_t; + typedef mediump_uint uint_t; #elif(!defined(GLM_PRECISION_HIGHP_UINT) && !defined(GLM_PRECISION_MEDIUMP_UINT) && defined(GLM_PRECISION_LOWP_UINT)) - typedef precision::lowp_uint uint_t; + typedef lowp_uint uint_t; #else # error "GLM error: multiple default precision requested for unsigned interger types" #endif @@ -102,8 +101,6 @@ namespace precision //!< Namespace for precision stuff. //! From GLSL 1.30.8 specification section 4.1.3 Integers. typedef uint_t uint; -}//namespace type -}//namespace core }//namespace glm #endif//glm_core_type_int diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp index 102e6563..b4d47b37 100644 --- a/glm/core/type_mat2x2.hpp +++ b/glm/core/type_mat2x2.hpp @@ -230,10 +230,6 @@ namespace detail int); } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 2 columns of 2 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers @@ -270,9 +266,6 @@ namespace precision //! \ingroup core_precision typedef detail::tmat2x2 highp_mat2x2; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp index 0c6e185f..967c4e5f 100644 --- a/glm/core/type_mat2x3.hpp +++ b/glm/core/type_mat2x3.hpp @@ -196,28 +196,24 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 2 columns of 3 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) //! \ingroup core_precision typedef detail::tmat2x3 lowp_mat2x3; + //! 2 columns of 3 components matrix of medium precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) //! \ingroup core_precision typedef detail::tmat2x3 mediump_mat2x3; + //! 2 columns of 3 components matrix of high precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) //! \ingroup core_precision typedef detail::tmat2x3 highp_mat2x3; -}//namespace precision -}//namespace type -}//namespace core + }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp index 9a56feb1..0f561b02 100644 --- a/glm/core/type_mat2x4.hpp +++ b/glm/core/type_mat2x4.hpp @@ -198,10 +198,6 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 2 columns of 4 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) @@ -214,9 +210,7 @@ namespace precision //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) typedef detail::tmat2x4 highp_mat2x4; -}//namespace precision -}//namespace type -}//namespace core + }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp index 0f8feb9e..60764a0a 100644 --- a/glm/core/type_mat3x2.hpp +++ b/glm/core/type_mat3x2.hpp @@ -204,25 +204,21 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 3 columns of 2 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) typedef detail::tmat3x2 lowp_mat3x2; + //! 3 columns of 2 components matrix of medium precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) typedef detail::tmat3x2 mediump_mat3x2; + //! 3 columns of 2 components matrix of high precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) typedef detail::tmat3x2 highp_mat3x2; -}//namespace precision -}//namespace type -}//namespace core + }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat3x3.hpp b/glm/core/type_mat3x3.hpp index 582a0d80..5231078d 100644 --- a/glm/core/type_mat3x3.hpp +++ b/glm/core/type_mat3x3.hpp @@ -234,10 +234,6 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 3 columns of 3 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers @@ -272,9 +268,6 @@ namespace precision //! \ingroup core_precision typedef detail::tmat3x3 highp_mat3x3; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp index 1450f2ce..5d7f8a9a 100644 --- a/glm/core/type_mat3x4.hpp +++ b/glm/core/type_mat3x4.hpp @@ -204,10 +204,6 @@ namespace detail }//namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 3 columns of 4 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) @@ -221,9 +217,6 @@ namespace precision //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) typedef detail::tmat3x4 highp_mat3x4; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp index ba6486aa..30f86b09 100644 --- a/glm/core/type_mat4x2.hpp +++ b/glm/core/type_mat4x2.hpp @@ -209,10 +209,6 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 4 columns of 2 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) @@ -231,9 +227,6 @@ namespace precision //! \ingroup core_precision typedef detail::tmat4x2 highp_mat4x2; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp index 3e3e5804..5a8e358c 100644 --- a/glm/core/type_mat4x3.hpp +++ b/glm/core/type_mat4x3.hpp @@ -207,10 +207,6 @@ namespace detail }//namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 4 columns of 3 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers) @@ -229,9 +225,6 @@ namespace precision //! \ingroup core_precision typedef detail::tmat4x3 highp_mat4x3; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_mat4x4.hpp b/glm/core/type_mat4x4.hpp index 212b59d2..3f588b1f 100644 --- a/glm/core/type_mat4x4.hpp +++ b/glm/core/type_mat4x4.hpp @@ -235,10 +235,6 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 4 columns of 4 components matrix of low precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification, section 4.1.6 Matrices and section 4.5 Precision and Precision Qualifiers @@ -275,9 +271,6 @@ namespace precision //! \ingroup core_precision typedef detail::tmat4x4 highp_mat4x4; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_vec1.hpp b/glm/core/type_vec1.hpp index ac8bf919..50d6b190 100644 --- a/glm/core/type_vec1.hpp +++ b/glm/core/type_vec1.hpp @@ -152,15 +152,15 @@ namespace detail GLM_DETAIL_IS_VECTOR(tvec1); - typedef detail::tvec1 highp_vec1_t; - typedef detail::tvec1 mediump_vec1_t; - typedef detail::tvec1 lowp_vec1_t; - typedef detail::tvec1 highp_ivec1_t; - typedef detail::tvec1 mediump_ivec1_t; - typedef detail::tvec1 lowp_ivec1_t; - typedef detail::tvec1 highp_uvec1_t; - typedef detail::tvec1 mediump_uvec1_t; - typedef detail::tvec1 lowp_uvec1_t; + typedef detail::tvec1 highp_vec1_t; + typedef detail::tvec1 mediump_vec1_t; + typedef detail::tvec1 lowp_vec1_t; + typedef detail::tvec1 highp_ivec1_t; + typedef detail::tvec1 mediump_ivec1_t; + typedef detail::tvec1 lowp_ivec1_t; + typedef detail::tvec1 highp_uvec1_t; + typedef detail::tvec1 mediump_uvec1_t; + typedef detail::tvec1 lowp_uvec1_t; }//namespace detail }//namespace glm diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp index b8d47b7b..40b58a38 100644 --- a/glm/core/type_vec2.hpp +++ b/glm/core/type_vec2.hpp @@ -193,10 +193,6 @@ namespace detail } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 2 components vector of high precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers. @@ -251,9 +247,6 @@ namespace precision //! \ingroup core_precision typedef detail::tvec2 lowp_uvec2; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp index 7b568789..b44de90d 100644 --- a/glm/core/type_vec3.hpp +++ b/glm/core/type_vec3.hpp @@ -199,10 +199,6 @@ namespace detail GLM_DETAIL_IS_VECTOR(tvec3); } //namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 3 components vector of high precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers. @@ -257,9 +253,6 @@ namespace precision //! \ingroup core_precision typedef detail::tvec3 lowp_uvec3; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp index 940b5c19..b3163656 100644 --- a/glm/core/type_vec4.hpp +++ b/glm/core/type_vec4.hpp @@ -212,10 +212,6 @@ namespace detail GLM_DETAIL_IS_VECTOR(tvec4); }//namespace detail -namespace core{ -namespace type{ -namespace precision -{ //! 4 components vector of high precision floating-point numbers. //! There is no guarantee on the actual precision. //! From GLSL 1.30.8 specification, section 4.5.2 Precision Qualifiers. @@ -270,9 +266,6 @@ namespace precision //! \ingroup core_precision typedef detail::tvec4 lowp_uvec4; -}//namespace precision -}//namespace type -}//namespace core }//namespace glm #ifndef GLM_EXTERNAL_TEMPLATE