Finish chapter 2.1
This commit is contained in:
parent
6f65bf2420
commit
59a791de56
@ -1,6 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "roguelike_tutorial"
|
name = "roguelike_tutorial"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
rust-version = "1.56"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
81
src/main.rs
81
src/main.rs
@ -16,14 +16,77 @@ struct Renderable {
|
|||||||
bg: RGB,
|
bg: RGB,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Component)]
|
||||||
|
struct LeftMover {}
|
||||||
|
|
||||||
|
#[derive(Component, Debug)]
|
||||||
|
struct Player {}
|
||||||
|
|
||||||
struct State {
|
struct State {
|
||||||
ecs: World,
|
ecs: World,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn try_move_player(delta_x: i32, delta_y: i32, ecs: &mut World) {
|
||||||
|
let mut positions = ecs.write_storage::<Position>();
|
||||||
|
let mut players = ecs.write_storage::<Player>();
|
||||||
|
|
||||||
|
for (_player, pos) in (&mut players, &mut positions).join() {
|
||||||
|
pos.x = min(79, max(0, pos.x + delta_x));
|
||||||
|
pos.y = min(49, max(0, pos.y + delta_y));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn player_input(gs: &mut State, ctx: &mut Rltk) {
|
||||||
|
// Player movement
|
||||||
|
match ctx.key {
|
||||||
|
None => {} // Nothing happened
|
||||||
|
Some(key) => match key {
|
||||||
|
VirtualKeyCode::Left => try_move_player(-1, 0, &mut gs.ecs),
|
||||||
|
VirtualKeyCode::Right => try_move_player(1, 0, &mut gs.ecs),
|
||||||
|
VirtualKeyCode::Up => try_move_player(0, -1, &mut gs.ecs),
|
||||||
|
VirtualKeyCode::Down => try_move_player(0, 1, &mut gs.ecs),
|
||||||
|
_ => {},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl GameState for State {
|
impl GameState for State {
|
||||||
fn tick(&mut self, ctx: &mut Rltk) {
|
fn tick(&mut self, ctx: &mut Rltk) {
|
||||||
ctx.cls();
|
ctx.cls();
|
||||||
ctx.print(1, 1, "Hello Rust World");
|
|
||||||
|
player_input(self, ctx);
|
||||||
|
self.run_systems();
|
||||||
|
|
||||||
|
let positions = self.ecs.read_storage::<Position>();
|
||||||
|
let renderables = self.ecs.read_storage::<Renderable>();
|
||||||
|
|
||||||
|
for (pos, render) in (&positions, &renderables).join() {
|
||||||
|
ctx.set(pos.x, pos.y, render.fg, render.bg, render.glyph);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct LeftWalker {}
|
||||||
|
|
||||||
|
impl<'a> System<'a> for LeftWalker {
|
||||||
|
type SystemData = (ReadStorage<'a, LeftMover>, WriteStorage<'a, Position>);
|
||||||
|
|
||||||
|
fn run(&mut self, (lefty, mut pos): Self::SystemData) {
|
||||||
|
for (_lefty, pos) in (&lefty, &mut pos).join() {
|
||||||
|
pos.x -= 1;
|
||||||
|
|
||||||
|
if pos.x < 0 {
|
||||||
|
pos.x = 79;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl State {
|
||||||
|
fn run_systems(&mut self) {
|
||||||
|
let mut lw = LeftWalker{};
|
||||||
|
lw.run_now(&self.ecs);
|
||||||
|
self.ecs.maintain();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,6 +101,8 @@ fn main() -> rltk::BError {
|
|||||||
|
|
||||||
gs.ecs.register::<Position>();
|
gs.ecs.register::<Position>();
|
||||||
gs.ecs.register::<Renderable>();
|
gs.ecs.register::<Renderable>();
|
||||||
|
gs.ecs.register::<LeftMover>();
|
||||||
|
gs.ecs.register::<Player>();
|
||||||
|
|
||||||
gs.ecs
|
gs.ecs
|
||||||
.create_entity()
|
.create_entity()
|
||||||
@ -47,7 +112,21 @@ fn main() -> rltk::BError {
|
|||||||
fg: RGB::named(rltk::YELLOW),
|
fg: RGB::named(rltk::YELLOW),
|
||||||
bg: RGB::named(rltk::BLACK),
|
bg: RGB::named(rltk::BLACK),
|
||||||
})
|
})
|
||||||
|
.with(Player {})
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
for i in 0..10 {
|
||||||
|
gs.ecs
|
||||||
|
.create_entity()
|
||||||
|
.with(Position { x: i * 7, y: 20 })
|
||||||
|
.with(Renderable {
|
||||||
|
glyph: rltk::to_cp437('☺'),
|
||||||
|
fg: RGB::named(rltk::RED),
|
||||||
|
bg: RGB::named(rltk::BLACK),
|
||||||
|
})
|
||||||
|
.with(LeftMover {})
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
rltk::main_loop(context, gs)
|
rltk::main_loop(context, gs)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user