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 ) => {
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> {
}
}
-////////// 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;
}
}
-////////// 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;
}
}
+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 ) => {
}
}
+#[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::*;
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]
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]
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]
}
#[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);
Dolda2000 GitWeb / kaka / rust-sdl-test.git / blobdiff