feat(otrack): draw both vectors of an intersection lock

An OTRACK crossing is the meeting of two tracking vectors, but
`OtrackHit` carried only the one a typed distance is measured along, so
the overlay had a single guide to draw. Snapping to the crossing of two
vectors worked and looked like an unexplained point on one line.

Carry the crossed ray out of `otrack_snap` as `OtrackHit::cross`, keep it
on the app beside `otrack_active`, and let the overlay take a list of
guides rather than one. `otrack_active` still drives typed-distance
entry on its own, so distance entry is unchanged.

Fixes HakanSeven12/OpenCADStudio#1313

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TQzYZsXBwPZ5HwBaGitEUV
(cherry picked from commit 2f6caacece)
This commit is contained in:
Claude authored and Hakan Seven committed 2026-09-20 21:29:15 +03:00
1 parent 41101efaa5
commit 033319a4e3
7 files changed
+183 -23

No files matched your search

+3
View File
@@ -366,6 +366,7 @@ impl OpenCADStudio {
{
self.snapper.clear_tracking();
self.otrack_active = None;
self.otrack_cross = None;
self.otrack_kind = None;
}
if let Some((started, tab_id, before)) = perf_edit_before {
@@ -402,6 +403,7 @@ impl OpenCADStudio {
pub(in crate::app) fn reset_tracking_after_point(&mut self) {
self.snapper.clear_tracking();
self.otrack_active = None;
self.otrack_cross = None;
self.otrack_kind = None;
}
@@ -3982,6 +3984,7 @@ impl OpenCADStudio {
if !self.snapper.otrack_enabled {
self.snapper.clear_tracking();
self.otrack_active = None;
self.otrack_cross = None;
self.otrack_kind = None;
}
Task::none()
+3
View File
@@ -1479,6 +1479,7 @@ impl OpenCADStudio {
Some((base, dir))
});
self.otrack_active = otrack_hit.map(|hit| (hit.base, hit.dir)).or(drafting_guide);
self.otrack_cross = otrack_hit.and_then(|hit| hit.cross);
self.otrack_kind = otrack_hit.map(|hit| hit.kind);
@@ -2190,6 +2191,7 @@ impl OpenCADStudio {
None
};
self.otrack_active = otrack_hit.map(|h| (h.base, h.dir));
self.otrack_cross = otrack_hit.and_then(|h| h.cross);
self.otrack_kind = otrack_hit.map(|h| h.kind);
// Parallel snap: with nothing else snapped or tracked, lock
@@ -2208,6 +2210,7 @@ impl OpenCADStudio {
(self.last_point, self.snapper.parallel_ref)
{
self.otrack_active = Some((base, dir.as_dvec3()));
self.otrack_cross = None;
}
self.tabs[i].snap_result = Some(par);
}