diff --git a/src/rect.rs b/src/rect.rs index 2487df8..f30fad8 100644 --- a/src/rect.rs +++ b/src/rect.rs @@ -1,17 +1,17 @@ -use num::Num; use crate::vec2::Vec2; +use num::{Num, ToPrimitive}; #[derive(Copy, Clone)] -pub struct Rect { +pub struct Rect { pub pos: Vec2, pub size: Vec2, } -impl Rect { +impl Rect { pub fn new(x: T, y: T, w: T, h: T) -> Rect { Rect { - pos: Vec2{x, y}, - size: Vec2{x: w, y: h}, + pos: Vec2 { x, y }, + size: Vec2 { x: w, y: h }, } } } diff --git a/src/vec2.rs b/src/vec2.rs index 0cf1959..fb0740d 100644 --- a/src/vec2.rs +++ b/src/vec2.rs @@ -6,7 +6,7 @@ pub struct Vec2 { pub y: T, } -impl Vec2 { +impl Vec2 { //pub static pub fn zero() -> Self { Vec2 { @@ -17,11 +17,11 @@ impl Vec2 { //pub pub fn size(&self) -> usize { - (self.x * self.y) as usize + (self.x * self.y).to_usize().unwrap() } } -impl Default for Vec2 { +impl Default for Vec2 { fn default() -> Self { Vec2 { x: T::default(),