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
Use stack of app states
[kaka/rust-sdl-test.git]
/
src
/
core
/
game.rs
diff --git
a/src/core/game.rs
b/src/core/game.rs
index
1e657cb
..
6c04969
100644
(file)
--- a/
src/core/game.rs
+++ b/
src/core/game.rs
@@
-1,5
+1,7
@@
use AppState;
use AppState;
+use ActiveState;
use common::{Point2D, Radians};
use common::{Point2D, Radians};
+use core::app::StateChange;
use core::controller::Controller;
use core::controller::ControllerManager;
use core::level::Level;
use core::controller::Controller;
use core::controller::ControllerManager;
use core::level::Level;
@@
-38,16
+40,23
@@
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), .. } => {
self.world.level.regenerate();
}
Event::KeyDown { keycode: Some(Keycode::Space), .. } => {
self.world.level.regenerate();
}
@@
-62,6
+71,7
@@
impl AppState for GameState {
}
_ => {}
}
}
_ => {}
}
+ None
}
}
}
}