X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=1bdaa8da8edc0ea466169fd386493322f8289525;hb=602766547385196282a03bb13cfdb785f6446a7a;hp=bf7d2df3704e53e4c8c83daf9e4e18645b45ceec;hpb=bf7b5671bb386ccd3d325ae3dea33046342d129c;p=kaka%2Frust-sdl-test.git diff --git a/src/core/game.rs b/src/core/game.rs index bf7d2df..1bdaa8d 100644 --- a/src/core/game.rs +++ b/src/core/game.rs @@ -1,16 +1,18 @@ use AppState; -use common::Nanoseconds; use common::Point2D; use core::controller::Controller; use core::controller::ControllerManager; +use core::level::Level; +use core::render::Renderer; use point; use sdl2::event::Event; +use sdl2::joystick::PowerLevel; +use sdl2::keyboard::Keycode; use sdl2::rect::Rect; -use sdl2::render::Canvas; -use sdl2::video::Window; use sprites::SpriteManager; use std::cell::RefCell; use std::rc::Rc; +use time::Duration; ////////// GAMESTATE /////////////////////////////////////////////////////////// @@ -28,7 +30,7 @@ impl GameState { } impl AppState for GameState { - fn enter(&mut self, ctrl_man: &mut ControllerManager) { + fn enter(&mut self, ctrl_man: &ControllerManager) { if let Some(ctrl) = ctrl_man.controllers.get(&0) { self.world.add(Box::new(Character::new(ctrl.clone()))); } @@ -36,15 +38,28 @@ impl AppState for GameState { fn leave(&mut self) {} - fn update(&mut self, dt: Nanoseconds) { + fn update(&mut self, dt: Duration) { self.world.update(dt); } - fn render(&mut self, canvas: &mut Canvas, sprites: &mut 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) {} + fn handle_event(&mut self, event: Event) { + match event { + Event::KeyDown { keycode: Some(Keycode::Space), .. } => { + self.world.level.regenerate(); + } + Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => { + self.world.level.increase_iteration(); + } + Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => { + self.world.level.decrease_iteration(); + } + _ => {} + } + } } ////////// WORLD /////////////////////////////////////////////////////////////// @@ -58,15 +73,12 @@ pub struct World { impl World { pub fn new() -> Self { World { - level: Level { - gravity: point!(0.0, 0.1), - ground: 600.0, - }, + level: Level::new(point!(0.0, 0.1), 600.0), ..Default::default() } } - pub fn update(&mut self, dt: Nanoseconds) { + pub fn update(&mut self, dt: Duration) { let mut breeding_ground = vec!(); for i in (0..self.objects.len()).rev() { @@ -80,10 +92,10 @@ impl World { } } - pub fn render(&mut self, canvas: &mut Canvas, sprites: &mut 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); } } @@ -92,32 +104,13 @@ impl World { } } -////////// LEVEL /////////////////////////////////////////////////////////////// - -#[derive(Default)] -pub struct Level { - gravity: Point2D, - ground: f64, // just to have something -} - -impl Level { - pub fn render(&mut self, canvas: &mut Canvas, _sprites: &mut SpriteManager) { - let w = canvas.viewport().width() 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(); - } - } -} - ////////// OBJECT ////////////////////////////////////////////////////////////// type Objects = Vec>; pub trait Object { - fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Nanoseconds) -> ObjectState; - fn render(&self, _canvas: &mut Canvas, _sprites: &mut SpriteManager) {} + fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState; + fn render(&self, _renderer: &mut Renderer, _sprites: &SpriteManager) {} } #[derive(PartialEq)] @@ -147,7 +140,7 @@ impl Character { } impl Object for Character { - fn update(&mut self, objects: &mut Objects, lvl: &Level, _dt: Nanoseconds) -> ObjectState { + fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState { self.vel += lvl.gravity; self.pos += self.vel; @@ -169,11 +162,23 @@ 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, })); } - ctrl.rumble(1.0, _dt as u32 / 1_000_000); + ctrl.rumble(1.0, dt); + } + + if ctrl.start.is_pressed && !ctrl.start.was_pressed { + match ctrl.device.power_level() { + Ok(PowerLevel::Unknown) => { println!("power level unknown"); } + Ok(PowerLevel::Empty) => { println!("power level empty"); } + Ok(PowerLevel::Low) => { println!("power level low"); } + Ok(PowerLevel::Medium) => { println!("power level medium"); } + Ok(PowerLevel::Full) => { println!("power level full"); } + Ok(PowerLevel::Wired) => { println!("power level wired"); } + Err(_) => {} + }; } match ctrl.mov.x { @@ -185,37 +190,36 @@ impl Object for Character { Alive } - fn render(&self, canvas: &mut Canvas, sprites: &mut 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 //////////////////////////////////////////////////////////////// + pub struct Boll { pos: Point2D, vel: Point2D, @@ -223,28 +227,34 @@ pub struct Boll { } impl Object for Boll { - fn update(&mut self, _objects: &mut Objects, lvl: &Level, _dt: Nanoseconds) -> ObjectState { + fn update(&mut self, objects: &mut Objects, lvl: &Level, _dt: Duration) -> ObjectState { self.vel += lvl.gravity; self.pos += self.vel; - if self.pos.y >= lvl.ground { + let x = (self.pos.x / lvl.grid.cell_size as f64).min(lvl.grid.width as f64 - 1.0).max(0.0) as usize; + let y = (self.pos.y / lvl.grid.cell_size as f64).min(lvl.grid.height as f64 - 1.0).max(0.0) as usize; + if lvl.grid.cells[x][y] { if self.bounces == 0 { return Dead - } else { - self.bounces -= 1; - self.pos.y = lvl.ground; - self.vel.y = -self.vel.y; } + self.vel = -self.vel; + self.bounces -= 1; + 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: &mut 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.canvas().set_draw_color((0, self.bounces * 100, 255)); + // renderer.canvas().draw_point((self.pos.x as i32, self.pos.y as i32)).unwrap(); } }