benjamyn/rust_tutorial
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved visibility

Browse Source
This commit is contained in:
Benjamyn Love 2022-10-31 09:16:55 +11:00
parent b56eaac0a2
commit 2917a7baa7
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/map.rs
View File

@ -1,6 +1,4 @@
use crate::Viewshed; use super::{Rect};
use super::{Rect, Player};
use rltk::{RandomNumberGenerator, Rltk, RGB, Algorithm2D, Point, BaseMap}; use rltk::{RandomNumberGenerator, Rltk, RGB, Algorithm2D, Point, BaseMap};
use std::{cmp::{max, min}}; use std::{cmp::{max, min}};
use specs::prelude::*; use specs::prelude::*;
@ -15,7 +13,8 @@ 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 Map { impl Map {
@ -55,7 +54,8 @@ impl Map {
tiles : vec![TileType::Wall; 80*50], tiles : vec![TileType::Wall; 80*50],
rooms : Vec::new(), rooms : Vec::new(),
width : 80, width : 80,
height : 50 height : 50,
revealed_tiles : vec![false; 80*50]
}; };
const MAX_ROOMS: i32 = 30; const MAX_ROOMS: i32 = 30;
@ -142,44 +142,41 @@ impl BaseMap for Map {
pub fn draw_map(ecs: &World, ctx: &mut Rltk) { pub fn draw_map(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>();
for (_player, viewshed) in (&mut players, &mut viewsheds).join() { let mut y = 0;
let mut y = 0; let mut x = 0;
let mut x = 0; for (idx, tile) in map.tiles.iter().enumerate() {
for tile in map.tiles.iter() { if map.revealed_tiles[idx] {
let pt = Point::new(x,y); match tile {
if viewshed.visible_tiles.contains(&pt) { TileType::Floor => {
match tile { ctx.set(
TileType::Floor => { x,
ctx.set( y,
x, RGB::from_f32(0.5, 0.5, 0.5),
y, RGB::from_f32(0., 0., 0.),
RGB::from_f32(0.5, 0.5, 0.5), rltk::to_cp437('.'),
RGB::from_f32(0., 0., 0.), );
rltk::to_cp437('.'), }
); TileType::Wall => {
} ctx.set(
TileType::Wall => { x,
ctx.set( y,
x, RGB::from_f32(0.0, 1.0, 0.0),
y, RGB::from_f32(0., 0., 0.),
RGB::from_f32(0.0, 1.0, 0.0), rltk::to_cp437('#'),
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;
} }
}
} }
} }

22
src/visibility_system.rs
View File

@ -1,20 +1,32 @@
use specs::prelude::*; use specs::prelude::*;
use super::{Viewshed, Position, Map};
use super::{Viewshed, Position, Map, Player};
use rltk::{field_of_view, Point}; use rltk::{field_of_view, Point};
pub struct VisibilitySystem {} pub struct VisibilitySystem {}
impl<'a> System<'a> for VisibilitySystem { impl<'a> System<'a> for VisibilitySystem {
type SystemData = ( ReadExpect<'a, Map>, type SystemData = ( 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;
for (viewshed, pos) in (&mut viewshed, &pos).join() {
for (ent, viewshed, pos) in (&entities, &mut viewshed, &pos).join() {
viewshed.visible_tiles.clear(); viewshed.visible_tiles.clear();
viewshed.visible_tiles = field_of_view(Point::new(pos.x, pos.y), viewshed.range, &*map); viewshed.visible_tiles = field_of_view(Point::new(pos.x, pos.y), viewshed.range, &*map);
viewshed.visible_tiles.retain(|p| p.x >= 0 && p.x < map.width && p.y >= 0 && p.y < map.height); viewshed.visible_tiles.retain(|p| p.x >= 0 && p.x < map.width && p.y >= 0 && p.y < map.height);
let _p : Option<&Player> = player.get(ent);
if let Some(_p) = _p {
for vis in viewshed.visible_tiles.iter() {
let idx = map.xy_idx(vis.x, vis.y);
map.revealed_tiles[idx] = true;
}
}
} }
} }
} }