X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fboll.rs;h=07c7b2807b11f3fece94d7e000a50985fb1ce868;hb=5d7eff9e9c0f585e9c4d57907f2e72003d39c757;hp=abf6c879ebc81406479472fb974f6359114945cf;hpb=6566d7e5467888e41b18dbaaa52d6a8636ce8e21;p=kaka%2Frust-sdl-test.git diff --git a/src/boll.rs b/src/boll.rs index abf6c87..07c7b28 100644 --- a/src/boll.rs +++ b/src/boll.rs @@ -1,8 +1,7 @@ use core::render::Renderer; -use sdl2::rect::Rect; - -use common::Point2D; +use geometry::Point; use sdl2::gfx::primitives::DrawRenderer; +use sdl2::rect::Rect; use {SCREEN_HEIGHT, SCREEN_WIDTH}; pub trait Boll { @@ -11,8 +10,8 @@ pub trait Boll { } pub struct SquareBoll { - pub pos: Point2D, - pub vel: Point2D, + pub pos: Point, + pub vel: Point, } impl Boll for SquareBoll { @@ -56,7 +55,7 @@ pub struct CircleBoll { } impl CircleBoll { - pub fn new(pos: Point2D, vel: Point2D) -> CircleBoll { + pub fn new(pos: Point, vel: Point) -> CircleBoll { CircleBoll { boll: SquareBoll { pos, vel }, }