Browse Source

Add lMaxNorm for computing the max norm.

Liam Adams 6 years ago
parent
commit
2400954df2
2 changed files with 24 additions and 0 deletions
  1. 12 0
      glm/gtx/norm.hpp
  2. 12 0
      glm/gtx/norm.inl

+ 12 - 0
glm/gtx/norm.hpp

@@ -3,6 +3,7 @@
 ///
 /// @see core (dependence)
 /// @see gtx_quaternion (dependence)
+/// @see gtx_component_wise (dependence)
 ///
 /// @defgroup gtx_norm GLM_GTX_norm
 /// @ingroup gtx
@@ -16,6 +17,7 @@
 // Dependency:
 #include "../geometric.hpp"
 #include "../gtx/quaternion.hpp"
+#include "../gtx/component_wise.hpp"
 
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	ifndef GLM_ENABLE_EXPERIMENTAL
@@ -70,6 +72,16 @@ namespace glm
 	template<typename T, qualifier Q>
 	GLM_FUNC_DECL T lxNorm(vec<3, T, Q> const& x, unsigned int Depth);
 
+	//! Returns the LMax norm between x and y.
+	//! From GLM_GTX_norm extension.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T lMaxNorm(vec<3, T, Q> const& x, vec<3, T, Q> const& y);
+
+	//! Returns the LMax norm of v.
+	//! From GLM_GTX_norm extension.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T lMaxNorm(vec<3, T, Q> const& x);
+
 	/// @}
 }//namespace glm
 

+ 12 - 0
glm/gtx/norm.inl

@@ -80,4 +80,16 @@ namespace detail
 		return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth));
 	}
 
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T lMaxNorm(vec<3, T, Q> const& a, vec<3, T, Q> const& b)
+	{
+		return compMax(abs(b - a));
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T lMaxNorm(vec<3, T, Q> const& v)
+	{
+		return compMax(abs(v));
+	}
+
 }//namespace glm