X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fboll.rs;h=5d095633529e879bb501c1fd9702a5997573ca88;hb=4074267844733949556af129550dfc42fc81da76;hp=b8e21a798d2fe26a097e8a7fdb490d17d6e79fc4;hpb=6ba7aef184300a81cb7fb9533e926f663c0f806f;p=kaka%2Frust-sdl-test.git

diff --git a/src/boll.rs b/src/boll.rs
index b8e21a7..5d09563 100644
--- a/src/boll.rs
+++ b/src/boll.rs
@@ -1,21 +1,18 @@
-use sdl2::pixels::Color;
-use sdl2::rect::Point;
+use core::render::Renderer;
 use sdl2::rect::Rect;
-use sdl2::render::Canvas;
-use sdl2::video::Window;
 
-use common::Point2D;
+use common::Point;
 use sdl2::gfx::primitives::DrawRenderer;
 use {SCREEN_HEIGHT, SCREEN_WIDTH};
 
 pub trait Boll {
     fn update(&mut self);
-    fn draw(&self, canvas: &mut Canvas<Window>, size: u32);
+    fn draw(&self, renderer: &mut Renderer, size: u32);
 }
 
 pub struct SquareBoll {
-    pub pos: Point2D<f64>,
-    pub vel: Point2D<f64>,
+    pub pos: Point<f64>,
+    pub vel: Point<f64>,
 }
 
 impl Boll for SquareBoll {
@@ -41,16 +38,16 @@ impl Boll for SquareBoll {
         }
     }
 
-    fn draw(&self, canvas: &mut Canvas<Window>, size: u32) {
-        canvas.set_draw_color(Color::RGBA(
+    fn draw(&self, renderer: &mut Renderer, size: u32) {
+        renderer.canvas().set_draw_color((
             255 - std::cmp::min(255, (self.vel.length() * 25.0) as u8),
             (255.0 * (self.pos.x / SCREEN_WIDTH as f64)) as u8,
             (255.0 * (self.pos.y / SCREEN_HEIGHT as f64)) as u8,
             128,
         ));
         let mut r = Rect::new(0, 0, size, size);
-        r.center_on(Point::new(self.pos.x as i32, self.pos.y as i32));
-        canvas.fill_rect(r).unwrap();
+        r.center_on((self.pos.x as i32, self.pos.y as i32));
+        renderer.canvas().fill_rect(r).unwrap();
     }
 }
 
@@ -59,7 +56,7 @@ pub struct CircleBoll {
 }
 
 impl CircleBoll {
-    pub fn new(pos: Point2D<f64>, vel: Point2D<f64>) -> CircleBoll {
+    pub fn new(pos: Point<f64>, vel: Point<f64>) -> CircleBoll {
         CircleBoll {
             boll: SquareBoll { pos, vel },
         }
@@ -71,14 +68,15 @@ impl Boll for CircleBoll {
         self.boll.update();
     }
 
-    fn draw(&self, canvas: &mut Canvas<Window>, size: u32) {
+    fn draw(&self, renderer: &mut Renderer, size: u32) {
         let val = 255 - std::cmp::min(255, (self.boll.vel.length() * 20.0) as u8);
-        canvas
+        renderer
+	    .canvas()
             .filled_circle(
                 self.boll.pos.x as i16,
                 self.boll.pos.y as i16,
                 size as i16,
-                Color::RGBA(val, val, val, 128),
+                (val, val, val, 128),
             )
             .unwrap();
     }