Merge pull request #927 from l90lpa/fix-lxNorm

Fix lx norm #927

glm/gtx/norm.inl

@@ -71,13 +71,13 @@ namespace detail
 	template<typename T, qualifier Q>
 	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<typename T, qualifier Q>
 	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

test/gtx/gtx_norm.cpp

@@ -1,9 +1,63 @@
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/norm.hpp>
 
+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;
 }