From ec3161f7f7ef4d69355c8fbabb6574bd2f200b69 Mon Sep 17 00:00:00 2001
From: Hakan Seven <hakanseven8125@gmail.com>
Date: Wed, 17 Jun 2026 05:25:11 +0300
Subject: [PATCH] fix(snap): unify snap aperture so OTRACK catch matches OSNAP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/app/update.rs |  6 +++---
 src/snap/mod.rs   | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/app/update.rs b/src/app/update.rs
index 096162c17..b8e353373 100644
--- a/src/app/update.rs
+++ b/src/app/update.rs
@@ -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,
                                 );
                             }
                         }
diff --git a/src/snap/mod.rs b/src/snap/mod.rs
index 34a478a3a..c5ec03b11 100644
--- a/src/snap/mod.rs
+++ b/src/snap/mod.rs
@@ -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(),