From 86303936ab3180828b984ebb256bab8e69dab5cf Mon Sep 17 00:00:00 2001 From: Julian T Date: Sat, 30 Jan 2021 15:37:07 +0100 Subject: Finished initial film, reorganization and started work on shapes --- src/vector.rs | 110 ---------------------------------------------------------- 1 file changed, 110 deletions(-) delete mode 100644 src/vector.rs (limited to 'src/vector.rs') diff --git a/src/vector.rs b/src/vector.rs deleted file mode 100644 index ac70947..0000000 --- a/src/vector.rs +++ /dev/null @@ -1,110 +0,0 @@ -use crate::{Float, Number}; -use std::ops::{Sub, Add}; - -#[derive(Clone, Copy)] -pub struct Vector2 { - pub x: T, - pub y: T, -} - -pub type Vector2f = Vector2; -pub type Vector2i = Vector2; - -impl Vector2 { - pub fn new(initial: T) -> Vector2 { - Vector2 { x: initial, y: initial } - } - - pub fn new_xy(x: T, y: T) -> Vector2 { - Vector2 { x, y } - } -} - -impl Sub for Vector2 { - type Output = Self; - fn sub(self, op: Self) -> Self::Output { - Self::new_xy( - self.x - op.x, - self.y - op.y, - ) - } -} - -impl Add for Vector2 { - type Output = Self; - fn add(self, op: Self) -> Self::Output { - Self::new_xy( - self.x + op.x, - self.y + op.y, - ) - } -} - -impl Vector2f { - pub fn ceil(&self) -> Self { - Self::new_xy( - self.x.ceil(), - self.y.ceil() - ) - } - - pub fn floor(&self) -> Self { - Self::new_xy( - self.x.ceil(), - self.y.ceil() - ) - } -} - -impl From for Vector2f { - fn from(v: Vector2i) -> Self { - Self { - x: v.x as Float, - y: v.y as Float, - } - } -} - -impl From for Vector2i { - fn from(v: Vector2f) -> Self { - Self { - x: v.x as i32, - y: v.y as i32, - } - } -} - - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn new_vec2() { - let v = Vector2::new_xy(2.0, 10.0); - - assert!(v.x == 2.0 && v.y == 10.0); - - let v = Vector2::new(3); - - assert!(v.x == 3 && v.y == 3); - } - - #[test] - fn sub_vec2() { - let v1 = Vector2::new_xy(10, 11); - let v2 = Vector2::new_xy(2, 3); - - let v3 = v1-v2; - assert!(v3.x == 8 && v3.y == 8); - } - - #[test] - fn add_vec2() { - let v1 = Vector2::new_xy(10, 11); - let v2 = Vector2::new_xy(2, 3); - - let v3 = v1+v2; - assert!(v3.x == 12 && v3.y == 14); - } -} -- cgit v1.2.3