BasicVector4 subtraction operators are now non-members

codereader · Sep 8, 2021 · b8b1e3c · b8b1e3c
1 parent 54511a8
commit b8b1e3c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/libs/math/Vector4.h b/libs/math/Vector4.h
@@ -100,28 +100,6 @@ class BasicVector4
         return !(*this == other);
     }
 
-    /*  Define the substraction operators - and -= with any other BasicVector4 of type OtherElement
-     *  The vectors are substracted from each other element-wise
-     */
-    template<typename OtherElement>
-    BasicVector4<Element> operator- (const BasicVector4<OtherElement>& other) const {
-        return BasicVector4<Element>(
-            _v[0] - static_cast<Element>(other.x()),
-            _v[1] - static_cast<Element>(other.y()),
-            _v[2] - static_cast<Element>(other.z()),
-            _v[3] - static_cast<Element>(other.w())
-        );
-    }
-
-    template<typename OtherElement>
-	BasicVector4<Element>& operator-= (const BasicVector4<OtherElement>& other) {
-        _v[0] -= static_cast<Element>(other.x());
-        _v[1] -= static_cast<Element>(other.y());
-        _v[2] -= static_cast<Element>(other.z());
-        _v[3] -= static_cast<Element>(other.w());
-		return *this;
-    }
-
     /*  Define the multiplication operators * and *= with another Vector4 of type OtherElement
      *
      *  The vectors are multiplied element-wise
@@ -276,6 +254,26 @@ BasicVector4<T>& operator+=(BasicVector4<T>& v1, const BasicVector4<T>& v2)
     return v1;
 }
 
+/// Componentwise subtraction of two vectors
+template<typename T>
+BasicVector4<T> operator- (const BasicVector4<T>& v1, const BasicVector4<T>& v2)
+{
+    return BasicVector4<T>(v1.x() - v2.x(),
+                           v1.y() - v2.y(),
+                           v1.z() - v2.z(),
+                           v1.w() - v2.w());
+}
+
+template<typename T>
+BasicVector4<T>& operator-= (BasicVector4<T>& v1, const BasicVector4<T>& v2)
+{
+    v1.x() -= v2.x();
+    v1.y() -= v2.y();
+    v1.z() -= v2.z();
+    v1.w() -= v2.w();
+    return v1;
+}
+
 /// Multiply BasicVector4 with a scalar
 template <
     typename T, typename S,

diff --git a/test/math/Vector.cpp b/test/math/Vector.cpp
@@ -219,7 +219,15 @@ TEST(MathTest, SubtractVector4)
     Vector4 v1(0, 96, 457, -3.5);
     Vector4 v2(0.125, 4, 7.5, 90);
 
+    // Subtract and return
     EXPECT_EQ(v1 - v2, Vector4(-0.125, 92, 449.5, -93.5));
+    EXPECT_EQ(v2 - v2, Vector4());
+
+    // Subtract in place
+    auto v1Copy = v1;
+    v1 -= v2;
+    EXPECT_NE(v1, v1Copy);
+    EXPECT_EQ(v1, Vector4(-0.125, 92, 449.5, -93.5));
 }
 
 TEST(MathTest, ScalarMultiplyVector3)