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
Generic grids
[kaka/rust-sdl-test.git]
/
src
/
core
/
game.rs
diff --git
a/src/core/game.rs
b/src/core/game.rs
index
429a2ee
..
eabbdf9
100644
(file)
--- a/
src/core/game.rs
+++ b/
src/core/game.rs
@@
-1,8
+1,10
@@
+use ActiveState;
use AppState;
use AppState;
-use common::Point2D;
+use common::{Point, 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()
}
}
@@
-130,8
+145,8
@@
pub trait Drawable {}
pub struct Character {
ctrl: Rc<RefCell<Controller>>,
pub struct Character {
ctrl: Rc<RefCell<Controller>>,
- pos: Point
2D
<f64>,
- vel: Point
2D
<f64>,
+ pos: Point<f64>,
+ vel: Point<f64>,
}
impl Character {
}
impl Character {
@@
-150,11
+165,12
@@
impl Object for Character {
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 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 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;
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() {
}
if !ctrl.mov.down() {
@@
-162,8
+178,6
@@
impl Object for Character {
self.vel.y = -5.0;
}
}
self.vel.y = -5.0;
}
}
- } else {
- self.vel += lvl.gravity;
}
self.pos += self.vel;
}
self.pos += self.vel;
@@
-223,7
+237,7
@@
impl Object for Character {
renderer.draw_line(pos, p, (0, 255, 0));
draw_cross(renderer, p);
// // circle values
renderer.draw_line(pos, p, (0, 255, 0));
draw_cross(renderer, p);
// // circle values
- // let p = (self.pos + Point
2D
::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);
}
// renderer.draw_line(pos, p, (0, 0, 255));
// draw_cross(renderer, p);
}
@@
-237,8
+251,8
@@
fn draw_cross(renderer: &mut Renderer, p: (i32, i32)) {
////////// BOLL ////////////////////////////////////////////////////////////////
pub struct Boll {
////////// BOLL ////////////////////////////////////////////////////////////////
pub struct Boll {
- pos: Point
2D
<f64>,
- vel: Point
2D
<f64>,
+ pos: Point<f64>,
+ vel: Point<f64>,
bounces: u8,
}
bounces: u8,
}
@@
-253,12
+267,14
@@
impl Object for Boll {
if self.bounces == 0 {
return Dead
}
if self.bounces == 0 {
return Dead
}
- self.vel *= -0.5;
+ self.vel *= -0.25;
+ self.pos += self.vel;
self.bounces -= 1;
use rand::distributions::{Distribution, Normal};
self.bounces -= 1;
use rand::distributions::{Distribution, Normal};
- let normal = Normal::new(0.5, 0.4);
+ 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 {
objects.push(Box::new(Boll {
- vel:
self.vel * normal.sample(&mut rand::thread_rng()
),
+ vel:
Point::from(a) * Normal::new(1.0, 0.25).sample(&mut rng) * self.vel.length(
),
..*self
}));
}
..*self
}));
}