Dolda2000 GitWeb
/
kaka
/
rust-sdl-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored level generation + fixed bug with wall finding
[kaka/rust-sdl-test.git]
/
src
/
core
/
game.rs
diff --git
a/src/core/game.rs
b/src/core/game.rs
index
1e657cb
..
e8893de
100644
(file)
--- a/
src/core/game.rs
+++ b/
src/core/game.rs
@@
-1,8
+1,10
@@
+use ActiveState;
use AppState;
use common::{Point2D, Radians};
use AppState;
use common::{Point2D, Radians};
+use core::app::StateChange;
use core::controller::Controller;
use core::controller::ControllerManager;
use core::controller::Controller;
use core::controller::ControllerManager;
-use core::level::
Level
;
+use core::level::
{Level, LevelGenerator}
;
use core::render::Renderer;
use point;
use sdl2::event::Event;
use core::render::Renderer;
use point;
use sdl2::event::Event;
@@
-19,12
+21,15
@@
use time::Duration;
#[derive(Default)]
pub struct GameState {
world: World,
#[derive(Default)]
pub struct GameState {
world: World,
+ lvlgen: LevelGenerator,
}
impl GameState {
pub fn new() -> Self {
}
impl GameState {
pub fn new() -> Self {
+ let lvlgen = LevelGenerator::new(0, 5);
GameState {
GameState {
- world: World::new(),
+ world: World::new(lvlgen.generate()),
+ lvlgen,
}
}
}
}
}
}
@@
-38,30
+43,40
@@
impl AppState for GameState {
fn leave(&mut self) {}
fn leave(&mut self) {}
- fn update(&mut self, dt: Duration) {
+ fn update(&mut self, dt: Duration)
-> Option<StateChange>
{
self.world.update(dt);
self.world.update(dt);
+ None
}
fn render(&mut self, renderer: &mut Renderer, sprites: &SpriteManager) {
self.world.render(renderer, 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<StateChange>
{
match event {
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), .. } => {
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), .. } => {
}
Event::KeyDown { keycode: Some(Keycode::KpPlus), .. } => {
- self.world.level.increase_iteration();
+ 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), .. } => {
}
Event::KeyDown { keycode: Some(Keycode::KpMinus), .. } => {
- self.world.level.decrease_iteration();
- }
- Event::KeyDown { keycode: Some(Keycode::KpEnter), .. } => {
- self.world.level.filter_regions();
+ 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
}
}
}
}
@@
-74,9
+89,9
@@
pub struct World {
}
impl World {
}
impl World {
- pub fn new() -> Self {
+ pub fn new(
level: Level
) -> Self {
World {
World {
- level
: Level::new(point!(0.0, 0.1))
,
+ level,
..Default::default()
}
}
..Default::default()
}
}