Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid namespaces #1178

Merged
merged 2 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion glm/ext.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@
#include "./gtx/norm.hpp"
#include "./gtx/normal.hpp"
#include "./gtx/normalize_dot.hpp"
#include "./gtx/number_precision.hpp"
#include "./gtx/optimum_pow.hpp"
#include "./gtx/orthonormalize.hpp"
#include "./gtx/perpendicular.hpp"
Expand Down
14 changes: 7 additions & 7 deletions glm/gtc/noise.inl
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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>
Expand Down Expand Up @@ -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)));
Expand Down
61 changes: 0 additions & 61 deletions glm/gtx/number_precision.hpp

This file was deleted.

6 changes: 0 additions & 6 deletions glm/gtx/number_precision.inl

This file was deleted.

4 changes: 1 addition & 3 deletions glm/gtx/optimum_pow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
# endif
#endif

namespace glm{
namespace gtx
namespace glm
{
/// @addtogroup gtx_optimum_pow
/// @{
Expand All @@ -48,7 +47,6 @@ namespace gtx
GLM_FUNC_DECL genType pow4(genType const& x);

/// @}
}//namespace gtx
}//namespace glm

#include "optimum_pow.inl"
Loading