summaryrefslogtreecommitdiff
path: root/crates/wipfel/src/markers.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/wipfel/src/markers.rs')
-rw-r--r--crates/wipfel/src/markers.rs60
1 files changed, 60 insertions, 0 deletions
diff --git a/crates/wipfel/src/markers.rs b/crates/wipfel/src/markers.rs
new file mode 100644
index 0000000..d024f2e
--- /dev/null
+++ b/crates/wipfel/src/markers.rs
@@ -0,0 +1,60 @@
+//! Markers: user observations of hills at image positions, plus the
+//! refit entry point. Coordinates are center-relative image pixels,
+//! matching the projection output space (same convention as the
+//! desktop viewport widget).
+
+use gipfel_core::hill::Hill;
+use gipfel_core::panorama::Panorama;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Marker {
+ /// index into `Panorama::hills` (stable: load order is preserved)
+ pub hill: usize,
+ pub x: f64,
+ pub y: f64,
+}
+
+/// Refit the projection parameters to the current markers.
+/// Same graduated behavior as the original: 1 marker fits the center
+/// angle, 2 add the scale, 4+ the full viewpoint (+ distortion when
+/// unlocked and enough markers).
+pub fn refit(pan: &mut Panorama, markers: &[Marker], fit_distortion: bool) -> Result<(), String> {
+ if markers.is_empty() {
+ return Ok(());
+ }
+ let mut obs: Vec<Hill> = Vec::with_capacity(markers.len());
+ for m in markers {
+ let mut h = pan.hills[m.hill].clone();
+ h.x = m.x;
+ h.y = m.y;
+ obs.push(h);
+ }
+ let known: Vec<usize> = (0..markers.len()).collect();
+ pan.comp_params_with(&obs, &known, fit_distortion)
+}
+
+/// Nearest visible hill to image position `(x, y)`, within `max_dist`
+/// 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 {
+ best_d = d;
+ best = Some(i);
+ }
+ }
+ best
+}