AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(snap): unify snap aperture so OTRACK catch matches OSNAP

Browse source 
Tracking and polar pickup used the full crosshair-arm radius (60 px)
while OSNAP used the smaller ¼ radius, so the vector-intersection lock
grabbed over a much larger area than object snaps. Collapse to a single
osnap_radius_px shared by OSNAP, tracking, polar and extension; the
crosshair keeps following the cursor and the point snaps on contact.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-06-17 05:25:11 +03:00
commit ec3161f7f7
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/app/update.rs
View file

@ -2319,7 +2319,7 @@ impl OpenCADStudio {
self.polar_increment_deg,
vp_mat,
bounds,
self.snapper.snap_radius_px,
self.snapper.osnap_radius_px,
);
}
}
@ -2528,7 +2528,7 @@ impl OpenCADStudio {
self.polar_increment_deg,
view_proj,
bounds,
self.snapper.snap_radius_px,
self.snapper.osnap_radius_px,
);
}
}
@ -3125,7 +3125,7 @@ impl OpenCADStudio {
self.polar_increment_deg,
vp_mat,
bounds,
self.snapper.snap_radius_px,
self.snapper.osnap_radius_px,
);
}
}

11
src/snap/mod.rs
View file

@ -88,10 +88,8 @@ pub struct Snapper {
pub enabled: HashSet<SnapType>,
/// World-space grid spacing.
pub grid_spacing: f32,
/// Pixel-radius threshold for tracking / polar / extension pickup.
pub snap_radius_px: f32,
/// Pixel-radius threshold for object snapping (OSNAP). Kept smaller than
/// `snap_radius_px` so it is easy to click just outside a snap point.
/// Pixel-radius snap aperture, shared by OSNAP, tracking, polar and
/// extension so the catch distance is the same everywhere.
pub osnap_radius_px: f32,
/// Object Snap Tracking on/off (F11).
pub otrack_enabled: bool,
@ -119,7 +117,6 @@ impl Default for Snapper {
snap_enabled: false,
enabled,
grid_spacing: 1.0,
snap_radius_px: CROSSHAIR_ARM,
osnap_radius_px: CROSSHAIR_ARM * 0.25,
otrack_enabled: false,
tracking_points: Vec::new(),
@ -266,7 +263,8 @@ impl Snapper {
}
let cursor_screen = world_to_screen(cursor_world, view_proj, bounds);
let r = self.snap_radius_px;
// Use the same aperture as OSNAP so the catch distance is uniform.
let r = self.osnap_radius_px;
let screen_dist = |w: Vec3| {
let s = world_to_screen(w, view_proj, bounds);
((s.x - cursor_screen.x).powi(2) + (s.y - cursor_screen.y).powi(2)).sqrt()
@ -413,7 +411,6 @@ impl Snapper {
s
},
grid_spacing: self.grid_spacing,
snap_radius_px: self.snap_radius_px,
osnap_radius_px: self.osnap_radius_px,
otrack_enabled: false,
tracking_points: Vec::new(),