X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=eabbdf975ab36fc4edfb9682e4b7585f36fd490b;hb=e570927ad1703298a2c85599c7e25475c60b33d4;hp=f938245c48bff8d94437a885ad7feac6935772fc;hpb=dbf33b0d211241b7546e299e10c94af9b512bd60;p=kaka%2Frust-sdl-test.git diff --git a/src/core/game.rs b/src/core/game.rs index f938245..eabbdf9 100644 --- a/src/core/game.rs +++ b/src/core/game.rs @@ -1,13 +1,16 @@ +use ActiveState; use AppState; -use sdl2::joystick::PowerLevel; -use common::Point2D; +use common::{Point, Radians}; +use core::app::StateChange; use core::controller::Controller; use core::controller::ControllerManager; +use core::level::{Level, LevelGenerator}; +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; @@ -18,34 +21,63 @@ use time::Duration; #[derive(Default)] pub struct GameState { world: World, + lvlgen: LevelGenerator, } impl GameState { pub fn new() -> Self { + let lvlgen = LevelGenerator::new(0, 5); GameState { - world: World::new(), + world: World::new(lvlgen.generate()), + lvlgen, } } } impl AppState for GameState { 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()))); + for (_k, v) in ctrl_man.controllers.iter() { + self.world.add(Box::new(Character::new(v.clone()))); } } fn leave(&mut self) {} - fn update(&mut self, dt: Duration) { + fn update(&mut self, dt: Duration) -> Option { self.world.update(dt); + None } - 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) {} + fn handle_event(&mut self, event: Event) -> Option { + match event { + Event::KeyDown { keycode: Some(Keycode::Escape), .. } => { + return Some(StateChange::Pop) + } + Event::KeyDown { keycode: Some(Keycode::Return), .. } => { + return Some(StateChange::Push(Box::new(ActiveState::new((800, 600))))) + } + Event::KeyDown { keycode: Some(Keycode::Space), .. } => { + self.lvlgen.seed = std::time::UNIX_EPOCH.elapsed().unwrap().as_secs() as u32; + self.world.level = self.lvlgen.generate(); + } + Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => { + self.lvlgen.iterations += 1; + println!("{} iteration(s) of cellular automata", self.lvlgen.iterations); + self.world.level = self.lvlgen.generate(); + } + Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => { + self.lvlgen.iterations = 1.max(self.lvlgen.iterations - 1); + println!("{} iteration(s) of cellular automata", self.lvlgen.iterations); + self.world.level = self.lvlgen.generate(); + } + _ => {} + } + None + } } ////////// WORLD /////////////////////////////////////////////////////////////// @@ -57,12 +89,9 @@ pub struct World { } impl World { - pub fn new() -> Self { + pub fn new(level: Level) -> Self { World { - level: Level { - gravity: point!(0.0, 0.1), - ground: 600.0, - }, + level, ..Default::default() } } @@ -79,12 +108,14 @@ impl World { for o in breeding_ground { self.add(o); } + + println!("\x1b[Kobject count: {}\x1b[1A", self.objects.len()); // clear line, print, move cursor up } - 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); } } @@ -93,32 +124,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: &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: Duration) -> ObjectState; - fn render(&self, _canvas: &mut Canvas, _sprites: &SpriteManager) {} + fn render(&self, _renderer: &mut Renderer, _sprites: &SpriteManager) {} } #[derive(PartialEq)] @@ -133,15 +145,15 @@ pub trait Drawable {} pub struct Character { ctrl: Rc>, - pos: Point2D, - vel: Point2D, + pos: Point, + vel: Point, } impl Character { pub fn new(ctrl: Rc>) -> Self { Character { ctrl, - pos: point!(100.0, 100.0), + pos: point!(300.0, 300.0), vel: point!(0.0, 0.0), } } @@ -149,32 +161,39 @@ impl Character { impl Object for Character { fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState { - self.vel += lvl.gravity; - self.pos += self.vel; - let ctrl = self.ctrl.borrow(); - if self.pos.y >= lvl.ground { - self.pos.y = lvl.ground; - self.vel.y = 0.0; - self.vel.x *= 0.9; + 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; + self.vel += lvl.gravity; + if lvl.grid.cells[x][y] { + if self.vel.y > 0.0 && !(ctrl.mov.down() && ctrl.jump.is_pressed) { + self.vel.y = 0.0; + self.vel.x *= 0.9; + self.pos.y -= 1.0; + } - if ctrl.jump.is_pressed { - self.vel = ctrl.aim.to_point() * 5.0; + if !ctrl.mov.down() { + if ctrl.jump.is_pressed && !ctrl.jump.was_pressed { + self.vel.y = -5.0; + } } } + self.pos += self.vel; if ctrl.shoot.is_pressed { use rand::distributions::{Distribution, Normal}; let normal = Normal::new(0.0, 0.1); + let direction = if ctrl.aim.to_point().length() > 0.1 { ctrl.aim.to_point() } else { ctrl.mov.to_point() }; 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: direction * (10.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); + self.vel -= direction * 0.1; } if ctrl.start.is_pressed && !ctrl.start.was_pressed { @@ -190,76 +209,84 @@ impl Object for Character { } match ctrl.mov.x { - v if v < -0.9 => { self.vel.x -= 0.5 } - v if v > 0.9 => { self.vel.x += 0.5 } + v if v < -0.9 && self.vel.x > -5.0 => { self.vel.x -= 0.5 } + v if v > 0.9 && self.vel.x < 5.0 => { self.vel.x += 0.5 } _ => {} } 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 + // // 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); - // 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, (255, 0, 0)); + draw_cross(renderer, p); + let p = (self.pos + ctrl.mov.to_point() * l).to_i32().into(); + renderer.draw_line(pos, p, (0, 255, 0)); + draw_cross(renderer, p); + // // circle values + // let p = (self.pos + Point::from(ctrl.aim.a) * l).to_i32().into(); + // 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, + pos: Point, + vel: Point, bounces: u8, } 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; - 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 *= -0.25; + self.pos += self.vel; + self.bounces -= 1; + use rand::distributions::{Distribution, Normal}; + let mut rng = rand::thread_rng(); + let a = Radians(self.vel.to_radians().0 + Normal::new(0.0, 0.75).sample(&mut rng)); + objects.push(Box::new(Boll { + vel: Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(), + ..*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.canvas().set_draw_color((0, self.bounces * 100, 255)); + // renderer.canvas().draw_point((self.pos.x as i32, self.pos.y as i32)).unwrap(); } }