X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcore%2Fgame.rs;h=386057ba0cbb7a26867209d504b87334496854fd;hb=60058b918569190f437fe996dfc79daf5a431b91;hp=1e657cbe1d4ed523a121aed6031af2a5d5d8ab23;hpb=afbecec4140ea0f723621bf7a14509dbbcb899ab;p=kaka%2Frust-sdl-test.git diff --git a/src/core/game.rs b/src/core/game.rs index 1e657cb..386057b 100644 --- a/src/core/game.rs +++ b/src/core/game.rs @@ -1,8 +1,10 @@ +use ActiveState; use AppState; -use common::{Point2D, Radians}; +use common::{Point, Radians}; +use core::app::StateChange; use core::controller::Controller; use core::controller::ControllerManager; -use core::level::Level; +use core::level::{Level, LevelGenerator, Wall, IntersectResult::Intersection}; use core::render::Renderer; use point; use sdl2::event::Event; @@ -19,12 +21,15 @@ use time::Duration; #[derive(Default)] pub struct GameState { world: World, + lvlgen: LevelGenerator, } impl GameState { pub fn new() -> Self { + let lvlgen = LevelGenerator::new(0); GameState { - world: World::new(), + world: World::new(lvlgen.generate()), + lvlgen, } } } @@ -38,30 +43,50 @@ impl AppState for GameState { 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, 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.world.level.regenerate(); + 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.world.level.increase_iteration(); + self.lvlgen.iterations += 1; + self.world.level = self.lvlgen.generate(); } Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => { - self.world.level.decrease_iteration(); + if self.lvlgen.iterations > 0 { + self.lvlgen.iterations -= 1; + self.world.level = self.lvlgen.generate(); + } + } + Event::KeyDown { keycode: Some(Keycode::KpMultiply), .. } => { + self.lvlgen.wall_smooth_radius += 1; + self.world.level = self.lvlgen.generate(); } - Event::KeyDown { keycode: Some(Keycode::KpEnter), .. } => { - self.world.level.filter_regions(); + Event::KeyDown { keycode: Some(Keycode::KpDivide), .. } => { + if self.lvlgen.wall_smooth_radius > 0 { + self.lvlgen.wall_smooth_radius -= 1; + self.world.level = self.lvlgen.generate(); + } } _ => {} } + None } } @@ -74,9 +99,9 @@ pub struct World { } impl World { - pub fn new() -> Self { + pub fn new(level: Level) -> Self { World { - level: Level::new(point!(0.0, 0.1)), + level, ..Default::default() } } @@ -130,8 +155,8 @@ pub trait Drawable {} pub struct Character { ctrl: Rc>, - pos: Point2D, - vel: Point2D, + pos: Point, + vel: Point, } impl Character { @@ -148,13 +173,14 @@ impl Object for Character { fn update(&mut self, objects: &mut Objects, lvl: &Level, dt: Duration) -> ObjectState { let ctrl = self.ctrl.borrow(); - 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; + let x = (self.pos.x / lvl.grid.cell_size.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize; + let y = (self.pos.y / lvl.grid.cell_size.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize; + self.vel += lvl.gravity; if lvl.grid.cells[x][y] { - self.vel += lvl.gravity; 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.mov.down() { @@ -162,8 +188,6 @@ impl Object for Character { self.vel.y = -5.0; } } - } else { - self.vel += lvl.gravity; } self.pos += self.vel; @@ -223,7 +247,7 @@ impl Object for Character { renderer.draw_line(pos, p, (0, 255, 0)); draw_cross(renderer, p); // // circle values - // let p = (self.pos + Point2D::from(ctrl.aim.a) * l).to_i32().into(); + // 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); } @@ -237,8 +261,8 @@ fn draw_cross(renderer: &mut Renderer, p: (i32, i32)) { ////////// BOLL //////////////////////////////////////////////////////////////// pub struct Boll { - pos: Point2D, - vel: Point2D, + pos: Point, + vel: Point, bounces: u8, } @@ -247,12 +271,11 @@ impl Object for Boll { self.vel += lvl.gravity; self.pos += self.vel; - 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 let Intersection(wall, pos) = lvl.intersect_walls(self.pos - self.vel, self.pos) { if self.bounces == 0 { return Dead } + self.pos = pos; self.vel *= -0.25; self.pos += self.vel; self.bounces -= 1; @@ -260,10 +283,27 @@ impl Object for Boll { 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: Point2D::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(), + vel: Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(), ..*self })); } + // let x = (self.pos.x / lvl.grid.cell_size.width as f64).min(lvl.grid.size.width as f64 - 1.0).max(0.0) as usize; + // let y = (self.pos.y / lvl.grid.cell_size.height as f64).min(lvl.grid.size.height as f64 - 1.0).max(0.0) as usize; + // if lvl.grid.cells[x][y] { + // if self.bounces == 0 { + // return Dead + // } + // 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 }