From ee939cf8c86eb1d855bcf1c89038a709f350c84c Mon Sep 17 00:00:00 2001 From: worktycho Date: Tue, 5 May 2015 22:08:40 +0100 Subject: Revert "Small code cleanup" --- src/Vector3.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/Vector3.h') diff --git a/src/Vector3.h b/src/Vector3.h index 071997f50..c5431438e 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -78,11 +78,6 @@ public: ); } - inline bool HasNonZeroLength(void) const - { - return ((x != 0) || (y != 0) || (z != 0)); - } - inline double Length(void) const { return sqrt(static_cast(x * x + y * y + z * z)); @@ -126,7 +121,11 @@ public: { // Perform a bitwise comparison of the contents - we want to know whether this object is exactly equal // To perform EPS-based comparison, use the EqualsEps() function - return !((x != a_Rhs.x) || (y != a_Rhs.y) || (z != a_Rhs.z)); + return ( + (memcmp(&x, &a_Rhs.x, sizeof(x)) == 0) && + (memcmp(&y, &a_Rhs.y, sizeof(y)) == 0) && + (memcmp(&z, &a_Rhs.z, sizeof(z)) == 0) + ); } inline bool EqualsEps(const Vector3 & a_Rhs, T a_Eps) const -- cgit v1.2.3