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

Various visibilityu/exploration tweaks and consistency fixes.

Browse Source
This commit is contained in:
Nolan Darilek 2022-05-18 10:28:42 -05:00
parent 480e3cc6a5
commit b3a06abf0f
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exploration.rs
View File

@ -337,7 +337,7 @@ fn exploration_changed_announcement<D: 'static + Clone + Default + Send + Sync>(
for (map, revealed_tiles) in map.iter() { for (map, revealed_tiles) in map.iter() {
let point = **exploring; let point = **exploring;
let idx = point.to_index(map.width); let idx = point.to_index(map.width);
let shape = Collider::cuboid(0.49, 0.49); let shape = Collider::cuboid(0.5 - f32::EPSILON, 0.5 - f32::EPSILON);
let known = revealed_tiles[idx]; let known = revealed_tiles[idx];
let visible = viewshed.is_point_visible(exploring); let visible = viewshed.is_point_visible(exploring);
let fog_of_war = known && !visible; let fog_of_war = known && !visible;

34
src/visibility.rs
View File

@ -4,10 +4,7 @@ use std::{
marker::PhantomData, marker::PhantomData,
}; };
use bevy::{ use bevy::{core::FixedTimestep, prelude::*};
core::{FixedTimestep, FloatOrd},
prelude::*,
};
use bevy_rapier2d::na::{self, Point2}; use bevy_rapier2d::na::{self, Point2};
use coord_2d::{Coord, Size}; use coord_2d::{Coord, Size};
use shadowcast::{vision_distance, Context, InputGrid}; use shadowcast::{vision_distance, Context, InputGrid};
@ -61,23 +58,21 @@ impl Viewshed {
map: &Map<D>, map: &Map<D>,
visible_query: &Query<&Visible>, visible_query: &Query<&Visible>,
events: &mut EventWriter<VisibilityChanged>, events: &mut EventWriter<VisibilityChanged>,
cache: &mut HashMap<(FloatOrd, FloatOrd), (u8, HashSet<Entity>)>, cache: &mut HashMap<Coord, (u8, HashSet<Entity>)>,
) { ) {
let mut context: Context<u8> = Context::default(); let mut context: Context<u8> = Context::default();
let vision_distance = vision_distance::Circle::new(self.range); let vision_distance = vision_distance::Circle::new(self.range);
let shape = Collider::cuboid(0.5, 0.5); let shape = Collider::cuboid(0.5 - f32::EPSILON, 0.5 - f32::EPSILON);
let origin = Point2::new(start.x(), start.y()); let origin = Point2::new(start.x().trunc(), start.y().trunc());
let coord = Coord::new(start.x_i32(), start.y_i32());
let mut new_visible_entities = HashSet::new(); let mut new_visible_entities = HashSet::new();
let visibility_grid = VisibilityGrid( let visibility_grid = VisibilityGrid(
map, map,
RefCell::new(Box::new(|coord: Coord| { RefCell::new(Box::new(|coord: Coord| {
let dest = Point2::new(coord.x as f32 + 0.5, coord.y as f32 + 0.5); let dest = Point2::new(coord.x as f32, coord.y as f32);
if na::distance(&origin, &dest) > self.range as f32 { if na::distance(&origin, &dest) >= self.range as f32 {
return u8::MAX; return u8::MAX;
} }
if let Some((opacity, entities)) = cache.get(&(FloatOrd(dest.x), FloatOrd(dest.y))) if let Some((opacity, entities)) = cache.get(&coord) {
{
for e in entities { for e in entities {
new_visible_entities.insert(*e); new_visible_entities.insert(*e);
} }
@ -89,15 +84,12 @@ impl Viewshed {
} }
let tile = map.at(coord.x as usize, coord.y as usize); let tile = map.at(coord.x as usize, coord.y as usize);
if tile.blocks_visibility() { if tile.blocks_visibility() {
cache.insert( cache.insert(coord, (u8::MAX, HashSet::new()));
(FloatOrd(dest.x), FloatOrd(dest.y)),
(u8::MAX, HashSet::new()),
);
return u8::MAX; return u8::MAX;
} }
let mut opacity = 0; let mut opacity = 0;
let mut entities = HashSet::new(); let mut entities = HashSet::new();
let shape_pos = Vec2::new(dest.x, dest.y); let shape_pos = Vec2::new(dest.x + 0.5, dest.y + 0.5);
rapier_context.intersections_with_shape( rapier_context.intersections_with_shape(
shape_pos, shape_pos,
0., 0.,
@ -118,14 +110,14 @@ impl Viewshed {
if entities.contains(&viewer_entity) { if entities.contains(&viewer_entity) {
0 0
} else { } else {
cache.insert((FloatOrd(dest.x), FloatOrd(dest.y)), (opacity, entities)); cache.insert(coord, (opacity, entities));
opacity opacity
} }
})), })),
); );
let mut new_visible = HashSet::new(); let mut new_visible = HashSet::new();
context.for_each_visible( context.for_each_visible(
coord, Coord::new(start.x_i32(), start.y_i32()),
&visibility_grid, &visibility_grid,
&visibility_grid, &visibility_grid,
vision_distance, vision_distance,
@ -370,10 +362,10 @@ fn remove_visible<D: 'static + Clone + Default + Send + Sync>(
fn update_revealed_tiles<D: 'static + Clone + Default + Send + Sync>( fn update_revealed_tiles<D: 'static + Clone + Default + Send + Sync>(
mut map: Query<(&Map<D>, &mut RevealedTiles)>, mut map: Query<(&Map<D>, &mut RevealedTiles)>,
viewers: Query<&Viewshed, With<Player>>, viewers: Query<&Viewshed, (With<Player>, Changed<Viewshed>)>,
) { ) {
for (map, mut revealed_tiles) in map.iter_mut() {
for viewshed in viewers.iter() { for viewshed in viewers.iter() {
for (map, mut revealed_tiles) in map.iter_mut() {
for v in viewshed.visible_points.iter() { for v in viewshed.visible_points.iter() {
let idx = v.to_index(map.width); let idx = v.to_index(map.width);
if idx >= revealed_tiles.len() { if idx >= revealed_tiles.len() {