remember player visibility, scaffolding
This commit is contained in:
parent
d138ef8b30
commit
ab050d5c89
71
src/map.rs
71
src/map.rs
|
@ -10,12 +10,13 @@ use crate::component::Viewshed;
|
||||||
use crate::entity::{Player, TileType};
|
use crate::entity::{Player, TileType};
|
||||||
use crate::rect::Rect;
|
use crate::rect::Rect;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone, Default)]
|
||||||
pub struct Map {
|
pub struct Map {
|
||||||
pub tiles: Vec<TileType>,
|
pub tiles: Vec<TileType>,
|
||||||
pub rooms: Vec<Rect>,
|
pub rooms: Vec<Rect>,
|
||||||
pub width: i32,
|
pub width: i32,
|
||||||
pub height: i32,
|
pub height: i32,
|
||||||
|
pub revealed_tiles: Vec<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Algorithm2D for Map {
|
impl Algorithm2D for Map {
|
||||||
|
@ -86,6 +87,7 @@ impl Map {
|
||||||
rooms: vec![],
|
rooms: vec![],
|
||||||
width: 80,
|
width: 80,
|
||||||
height: 50,
|
height: 50,
|
||||||
|
revealed_tiles: vec![false; 80 * 50],
|
||||||
};
|
};
|
||||||
|
|
||||||
const MAX_ROOMS: i32 = 30;
|
const MAX_ROOMS: i32 = 30;
|
||||||
|
@ -163,45 +165,38 @@ pub fn new_test() -> Vec<TileType> {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
pub fn draw(ecs: &World, ctx: &mut Rltk) {
|
pub fn draw(ecs: &World, ctx: &mut Rltk) {
|
||||||
let mut viewsheds = ecs.write_storage::<Viewshed>();
|
|
||||||
let mut players = ecs.write_storage::<Player>();
|
|
||||||
let map = ecs.fetch::<Map>();
|
let map = ecs.fetch::<Map>();
|
||||||
|
let mut y = 0;
|
||||||
|
let mut x = 0;
|
||||||
|
|
||||||
(&mut players, &mut viewsheds).join().into_iter().for_each(
|
map.tiles.iter().enumerate().for_each(|(idx, tile)| {
|
||||||
|(_player, viewshed)| {
|
if map.revealed_tiles[idx] {
|
||||||
let mut y = 0;
|
match tile {
|
||||||
let mut x = 0;
|
TileType::Floor => {
|
||||||
map.tiles.iter().for_each(|tile| {
|
ctx.set(
|
||||||
let pt = Point::new(x, y);
|
x,
|
||||||
if viewshed.visible_tiles.contains(&pt) {
|
y,
|
||||||
match tile {
|
RGB::from_f32(0.5, 0.5, 0.5),
|
||||||
TileType::Floor => {
|
RGB::from_f32(0., 0., 0.),
|
||||||
ctx.set(
|
rltk::to_cp437('.'),
|
||||||
x,
|
);
|
||||||
y,
|
|
||||||
RGB::from_f32(0.5, 0.5, 0.5),
|
|
||||||
RGB::from_f32(0., 0., 0.),
|
|
||||||
rltk::to_cp437('.'),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
TileType::Wall => {
|
|
||||||
ctx.set(
|
|
||||||
x,
|
|
||||||
y,
|
|
||||||
RGB::from_f32(0.0, 1.0, 0.0),
|
|
||||||
RGB::from_f32(0., 0., 0.),
|
|
||||||
rltk::to_cp437('#'),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
TileType::Wall => {
|
||||||
|
ctx.set(
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
RGB::from_f32(0.0, 1.0, 0.0),
|
||||||
|
RGB::from_f32(0., 0., 0.),
|
||||||
|
rltk::to_cp437('#'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
x += 1;
|
x += 1;
|
||||||
if x > 79 {
|
if x > 79 {
|
||||||
x = 0;
|
x = 0;
|
||||||
y += 1;
|
y += 1;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
use super::{Map, Position, Viewshed};
|
use super::{Map, Player, Position, Viewshed};
|
||||||
use rltk::{field_of_view, Point};
|
use rltk::{field_of_view, Point};
|
||||||
use specs::prelude::*;
|
use specs::prelude::*;
|
||||||
|
|
||||||
|
@ -6,22 +6,32 @@ pub struct VisibilitySystem {}
|
||||||
|
|
||||||
impl<'a> System<'a> for VisibilitySystem {
|
impl<'a> System<'a> for VisibilitySystem {
|
||||||
type SystemData = (
|
type SystemData = (
|
||||||
ReadExpect<'a, Map>,
|
WriteExpect<'a, Map>,
|
||||||
|
Entities<'a>,
|
||||||
WriteStorage<'a, Viewshed>,
|
WriteStorage<'a, Viewshed>,
|
||||||
WriteStorage<'a, Position>,
|
WriteStorage<'a, Position>,
|
||||||
|
ReadStorage<'a, Player>,
|
||||||
);
|
);
|
||||||
|
|
||||||
fn run(&mut self, data: Self::SystemData) {
|
fn run(&mut self, data: Self::SystemData) {
|
||||||
let (map, mut viewshed, pos) = data;
|
let (mut map, entities, mut viewshed, pos, player) = data;
|
||||||
(&mut viewshed, &pos).join().into_iter().for_each(
|
(&entities, &mut viewshed, &pos)
|
||||||
|(viewshed, pos)| {
|
.join()
|
||||||
|
.into_iter()
|
||||||
|
.for_each(|(ent, viewshed, pos)| {
|
||||||
viewshed.visible_tiles.clear();
|
viewshed.visible_tiles.clear();
|
||||||
viewshed.visible_tiles = field_of_view(
|
viewshed.visible_tiles = field_of_view(
|
||||||
Point::new(pos.x, pos.y),
|
Point::new(pos.x, pos.y),
|
||||||
viewshed.range,
|
viewshed.range,
|
||||||
&*map,
|
&*map,
|
||||||
);
|
);
|
||||||
},
|
let p: Option<&Player> = player.get(ent);
|
||||||
);
|
if let Some(p) = p {
|
||||||
|
viewshed.visible_tiles.iter().for_each(|vis| {
|
||||||
|
let idx = map.xy_idx(vis.x, vis.y);
|
||||||
|
map.revealed_tiles[idx] = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue