projects/blackout
1
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Simplify.

Browse Source
This commit is contained in:
Nolan Darilek 2021-08-04 15:51:18 -05:00
parent 6fdbf4a667
commit ade155fcb4
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/map.rs
View File

@ -437,11 +437,9 @@ fn spawn_portal_colliders(
fn area_description( fn area_description(
mut events: EventReader<IntersectionEvent>, mut events: EventReader<IntersectionEvent>,
areas: Query<&Area>, areas: Query<(&AABB, Option<&Name>), With<Area>>,
players: Query<&Player>, players: Query<&Player>,
names: Query<&Name>,
config: Res<MapConfig>, config: Res<MapConfig>,
shapes: Query<&ColliderShape>,
mut log: Query<&mut Log>, mut log: Query<&mut Log>,
) { ) {
for event in events.iter() { for event in events.iter() {
@ -452,23 +450,20 @@ fn area_description(
{ {
if players.get(other).is_ok() { if players.get(other).is_ok() {
if let Ok(mut log) = log.single_mut() { if let Ok(mut log) = log.single_mut() {
let name = if let Ok(name) = names.get(area) { if let Ok((aabb, area_name)) = areas.get(area) {
Some(name.to_string()) let name = if let Some(name) = area_name {
} else if config.describe_undescribed_areas { Some(name.to_string())
if let Ok(shape) = shapes.get(area) { } else if config.describe_undescribed_areas {
let aabb = shape.compute_local_aabb();
Some(format!("{}-by-{} area", aabb.extents().x, aabb.extents().y)) Some(format!("{}-by-{} area", aabb.extents().x, aabb.extents().y))
} else { } else {
None None
} };
} else { if let Some(name) = name {
None if event.intersecting {
}; log.push(format!("Entering {}.", name));
if let Some(name) = name { } else {
if event.intersecting { log.push(format!("Leaving {}.", name));
log.push(format!("Entering {}.", name)); }
} else {
log.push(format!("Leaving {}.", name));
} }
} }
} }