daniel/dungeoncrawler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make MapBuilder themeable with MapTheme trait

Browse Source
This commit is contained in:
Daniel Lynn 2021-07-10 17:12:58 -05:00
parent b807418601
commit 81b99c632c
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -45,15 +45,14 @@ impl State {
spawn_amulet_of_yala(&mut ecs, map_builder.amulet_start); spawn_amulet_of_yala(&mut ecs, map_builder.amulet_start);
map_builder map_builder
.rooms .monster_spawns
.iter() .iter()
.skip(1) .for_each(|pos| spawn_monster(&mut ecs, &mut rng, *pos));
.map(|r| r.center())
.for_each(|pos| spawn_monster(&mut ecs, &mut rng, pos));
resources.insert(map_builder.map); resources.insert(map_builder.map);
resources.insert(Camera::new(map_builder.player_start)); resources.insert(Camera::new(map_builder.player_start));
resources.insert(TurnState::AwaitingInput); resources.insert(TurnState::AwaitingInput);
resources.insert(map_builder.theme);
Self { Self {
ecs, ecs,
@ -80,6 +79,7 @@ impl State {
self.resources.insert(map_builder.map); self.resources.insert(map_builder.map);
self.resources.insert(Camera::new(map_builder.player_start)); self.resources.insert(Camera::new(map_builder.player_start));
self.resources.insert(TurnState::AwaitingInput); self.resources.insert(TurnState::AwaitingInput);
self.resources.insert(map_builder.theme);
} }
fn game_over(&mut self, ctx: &mut BTerm) { fn game_over(&mut self, ctx: &mut BTerm) {

17
src/systems/map_render.rs
View File

@ -3,7 +3,12 @@ use crate::prelude::*;
#[system] #[system]
#[read_component(FieldOfView)] #[read_component(FieldOfView)]
#[read_component(Player)] #[read_component(Player)]
pub fn map_render(ecs: &SubWorld, #[resource] map: &Map, #[resource] camera: &Camera) { pub fn map_render(
ecs: &SubWorld,
#[resource] map: &Map,
#[resource] camera: &Camera,
#[resource] theme: &Box<dyn MapTheme>,
) {
let mut fov = <&FieldOfView>::query().filter(component::<Player>()); let mut fov = <&FieldOfView>::query().filter(component::<Player>());
let player_fov = fov.iter(ecs).next().unwrap(); let player_fov = fov.iter(ecs).next().unwrap();
let mut draw_batch = DrawBatch::new(); let mut draw_batch = DrawBatch::new();
@ -25,14 +30,8 @@ pub fn map_render(ecs: &SubWorld, #[resource] map: &Map, #[resource] camera: &Ca
DARK_GRAY DARK_GRAY
}; };
match map.tiles[idx] { let glyph = theme.tile_to_render(map.tiles[idx]);
TileType::Floor => { draw_batch.set(pt - offset, ColorPair::new(tint, BLACK), glyph);
draw_batch.set(pt - offset, ColorPair::new(tint, BLACK), to_cp437('.'))
}
TileType::Wall => {
draw_batch.set(pt - offset, ColorPair::new(tint, BLACK), to_cp437('#'))
}
};
} }
} }
} }