From 2836f506d013d21591ddbc14c6168fd929aa5e95 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tomas=20Wenstr=C3=B6m?= <tomas.wenstrom@gmail.com>
Date: Thu, 14 Jan 2021 21:23:54 +0100
Subject: [PATCH] Implemented more operators for point

---
 src/common.rs    | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/core/game.rs |   2 +-
 2 files changed, 176 insertions(+), 9 deletions(-)

diff --git a/src/common.rs b/src/common.rs
index 52b7324..f91ec83 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, AddAssign, Mul};
+use std::ops::{Add, AddAssign, Sub, SubAssign, Mul, MulAssign, Div, DivAssign, Neg};
 
 pub type Nanoseconds = u64;
 
@@ -21,21 +21,152 @@ impl Point2D<f64> {
     }
 }
 
+////////// add point to point //////////////////////////////////////////////////
 impl<T: Add<Output = T>> Add for Point2D<T> {
-    type Output = Point2D<T>;
+    type Output = Self;
 
-    fn add(self, rhs: Point2D<T>) -> Self::Output {
-        Point2D {
+    fn add(self, rhs: Self) -> Self {
+        Self {
+            x: self.x + rhs.x,
+            y: self.y + rhs.y,
+        }
+    }
+}
+
+impl<T: Add<Output = T> + Copy> AddAssign for Point2D<T> {
+    fn add_assign(&mut self, rhs: Self) {
+	*self = Self {
             x: self.x + rhs.x,
             y: self.y + rhs.y,
+	}
+    }
+}
+
+////////// add tuple to point //////////////////////////////////////////////////
+impl<T: Add<Output = T>> Add<(T, T)> for Point2D<T> {
+    type Output = Self;
+
+    fn add(self, rhs: (T, T)) -> Self {
+        Self {
+            x: self.x + rhs.0,
+            y: self.y + rhs.1,
+        }
+    }
+}
+
+////////// subtract point from point ///////////////////////////////////////////
+impl<T: Sub<Output = T>> Sub for Point2D<T> {
+    type Output = Self;
+
+    fn sub(self, rhs: Self) -> Self {
+        Self {
+            x: self.x - rhs.x,
+            y: self.y - rhs.y,
         }
     }
 }
 
-impl<T: AddAssign> AddAssign for Point2D<T> {
-    fn add_assign(&mut self, rhs: Point2D<T>) {
-        self.x += rhs.x;
-        self.y += rhs.y;
+impl<T: Sub<Output = T> + Copy> SubAssign for Point2D<T> {
+    fn sub_assign(&mut self, rhs: Self) {
+	*self = Self {
+            x: self.x - rhs.x,
+            y: self.y - rhs.y,
+	}
+    }
+}
+
+////////// multiply point with scalar //////////////////////////////////////////
+impl<T: Mul<Output = T> + Copy> Mul<T> for Point2D<T> {
+    type Output = Self;
+
+    fn mul(self, rhs: T) -> Self {
+	Self {
+	    x: self.x * rhs,
+	    y: self.y * rhs,
+	}
+    }
+}
+
+impl<T: Mul<Output = T> + Copy> MulAssign<T> for Point2D<T> {
+    fn mul_assign(&mut self, rhs: T) {
+	*self = Self {
+	    x: self.x * rhs,
+	    y: self.y * rhs,
+	}
+    }
+}
+
+////////// multiply components of two points ///////////////////////////////////
+impl<T: Mul<Output = T>> Mul for Point2D<T> {
+    type Output = Self;
+
+    fn mul(self, rhs: Self) -> Self {
+	Self {
+	    x: self.x * rhs.x,
+	    y: self.y * rhs.y,
+	}
+    }
+}
+
+impl<T: Mul<Output = T> + Copy> MulAssign for Point2D<T> {
+    fn mul_assign(&mut self, rhs: Self) {
+	*self = Self {
+	    x: self.x * rhs.x,
+	    y: self.y * rhs.y,
+	}
+    }
+}
+
+////////// divide point with scalar ////////////////////////////////////////////
+impl<T: Div<Output = T> + Copy> Div<T> for Point2D<T> {
+    type Output = Self;
+
+    fn div(self, rhs: T) -> Self {
+	Self {
+	    x: self.x / rhs,
+	    y: self.y / rhs,
+	}
+    }
+}
+
+impl<T: Div<Output = T> + Copy> DivAssign<T> for Point2D<T> {
+    fn div_assign(&mut self, rhs: T) {
+	*self = Self {
+	    x: self.x / rhs,
+	    y: self.y / rhs,
+	}
+    }
+}
+
+////////// divide components of two points /////////////////////////////////////
+impl<T: Div<Output = T>> Div for Point2D<T> {
+    type Output = Self;
+
+    fn div(self, rhs: Self) -> Self {
+	Self {
+	    x: self.x / rhs.x,
+	    y: self.y / rhs.y,
+	}
+    }
+}
+
+impl<T: Div<Output = T> + Copy> DivAssign for Point2D<T> {
+    fn div_assign(&mut self, rhs: Self) {
+	*self = Self {
+	    x: self.x / rhs.x,
+	    y: self.y / rhs.y,
+	}
+    }
+}
+
+impl<T: Neg<Output = T>> Neg for Point2D<T> {
+    type Output = Self;
+
+    fn neg(self) -> Self {
+	Self {
+	    x: -self.x,
+	    y: -self.y,
+	}
     }
 }
 
@@ -96,6 +227,42 @@ mod tests {
         assert_eq!(a + point!(2, 2), point!(3, 2)); // Add
         a += point!(2, 2); // AddAssign
         assert_eq!(a, point!(3, 2));
+        assert_eq!(point!(1, 0) + (2, 3), point!(3, 3));
+    }
+
+    #[test]
+    fn sub_points() {
+        let mut a = point!(1, 0);
+        assert_eq!(a - point!(2, 2), point!(-1, -2));
+        a -= point!(2, 2);
+        assert_eq!(a, point!(-1, -2));
+    }
+
+    #[test]
+    fn mul_points() {
+        let mut a = point!(1, 2);
+        assert_eq!(a * 2, point!(2, 4));
+        assert_eq!(a * point!(2, 3), point!(2, 6));
+        a *= 2;
+        assert_eq!(a, point!(2, 4));
+        a *= point!(3, 1);
+        assert_eq!(a, point!(6, 4));
+    }
+
+    #[test]
+    fn div_points() {
+        let mut a = point!(4, 8);
+        assert_eq!(a / 2, point!(2, 4));
+        assert_eq!(a / point!(2, 4), point!(2, 2));
+        a /= 2;
+        assert_eq!(a, point!(2, 4));
+        a /= point!(2, 4);
+        assert_eq!(a, point!(1, 1));
+    }
+
+    #[test]
+    fn neg_point() {
+        assert_eq!(point!(1, 1), -point!(-1, -1));
     }
 
     #[test]
diff --git a/src/core/game.rs b/src/core/game.rs
index d9af79e..f4a16f0 100644
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -135,7 +135,7 @@ impl Character {
 impl Object for Character {
     fn update(&mut self, lvl: &Level, _dt: Nanoseconds) {
 	self.vel += lvl.gravity;
-	self.pos = self.pos + self.vel;
+	self.pos += self.vel;
 
 	let ctrl = &self.ctrl.borrow().ctrl;
 
-- 
2.11.0