fix float3/4 comparison

cleanrock · cleanrock · commit 5a75be227c7d · 2016-02-07T13:55:07.000+01:00
diff --git a/rts/System/float3.cpp b/rts/System/float3.cpp
@@ -3,7 +3,8 @@
 #include "System/float3.h"
 #include "System/creg/creg_cond.h"
 #include "System/myMath.h"
-#include <cmath> // std::min, std::max, std::fabs
+#include <cmath> // std::fabs
+#include <algorithm> // std::{min,max}
 
 CR_BIND(float3, )
 CR_REG_METADATA(float3, (CR_MEMBER(x), CR_MEMBER(y), CR_MEMBER(z)))
@@ -66,3 +67,9 @@ float3 float3::fabs(const float3 v)
 	return float3(std::fabs(v.x), std::fabs(v.y), std::fabs(v.z));
 }
 
+bool float3::equals(const float3& f, const float3& eps /*= float3(CMP_EPS, CMP_EPS, CMP_EPS)*/) const
+{
+	return math::fabs(x - f.x) <= eps.x * std::max(std::max(math::fabs(x), math::fabs(f.x)), 1.0f)
+		&& math::fabs(y - f.y) <= eps.y * std::max(std::max(math::fabs(y), math::fabs(f.y)), 1.0f)
+		&& math::fabs(z - f.z) <= eps.z * std::max(std::max(math::fabs(z), math::fabs(f.z)), 1.0f);
+}
diff --git a/rts/System/float3.h b/rts/System/float3.h
@@ -331,11 +331,7 @@ class float3
 	/**
 	 * @see operator==
 	 */
-	bool equals(const float3& f, const float3& eps = float3(CMP_EPS, CMP_EPS, CMP_EPS)) const {
-		return math::fabs(x - f.x) <= math::fabs(eps.x * x)
-			&& math::fabs(y - f.y) <= math::fabs(eps.y * y)
-			&& math::fabs(z - f.z) <= math::fabs(eps.z * z);
-	}
+	bool equals(const float3& f, const float3& eps = float3(CMP_EPS, CMP_EPS, CMP_EPS)) const;
 
 	/**
 	 * @brief dot product
diff --git a/rts/System/float4.cpp b/rts/System/float4.cpp
@@ -3,6 +3,7 @@
 #include "System/float4.h"
 
 #include "System/creg/creg_cond.h"
+#include <algorithm> // std::{min,max}
 
 CR_BIND(float4, )
 CR_REG_METADATA(float4,
@@ -18,3 +19,11 @@ float4::float4(): float3(), w(0.0f)
 	assert(&z == &y + 1);
 	assert(&w == &z + 1);
 }
+
+bool float4::operator == (const float4& f) const
+{
+	return math::fabs(x - f.x) <= float3::CMP_EPS * std::max(std::max(math::fabs(x), math::fabs(f.x)), 1.0f)
+		&& math::fabs(y - f.y) <= float3::CMP_EPS * std::max(std::max(math::fabs(y), math::fabs(f.y)), 1.0f)
+		&& math::fabs(z - f.z) <= float3::CMP_EPS * std::max(std::max(math::fabs(z), math::fabs(f.z)), 1.0f)
+		&& math::fabs(w - f.w) <= float3::CMP_EPS * std::max(std::max(math::fabs(w), math::fabs(f.w)), 1.0f);
+}
diff --git a/rts/System/float4.h b/rts/System/float4.h
@@ -82,12 +82,7 @@ struct float4 : public float3
 	inline bool operator == (const float3& f) const { return (this->float3::operator == (f)); }
 	inline bool operator != (const float3& f) const { return (this->float3::operator != (f)); }
 
-	inline bool operator == (const float4& f) const {
-		return math::fabs(x - f.x) <= math::fabs(float3::CMP_EPS * x)
-			&& math::fabs(y - f.y) <= math::fabs(float3::CMP_EPS * y)
-			&& math::fabs(z - f.z) <= math::fabs(float3::CMP_EPS * z)
-			&& math::fabs(w - f.w) <= math::fabs(float3::CMP_EPS * w);
-	}
+	bool operator == (const float4& f) const;
 
 	inline bool operator != (const float4& f) const {
 		return !(*this == f);
