From 7d20bc8104771046a87858d106b8bde3573f8727 Mon Sep 17 00:00:00 2001 From: Liam Adams Date: Fri, 19 Jul 2019 17:53:19 +0100 Subject: [PATCH 1/4] Take the absolute vaue of the components to avoid possible negative norm values. --- glm/gtx/norm.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glm/gtx/norm.inl b/glm/gtx/norm.inl index c3f468c3..aec92bc2 100644 --- a/glm/gtx/norm.inl +++ b/glm/gtx/norm.inl @@ -71,13 +71,13 @@ namespace detail template GLM_FUNC_QUALIFIER T lxNorm(vec<3, T, Q> const& x, vec<3, T, Q> const& y, unsigned int Depth) { - return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth)); + return pow(pow(abs(y.x - x.x), T(Depth)) + pow(abs(y.y - x.y), T(Depth)) + pow(abs(y.z - x.z), T(Depth)), T(1) / T(Depth)); } template GLM_FUNC_QUALIFIER T lxNorm(vec<3, T, Q> const& v, unsigned int Depth) { - return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth)); + return pow(pow(abs(v.x), T(Depth)) + pow(abs(v.y), T(Depth)) + pow(abs(v.z), T(Depth)), T(1) / T(Depth)); } }//namespace glm From 8f7d37811679c457f18cd5e514b1521e9e965088 Mon Sep 17 00:00:00 2001 From: Liam Adams Date: Fri, 19 Jul 2019 18:28:31 +0100 Subject: [PATCH 2/4] Add testing of lxNorm. --- test/gtx/gtx_norm.cpp | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/test/gtx/gtx_norm.cpp b/test/gtx/gtx_norm.cpp index 38cef8c2..7efaa6e7 100644 --- a/test/gtx/gtx_norm.cpp +++ b/test/gtx/gtx_norm.cpp @@ -1,9 +1,63 @@ #define GLM_ENABLE_EXPERIMENTAL #include +int test_lxNorm() +{ + int Error(0); + + { + unsigned int depth_1 = 1; + float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_1); + float normB = glm::l1Norm(glm::vec3(2, 3, 1)); + Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; + Error += glm::epsilonEqual(normA, 6.f, 0.00001f) ? 0 : 1; + } + + { + unsigned int depth_1 = 1; + float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_1); + float normB = glm::l1Norm(glm::vec3(-1, -2, -3)); + Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; + Error += glm::epsilonEqual(normA, 6.f, 0.00001f) ? 0 : 1; + } + + { + unsigned int depth_2 = 2; + float normA = glm::lxNorm(glm::vec3(2, 3, 1), depth_2); + float normB = glm::l2Norm(glm::vec3(2, 3, 1)); + Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; + Error += glm::epsilonEqual(normA, 3.741657387f, 0.00001f) ? 0 : 1; + } + + { + unsigned int depth_2 = 2; + float normA = glm::lxNorm(glm::vec3(-1, -2, -3), depth_2); + float normB = glm::l2Norm(glm::vec3(-1, -2, -3)); + Error += glm::epsilonEqual(normA, normB, 0.00001f) ? 0 : 1; + Error += glm::epsilonEqual(normA, 3.741657387f, 0.00001f) ? 0 : 1; + } + + { + unsigned int oddDepth = 3; + float norm = glm::lxNorm(glm::vec3(2, 3, 1), oddDepth); + Error += glm::epsilonEqual(norm, 3.301927249f, 0.00001f) ? 0 : 1; + } + + { + unsigned int oddDepth = 3; + float norm = glm::lxNorm(glm::vec3(-1, -2, -3), oddDepth); + Error += glm::epsilonEqual(norm, 3.301927249f, 0.00001f) ? 0 : 1; + } + + + return Error; +} + int main() { int Error(0); + Error += test_lxNorm(); + return Error; } From 3fe07c3cda51a02fdb3ad3c90b1c7d8bf592bfd0 Mon Sep 17 00:00:00 2001 From: ANAND Date: Sat, 27 Jul 2019 11:09:57 +0530 Subject: [PATCH 3/4] Delete .vscode/settings.json --- .vscode/settings.json | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 7a73a41b..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} \ No newline at end of file From 163b57c319782c62e85ca229098de524932ff26f Mon Sep 17 00:00:00 2001 From: Hinara <1793523+Hinara@users.noreply.github.com> Date: Mon, 29 Jul 2019 17:21:44 +0200 Subject: [PATCH 4/4] Fix compilation under xcode 6.4 --- glm/detail/type_quat.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/type_quat.hpp b/glm/detail/type_quat.hpp index b8de4b28..ae70e091 100644 --- a/glm/detail/type_quat.hpp +++ b/glm/detail/type_quat.hpp @@ -47,7 +47,7 @@ namespace glm typename detail::storage<4, T, detail::is_aligned::value>::type data; }; # else - T x, y, z, w; + T w, x, y, z; # endif # if GLM_SILENT_WARNINGS == GLM_ENABLE