X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcommon.rs;h=d2121b0a972a11573bf7302076f1f951c1ac716a;hb=902b2b3136a49738de32a6b2fd1df78d18cf6048;hp=c75274c56954174069300788f42798bf036457ad;hpb=6cd86b942012c98c645b975f398bd5253118e3e7;p=kaka%2Frust-sdl-test.git

diff --git a/src/common.rs b/src/common.rs
index c75274c..d2121b0 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,6 +17,13 @@ impl Point2D<f64> {
     pub fn length(self) -> f64 {
         ((self.x * self.x) + (self.y * self.y)).sqrt()
     }
+
+    pub fn to_i32(self) -> Point2D<i32> {
+	Point2D {
+	    x: self.x as i32,
+	    y: self.y as i32,
+	}
+    }
 }
 
 macro_rules! point_op {
@@ -116,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 ) => {
@@ -206,6 +254,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);