X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=e5e2aa6d8bdab4897c3d46670ba158c34c19ae29;hb=6566d7e5467888e41b18dbaaa52d6a8636ce8e21;hp=f938245c48bff8d94437a885ad7feac6935772fc;hpb=dbf33b0d211241b7546e299e10c94af9b512bd60;p=kaka%2Frust-sdl-test.git diff --git a/src/core/game.rs b/src/core/game.rs index f938245..e5e2aa6 100644 --- 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, 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, 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, _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>; pub trait Object { fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState; - fn render(&self, _canvas: &mut Canvas, _sprites: &SpriteManager) {} + fn render(&self, _renderer: &mut Renderer, _sprites: &SpriteManager) {} } #[derive(PartialEq)] @@ -170,7 +169,7 @@ impl Object for Character { for _i in 0..100 { objects.push(Box::new(Boll { pos: self.pos, - vel: ctrl.aim.to_adjusted_point() * (3.0 + rand::random::()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel, + vel: ctrl.aim.to_point() * (3.0 + rand::random::()) + point!(normal.sample(&mut rand::thread_rng()), normal.sample(&mut rand::thread_rng())) + self.vel, bounces: 2, })); } @@ -198,35 +197,32 @@ impl Object for Character { Alive } - fn render(&self, canvas: &mut Canvas, 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(); + 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((0, 255, 0)); - canvas.draw_line(pos, p).unwrap(); - draw_cross(canvas, p); - // adjusted values - let p = (self.pos + ctrl.aim.to_adjusted_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, 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 //////////////////////////////////////////////////////////////// @@ -238,7 +234,7 @@ pub struct Boll { } impl Object for Boll { - fn update(&mut self, _objects: &mut Objects, lvl: &Level, _dt: Duration) -> ObjectState { + fn update(&mut self, objects: &mut Objects, lvl: &Level, _dt: Duration) -> ObjectState { self.vel += lvl.gravity; self.pos += self.vel; @@ -252,14 +248,26 @@ impl Object for Boll { } } + if self.pos.x <= 0.0 || self.pos.x >= 1280.0 { // only for testing + self.pos.x = self.pos.x.max(0.0).min(1280.0); + self.vel.x = -self.vel.x; + self.bounces = 0; + use rand::distributions::{Distribution, Normal}; + let normal = Normal::new(0.5, 0.4); + objects.push(Box::new(Boll { + vel: self.vel * normal.sample(&mut rand::thread_rng()), + ..*self + })); + } + Alive } - fn render(&self, canvas: &mut Canvas, _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(); } }