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

diff --git a/src/common.rs b/src/common.rs
index f91ec83..01c0238 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,7 +1,5 @@
 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 ) => {
@@ -19,61 +17,47 @@ impl Point2D<f64> {
     pub fn length(self) -> f64 {
         ((self.x * self.x) + (self.y * self.y)).sqrt()
     }
-}
-
-////////// 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,
+    pub fn to_i32(self) -> Point2D<i32> {
+	Point2D {
+	    x: self.x as i32,
+	    y: self.y as i32,
 	}
     }
 }
 
-////////// 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,
+macro_rules! point_op {
+    ($op:tt, $trait:ident($fn:ident), $trait_assign:ident($fn_assign:ident), $rhs:ident = $Rhs:ty => $x:expr, $y:expr) => {
+        impl<T: $trait<Output = T>> $trait<$Rhs> for Point2D<T> {
+            type Output = Self;
+
+            fn $fn(self, $rhs: $Rhs) -> Self {
+                Self {
+                    x: self.x $op $x,
+                    y: self.y $op $y,
+                }
+            }
         }
-    }
-}
-
-////////// 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: $trait<Output = T> + Copy> $trait_assign<$Rhs> for Point2D<T> {
+            fn $fn_assign(&mut self, $rhs: $Rhs) {
+                *self = Self {
+                    x: self.x $op $x,
+                    y: self.y $op $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,
-	}
-    }
-}
+point_op!(+, Add(add), AddAssign(add_assign), rhs = Point2D<T> => rhs.x, rhs.y);
+point_op!(-, Sub(sub), SubAssign(sub_assign), rhs = Point2D<T> => rhs.x, rhs.y);
+point_op!(*, Mul(mul), MulAssign(mul_assign), rhs = Point2D<T> => rhs.x, rhs.y);
+point_op!(/, Div(div), DivAssign(div_assign), rhs = Point2D<T> => rhs.x, rhs.y);
+point_op!(+, Add(add), AddAssign(add_assign), rhs = (T, T) => rhs.0, rhs.1);
+point_op!(-, Sub(sub), SubAssign(sub_assign), rhs = (T, T) => rhs.0, rhs.1);
+point_op!(*, Mul(mul), MulAssign(mul_assign), rhs = (T, T) => rhs.0, rhs.1);
+point_op!(/, Div(div), DivAssign(div_assign), rhs = (T, T) => rhs.0, rhs.1);
 
 ////////// multiply point with scalar //////////////////////////////////////////
 impl<T: Mul<Output = T> + Copy> Mul<T> for Point2D<T> {
@@ -96,27 +80,6 @@ impl<T: Mul<Output = T> + Copy> MulAssign<T> for Point2D<T> {
     }
 }
 
-////////// 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;
@@ -138,27 +101,6 @@ impl<T: Div<Output = T> + Copy> DivAssign<T> for Point2D<T> {
     }
 }
 
-////////// 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;
 
@@ -179,6 +121,49 @@ impl<T> From<(T, T)> for Point2D<T> {
     }
 }
 
+impl<T> From<Point2D<T>> for (T, T) {
+    fn from(item: Point2D<T>) -> Self {
+        (item.x, item.y)
+    }
+}
+
+impl From<Degrees> for Point2D<f64> {
+    fn from(item: Degrees) -> Self {
+        Point2D {
+            x: (item.0 * std::f64::consts::PI / 180.0).cos(),
+            y: (item.0 * std::f64::consts::PI / 180.0).sin(),
+        }
+    }
+}
+
+impl From<Radians> for Point2D<f64> {
+    fn from(item: Radians) -> Self {
+        Point2D {
+            x: item.0.cos(),
+            y: item.0.sin(),
+        }
+    }
+}
+
+#[derive(Debug, Default, PartialEq, Clone, Copy)]
+pub struct Degrees(pub f64);
+#[derive(Debug, Default, PartialEq, Clone, Copy)]
+pub struct Radians(pub f64);
+
+impl Degrees {
+    #[allow(dead_code)]
+    fn to_radians(&self) -> Radians {
+	Radians(self.0 * std::f64::consts::PI / 180.0)
+    }
+}
+
+impl Radians {
+    #[allow(dead_code)]
+    fn to_degrees(&self) -> Degrees {
+	Degrees(self.0 * 180.0 * std::f64::consts::FRAC_1_PI)
+    }
+}
+
 #[macro_export]
 macro_rules! rect {
     ( $x:expr, $y:expr ) => {
@@ -208,6 +193,17 @@ impl<T> From<(T, T)> for Rect<T> {
     }
 }
 
+#[macro_export]
+macro_rules! hashmap {
+    ($($k:expr => $v:expr),*) => {
+	{
+	    let mut map = std::collections::HashMap::new();
+	    $(map.insert($k, $v);)*
+	    map
+	}
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -236,6 +232,7 @@ mod tests {
         assert_eq!(a - point!(2, 2), point!(-1, -2));
         a -= point!(2, 2);
         assert_eq!(a, point!(-1, -2));
+        assert_eq!(point!(1, 0) - (2, 3), point!(-1, -3));
     }
 
     #[test]
@@ -247,6 +244,7 @@ mod tests {
         assert_eq!(a, point!(2, 4));
         a *= point!(3, 1);
         assert_eq!(a, point!(6, 4));
+        assert_eq!(point!(1, 0) * (2, 3), point!(2, 0));
     }
 
     #[test]
@@ -258,6 +256,7 @@ mod tests {
         assert_eq!(a, point!(2, 4));
         a /= point!(2, 4);
         assert_eq!(a, point!(1, 1));
+        assert_eq!(point!(6, 3) / (2, 3), point!(3, 1));
     }
 
     #[test]
@@ -266,6 +265,15 @@ mod tests {
     }
 
     #[test]
+    fn angles() {
+	assert_eq!(Radians(0.0).to_degrees(), Degrees(0.0));
+	assert_eq!(Radians(std::f64::consts::PI).to_degrees(), Degrees(180.0));
+	assert_eq!(Degrees(180.0).to_radians(), Radians(std::f64::consts::PI));
+	assert!((Point2D::from(Degrees(90.0)) - point!(0.0, 1.0)).length() < 0.001);
+	assert!((Point2D::from(Radians(std::f64::consts::FRAC_PI_2)) - point!(0.0, 1.0)).length() < 0.001);
+    }
+
+    #[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);