X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcommon.rs;h=01c0238ee278c39f0c44d0e80925579d279fd63d;hb=5d731022a8949b965bb0b2c13524ee7c5bfaf2e6;hp=283640e87667e53ada0a7ecf6bfb332b98016b5e;hpb=6ba7aef184300a81cb7fb9533e926f663c0f806f;p=kaka%2Frust-sdl-test.git diff --git a/src/common.rs b/src/common.rs index 283640e..01c0238 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}; #[macro_export] macro_rules! point { @@ -7,7 +7,7 @@ macro_rules! point { }; } -#[derive(Debug, Copy, Clone, PartialEq)] +#[derive(Debug, Default, Copy, Clone, PartialEq)] pub struct Point2D { pub x: T, pub y: T, @@ -17,26 +17,160 @@ impl Point2D { pub fn length(self) -> f64 { ((self.x * self.x) + (self.y * self.y)).sqrt() } + + pub fn to_i32(self) -> Point2D { + Point2D { + x: self.x as i32, + y: self.y as i32, + } + } +} + +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> $trait<$Rhs> for Point2D { + type Output = Self; + + fn $fn(self, $rhs: $Rhs) -> Self { + Self { + x: self.x $op $x, + y: self.y $op $y, + } + } + } + + impl + Copy> $trait_assign<$Rhs> for Point2D { + fn $fn_assign(&mut self, $rhs: $Rhs) { + *self = Self { + x: self.x $op $x, + y: self.y $op $y, + } + } + } + } +} + +point_op!(+, Add(add), AddAssign(add_assign), rhs = Point2D => rhs.x, rhs.y); +point_op!(-, Sub(sub), SubAssign(sub_assign), rhs = Point2D => rhs.x, rhs.y); +point_op!(*, Mul(mul), MulAssign(mul_assign), rhs = Point2D => rhs.x, rhs.y); +point_op!(/, Div(div), DivAssign(div_assign), rhs = Point2D => 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 + Copy> Mul for Point2D { + type Output = Self; + + fn mul(self, rhs: T) -> Self { + Self { + x: self.x * rhs, + y: self.y * rhs, + } + } +} + +impl + Copy> MulAssign for Point2D { + fn mul_assign(&mut self, rhs: T) { + *self = Self { + x: self.x * rhs, + y: self.y * rhs, + } + } +} + +////////// divide point with scalar //////////////////////////////////////////// +impl + Copy> Div for Point2D { + type Output = Self; + + fn div(self, rhs: T) -> Self { + Self { + x: self.x / rhs, + y: self.y / rhs, + } + } +} + +impl + Copy> DivAssign for Point2D { + fn div_assign(&mut self, rhs: T) { + *self = Self { + x: self.x / rhs, + y: self.y / rhs, + } + } +} + +impl> Neg for Point2D { + type Output = Self; + + fn neg(self) -> Self { + Self { + x: -self.x, + y: -self.y, + } + } +} + +impl From<(T, T)> for Point2D { + fn from(item: (T, T)) -> Self { + Point2D { + x: item.0, + y: item.1, + } + } +} + +impl From> for (T, T) { + fn from(item: Point2D) -> Self { + (item.x, item.y) + } } -impl> Add for Point2D { - type Output = Point2D; +impl From for Point2D { + 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(), + } + } +} - fn add(self, rhs: Point2D) -> Self::Output { +impl From for Point2D { + fn from(item: Radians) -> Self { Point2D { - x: self.x + rhs.x, - y: self.y + rhs.y, + x: item.0.cos(), + y: item.0.sin(), } } } -impl AddAssign for Point2D { - fn add_assign(&mut self, rhs: Point2D) { - self.x += rhs.x; - self.y += rhs.y; +#[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 ) => { + Rect { x: $x, y: $y } + }; +} + #[derive(Default)] pub struct Rect { pub width: T, @@ -59,6 +193,17 @@ impl From<(T, T)> for Rect { } } +#[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::*; @@ -78,6 +223,54 @@ 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)); + assert_eq!(point!(1, 0) - (2, 3), point!(-1, -3)); + } + + #[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)); + assert_eq!(point!(1, 0) * (2, 3), point!(2, 0)); + } + + #[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)); + assert_eq!(point!(6, 3) / (2, 3), point!(3, 1)); + } + + #[test] + fn neg_point() { + assert_eq!(point!(1, 1), -point!(-1, -1)); + } + + #[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]