Do rendering via a renderer instead of sdl

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

diff --git a/src/core/game.rs b/src/core/game.rs
index f48d9b3..e5e2aa6 100644 (file)
--- a/src/core/game.rs
+++ b/src/core/game.rs
@@ -1,13 +1,12 @@
 use AppState;
-use sdl2::joystick::PowerLevel;
 use common::Point2D;
 use core::controller::Controller;
 use core::controller::ControllerManager;
+use core::render::Renderer;
 use point;
 use sdl2::event::Event;
+use sdl2::joystick::PowerLevel;
 use sdl2::rect::Rect;
-use sdl2::render::Canvas;
-use sdl2::video::Window;
 use sprites::SpriteManager;
 use std::cell::RefCell;
 use std::rc::Rc;
@@ -41,8 +40,8 @@ impl AppState for GameState {
        self.world.update(dt);
     }
 
-    fn render(&mut self, canvas: &mut Canvas<Window>, sprites: &SpriteManager) {
-       self.world.render(canvas, sprites);
+    fn render(&mut self, renderer: &mut Renderer, sprites: &SpriteManager) {
+       self.world.render(renderer, sprites);
     }
 
     fn handle_event(&mut self, _event: Event) {}
@@ -81,10 +80,10 @@ impl World {
        }
     }
 
-    pub fn render(&mut self, canvas: &mut Canvas<Window>, sprites: &SpriteManager) {
-       self.level.render(canvas, sprites);
+    pub fn render(&mut self, renderer: &mut Renderer, sprites: &SpriteManager) {
+       self.level.render(renderer, sprites);
        for o in &mut self.objects {
-           o.render(canvas, sprites);
+           o.render(renderer, sprites);
        }
     }
 
@@ -102,12 +101,12 @@ pub struct Level {
 }
 
 impl Level {
-    pub fn render(&mut self, canvas: &mut Canvas<Window>, _sprites: &SpriteManager) {
-       let w = canvas.viewport().width() as i32;
+    pub fn render(&mut self, renderer: &mut Renderer, _sprites: &SpriteManager) {
+       let w = renderer.viewport().0 as i32;
        for i in 1..11 {
            let y = (i * i - 1) as i32 + self.ground as i32;
-           canvas.set_draw_color((255 - i * 20, 255 - i * 20, 0));
-           canvas.draw_line((0, y), (w, y)).unwrap();
+           renderer.canvas().set_draw_color((255 - i * 20, 255 - i * 20, 0));
+           renderer.canvas().draw_line((0, y), (w, y)).unwrap();
        }
     }
 }
@@ -118,7 +117,7 @@ type Objects = Vec<Box<dyn Object>>;
 
 pub trait Object {
     fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState;
-    fn render(&self, _canvas: &mut Canvas<Window>, _sprites: &SpriteManager) {}
+    fn render(&self, _renderer: &mut Renderer, _sprites: &SpriteManager) {}
 }
 
 #[derive(PartialEq)]
@@ -198,35 +197,32 @@ impl Object for Character {
        Alive
     }
 
-    fn render(&self, canvas: &mut Canvas<Window>, sprites: &SpriteManager) {
+    fn render(&self, renderer: &mut Renderer, sprites: &SpriteManager) {
         let block = sprites.get("mario");
        let size = 32;
-        canvas.copy(block, None, Rect::new(self.pos.x as i32 - size as i32 / 2, self.pos.y as i32 - size as i32, size, size)).unwrap();
+        renderer.blit(block, None, Rect::new(self.pos.x as i32 - size as i32 / 2, self.pos.y as i32 - size as i32, size, size));
 
        let ctrl = &self.ctrl.borrow();
        let l = 300.0;
        let pos = (self.pos.x as i32, self.pos.y as i32);
        // axis values
        let p = (self.pos + ctrl.aim.to_axis_point() * l).to_i32().into();
-       canvas.set_draw_color((0, 255, 0));
-       canvas.draw_line(pos, p).unwrap();
-       draw_cross(canvas, p);
+       renderer.draw_line(pos, p, (0, 255, 0));
+       draw_cross(renderer, p);
        // values limited to unit vector
        let p = (self.pos + ctrl.aim.to_point() * l).to_i32().into();
-       canvas.set_draw_color((255, 0, 0));
-       canvas.draw_line(pos, p).unwrap();
-       draw_cross(canvas, p);
+       renderer.draw_line(pos, p, (255, 0, 0));
+       draw_cross(renderer, p);
        // circle values
        let p = (self.pos + Point2D::from(ctrl.aim.a) * l).to_i32().into();
-       canvas.set_draw_color((0, 0, 255));
-       canvas.draw_line(pos, p).unwrap();
-       draw_cross(canvas, p);
+       renderer.draw_line(pos, p, (0, 0, 255));
+       draw_cross(renderer, p);
     }
 }
 
-fn draw_cross(canvas: &mut Canvas<Window>, p: (i32, i32)) {
-    canvas.draw_line((p.0 - 5, p.1), (p.0 + 5, p.1)).unwrap();
-    canvas.draw_line((p.0, p.1 - 5), (p.0, p.1 + 5)).unwrap();
+fn draw_cross(renderer: &mut Renderer, p: (i32, i32)) {
+    renderer.canvas().draw_line((p.0 - 5, p.1), (p.0 + 5, p.1)).unwrap();
+    renderer.canvas().draw_line((p.0, p.1 - 5), (p.0, p.1 + 5)).unwrap();
 }
 
 ////////// BOLL ////////////////////////////////////////////////////////////////
@@ -267,11 +263,11 @@ impl Object for Boll {
        Alive
     }
 
-    fn render(&self, canvas: &mut Canvas<Window>, _sprites: &SpriteManager) {
+    fn render(&self, renderer: &mut Renderer, _sprites: &SpriteManager) {
         let block = _sprites.get("block");
        let size = 4 + self.bounces * 6;
-        canvas.copy(block, None, Rect::new(self.pos.x as i32 - size as i32 / 2, self.pos.y as i32 - size as i32 / 2, size as u32, size as u32)).unwrap();
-       // canvas.set_draw_color((0, self.bounces * 100, 255));
-       // canvas.draw_point((self.pos.x as i32, self.pos.y as i32)).unwrap();
+        renderer.blit(block, None, Rect::new(self.pos.x as i32 - size as i32 / 2, self.pos.y as i32 - size as i32 / 2, size as u32, size as u32));
+       // renderer.set_draw_color((0, self.bounces * 100, 255));
+       // renderer.draw_point((self.pos.x as i32, self.pos.y as i32)).unwrap();
     }
 }