X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcommon.rs;h=f91ec8325908a48efdebf4223e9e4ee535d2b34f;hb=2836f506d013d21591ddbc14c6168fd929aa5e95;hp=6f000d8762abffc8410b016da5ae28b20c39aa2f;hpb=787dbfb4e03fdc6c6cfdb153e0e8fab2eb3ab2d1;p=kaka%2Frust-sdl-test.git

diff --git a/src/common.rs b/src/common.rs
index 6f000d8..f91ec83 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,11 +1,15 @@
-use std::ops::{Add, AddAssign};
+use std::ops::{Add, AddAssign, Sub, SubAssign, Mul, MulAssign, Div, DivAssign, Neg};
+
+pub type Nanoseconds = u64;
 
 #[macro_export]
 macro_rules! point {
-    ( $x:expr, $y:expr ) => { Point2D { x:$x, y:$y } };
+    ( $x:expr, $y:expr ) => {
+        Point2D { x: $x, y: $y }
+    };
 }
 
-#[derive(Debug, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq)]
 pub struct Point2D<T> {
     pub x: T,
     pub y: T,
@@ -17,18 +21,190 @@ impl Point2D<f64> {
     }
 }
 
-impl<T: Add<Output=T>> Add for Point2D<T> {
-    type Output = Point2D<T>;
+////////// add point to point //////////////////////////////////////////////////
+impl<T: Add<Output = T>> Add for Point2D<T> {
+    type Output = Self;
+
+    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: 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 add(self, rhs: Point2D<T>) -> Self::Output {
-        Point2D { x: self.x + rhs.x, y: self.y + rhs.y }
+    fn neg(self) -> Self {
+	Self {
+	    x: -self.x,
+	    y: -self.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> From<(T, T)> for Point2D<T> {
+    fn from(item: (T, T)) -> Self {
+        Point2D {
+            x: item.0,
+            y: item.1,
+        }
+    }
+}
+
+#[macro_export]
+macro_rules! rect {
+    ( $x:expr, $y:expr ) => {
+        Rect { x: $x, y: $y }
+    };
+}
+
+#[derive(Default)]
+pub struct Rect<T> {
+    pub width: T,
+    pub height: T,
+}
+
+impl<T: Mul<Output = T> + Copy> Rect<T> {
+    #[allow(dead_code)]
+    pub fn area(&self) -> T {
+        self.width * self.height
+    }
+}
+
+impl<T> From<(T, T)> for Rect<T> {
+    fn from(item: (T, T)) -> Self {
+        Rect {
+            width: item.0,
+            height: item.1,
+        }
     }
 }
 
@@ -51,5 +227,48 @@ 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]
+    fn area_for_rect_of_multipliable_type() {
+        let r: Rect<_> = (30, 20).into(); // the Into trait uses the From trait
+        assert_eq!(r.area(), 30 * 20);
+        // let a = Rect::from(("a".to_string(), "b".to_string())).area(); // this doesn't work, because area() is not implemented for String
     }
 }