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

Fix invalid namespaces

Browse Source
This commit is contained in:
christophe 2023-12-21 14:33:51 +01:00 committed by Christophe
parent 4681c5b347
commit ec6e3d6cb5
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glm/gtc/noise.inl
View File

@ -6,7 +6,7 @@
// http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf // http://www.itn.liu.se/~stegu/simplexnoise/simplexnoise.pdf
namespace glm{ namespace glm{
namespace gtc namespace detail
{ {
template<typename T, qualifier Q> template<typename T, qualifier Q>
GLM_FUNC_QUALIFIER vec<4, T, Q> grad4(T const& j, vec<4, T, Q> const& ip) 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; pXYZ = pXYZ + (vec<3, T, Q>(s) * T(2) - T(1)) * s.w;
return vec<4, T, Q>(pXYZ, pW); return vec<4, T, Q>(pXYZ, pW);
} }
}//namespace gtc }//namespace detail
// Classic Perlin noise // Classic Perlin noise
template<typename T, qualifier Q> 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. // 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> 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> p0 = detail::grad4(j0, ip);
vec<4, T, Q> p1 = gtc::grad4(j1.x, ip); vec<4, T, Q> p1 = detail::grad4(j1.x, ip);
vec<4, T, Q> p2 = gtc::grad4(j1.y, ip); vec<4, T, Q> p2 = detail::grad4(j1.y, ip);
vec<4, T, Q> p3 = gtc::grad4(j1.z, ip); vec<4, T, Q> p3 = detail::grad4(j1.z, ip);
vec<4, T, Q> p4 = gtc::grad4(j1.w, ip); vec<4, T, Q> p4 = detail::grad4(j1.w, ip);
// Normalise gradients // 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))); vec<4, T, Q> norm = detail::taylorInvSqrt(vec<4, T, Q>(dot(p0, p0), dot(p1, p1), dot(p2, p2), dot(p3, p3)));

4
glm/gtx/number_precision.hpp
View File

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

4
glm/gtx/optimum_pow.hpp
View File

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