summaryrefslogtreecommitdiff
path: root/crates/gipfel-web/src/markers.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/gipfel-web/src/markers.rs')
-rw-r--r--crates/gipfel-web/src/markers.rs14
1 files changed, 12 insertions, 2 deletions
diff --git a/crates/gipfel-web/src/markers.rs b/crates/gipfel-web/src/markers.rs
index d1bf8cb..d024f2e 100644
--- a/crates/gipfel-web/src/markers.rs
+++ b/crates/gipfel-web/src/markers.rs
@@ -34,11 +34,21 @@ pub fn refit(pan: &mut Panorama, markers: &[Marker], fit_distortion: bool) -> Re
}
/// Nearest visible hill to image position `(x, y)`, within `max_dist`
-/// image pixels. Used to resolve marker clicks.
-pub fn nearest_hill(pan: &Panorama, x: f64, y: f64, max_dist: f64) -> Option<usize> {
+/// image pixels. Used to resolve marker clicks. Hills hidden by the
+/// occlusion heuristic are skipped unless `show_hidden`.
+pub fn nearest_hill(
+ pan: &Panorama,
+ x: f64,
+ y: f64,
+ max_dist: f64,
+ show_hidden: bool,
+) -> Option<usize> {
let mut best = None;
let mut best_d = max_dist;
for &i in &pan.visible {
+ if !show_hidden && pan.hills[i].flags & gipfel_core::hill::FLAG_HIDDEN != 0 {
+ continue;
+ }
let h = &pan.hills[i];
let d = (h.x - x).hypot(h.y - y);
if d < best_d {