Moved main loop to App

[kaka/rust-sdl-test.git] / src / boll.rs

diff --git a/src/boll.rs b/src/boll.rs
index 64be265..b8e21a7 100644 (file)
--- a/src/boll.rs
+++ b/src/boll.rs
@@ -4,9 +4,9 @@ use sdl2::rect::Rect;
 use sdl2::render::Canvas;
 use sdl2::video::Window;
 
-use {SCREEN_HEIGHT, SCREEN_WIDTH};
 use common::Point2D;
 use sdl2::gfx::primitives::DrawRenderer;
+use {SCREEN_HEIGHT, SCREEN_WIDTH};
 
 pub trait Boll {
     fn update(&mut self);
@@ -45,7 +45,8 @@ impl Boll for SquareBoll {
         canvas.set_draw_color(Color::RGBA(
             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
+            (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));
@@ -53,7 +54,6 @@ impl Boll for SquareBoll {
     }
 }
 
-
 pub struct CircleBoll {
     pub boll: SquareBoll,
 }
@@ -61,10 +61,7 @@ pub struct CircleBoll {
 impl CircleBoll {
     pub fn new(pos: Point2D<f64>, vel: Point2D<f64>) -> CircleBoll {
         CircleBoll {
-            boll: SquareBoll {
-                pos,
-                vel,
-            }
+            boll: SquareBoll { pos, vel },
         }
     }
 }
@@ -76,11 +73,13 @@ impl Boll for CircleBoll {
 
     fn draw(&self, canvas: &mut Canvas<Window>, size: u32) {
         let val = 255 - std::cmp::min(255, (self.boll.vel.length() * 20.0) as u8);
-        canvas.filled_circle(self.boll.pos.x as i16, self.boll.pos.y as i16, size as i16, Color::RGBA(
-            val,
-            val,
-            val,
-            128,
-        )).unwrap();
+        canvas
+            .filled_circle(
+                self.boll.pos.x as i16,
+                self.boll.pos.y as i16,
+                size as i16,
+                Color::RGBA(val, val, val, 128),
+            )
+            .unwrap();
     }
 }