Browse Source

Fix invalid namespaces

christophe 2 years ago
parent
commit
ec6e3d6cb5
3 changed files with 9 additions and 13 deletions
  1. 7 7
      glm/gtc/noise.inl
  2. 1 3
      glm/gtx/number_precision.hpp
  3. 1 3
      glm/gtx/optimum_pow.hpp

+ 7 - 7
glm/gtc/noise.inl

@@ -6,7 +6,7 @@
 // http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf
 
 namespace glm{
-namespace gtc
+namespace detail
 {
 	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER vec<4, T, Q> grad4(T const& j, vec<4, T, Q> const& ip)
@@ -17,7 +17,7 @@ namespace gtc
 		pXYZ = pXYZ + (vec<3, T, Q>(s) * T(2) - T(1)) * s.w;
 		return vec<4, T, Q>(pXYZ, pW);
 	}
-}//namespace gtc
+}//namespace detail
 
 	// Classic Perlin noise
 	template<typename T, qualifier Q>
@@ -781,11 +781,11 @@ namespace gtc
 		// 7*7*6 = 294, which is close to the ring size 17*17 = 289.
 		vec<4, T, Q> ip = vec<4, T, Q>(T(1) / T(294), T(1) / T(49), T(1) / T(7), T(0));
 
-		vec<4, T, Q> p0 = gtc::grad4(j0,   ip);
-		vec<4, T, Q> p1 = gtc::grad4(j1.x, ip);
-		vec<4, T, Q> p2 = gtc::grad4(j1.y, ip);
-		vec<4, T, Q> p3 = gtc::grad4(j1.z, ip);
-		vec<4, T, Q> p4 = gtc::grad4(j1.w, ip);
+		vec<4, T, Q> p0 = detail::grad4(j0,   ip);
+		vec<4, T, Q> p1 = detail::grad4(j1.x, ip);
+		vec<4, T, Q> p2 = detail::grad4(j1.y, ip);
+		vec<4, T, Q> p3 = detail::grad4(j1.z, ip);
+		vec<4, T, Q> p4 = detail::grad4(j1.w, ip);
 
 		// Normalise gradients
 		vec<4, T, Q> norm = detail::taylorInvSqrt(vec<4, T, Q>(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3)));

+ 1 - 3
glm/gtx/number_precision.hpp

@@ -26,8 +26,7 @@
 #	endif
 #endif
 
-namespace glm{
-namespace gtx
+namespace glm
 {
 	/////////////////////////////
 	// Unsigned int vector types
@@ -55,7 +54,6 @@ namespace gtx
 	typedef f64			f64mat1x1;	//!< \brief Double-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
 
 	/// @}
-}//namespace gtx
 }//namespace glm
 
 #include "number_precision.inl"

+ 1 - 3
glm/gtx/optimum_pow.hpp

@@ -23,8 +23,7 @@
 #	endif
 #endif
 
-namespace glm{
-namespace gtx
+namespace glm
 {
 	/// @addtogroup gtx_optimum_pow
 	/// @{
@@ -48,7 +47,6 @@ namespace gtx
 	GLM_FUNC_DECL genType pow4(genType const& x);
 
 	/// @}
-}//namespace gtx
 }//namespace glm
 
 #include "optimum_pow.inl"