diff --git a/src/app/update.rs b/src/app/update.rs index e71ef96bd..d7b03e217 100644 --- a/src/app/update.rs +++ b/src/app/update.rs @@ -2780,7 +2780,7 @@ impl OpenCADStudio { let wo_f = glam::Vec3::new(wo_local[0] as f32, wo_local[1] as f32, wo_local[2] as f32); let effective_wcs = effective + wo_f; - // C3D-style orange object snap (plugin commands implement resolve_object_pick). + // Orange object snap (plugin commands implement resolve_object_pick). if needs_structure { use crate::snap::{SnapResult, SnapType}; let pick = self.tabs[i].active_cmd.as_ref().and_then(|c| { diff --git a/src/command/mod.rs b/src/command/mod.rs index c82b7d1bb..0552f8810 100644 --- a/src/command/mod.rs +++ b/src/command/mod.rs @@ -11,7 +11,7 @@ use crate::scene::Scene; use acadrust::{EntityType, Handle}; use glam::Vec3; -/// Domain object resolved under the cursor for C3D-style ObjectPick snapping. +/// Domain object resolved under the cursor for ObjectPick snapping. #[derive(Clone, Copy, Debug)] pub struct ObjectPickHit { pub handle: Handle, @@ -473,7 +473,7 @@ pub trait CadCommand: Send { None } - /// Hover label for C3D-style object acquisition (e.g. "Inlet" under cursor). + /// Hover label for object acquisition (e.g. "Inlet" under cursor). fn set_acquisition_hint(&mut self, _hint: Option<&str>) {} /// Called after `CmdResult::ReplaceEntity` is applied to the document. diff --git a/src/scene/mod.rs b/src/scene/mod.rs index 6db982f41..b08ba97b4 100644 --- a/src/scene/mod.rs +++ b/src/scene/mod.rs @@ -145,8 +145,8 @@ pub fn build_derived_caches(doc: &CadDocument) -> DerivedCaches { // Header `$EXTMIN`/`$EXTMAX` is the fast path, but it's untrustworthy: // the sentinel (1e20 / -1e20) when the writer never computed extents, // stale values when a drawing was edited and extents weren't refreshed, - // and Civil-3D-style top-level extents that span only an Insert's - // bounding box rather than the actual MSPACE geometry. Any of those + // and top-level extents that span only an Insert's bounding box rather + // than the actual MSPACE geometry. Any of those // leave the precision-preserving offset wrong, so direct MSPACE // entities render at huge magnitudes and f32 wires lose precision. // diff --git a/src/scene/model/wire_model.rs b/src/scene/model/wire_model.rs index 168e490ef..f4228c9fd 100644 --- a/src/scene/model/wire_model.rs +++ b/src/scene/model/wire_model.rs @@ -79,11 +79,6 @@ impl WireModel { pub const WHITE: [f32; 4] = [1.00, 1.00, 1.00, 1.0]; pub const CYAN: [f32; 4] = [0.25, 0.85, 1.00, 1.0]; pub const SELECTED: [f32; 4] = [0.15, 0.55, 1.00, 1.0]; - /// Object-acquisition highlight (structure / catchment hover); not yet wired. - #[allow(dead_code)] - pub const PICK_HIGHLIGHT: [f32; 4] = [0.95, 0.50, 0.08, 1.0]; - #[allow(dead_code)] - pub const PICK_HIGHLIGHT_DIM: [f32; 4] = [0.95, 0.50, 0.08, 0.45]; /// Sentinel AABB that never rejects any snap query. pub const UNBOUNDED_AABB: [f32; 4] = [ f32::NEG_INFINITY, diff --git a/src/snap/mod.rs b/src/snap/mod.rs index f15081a63..f5d82e4f3 100644 --- a/src/snap/mod.rs +++ b/src/snap/mod.rs @@ -31,7 +31,7 @@ pub enum SnapType { ApparentIntersection, Parallel, Grid, - /// C3D-style object acquisition (storm structure / network pick) — orange marker. + /// Object acquisition (domain-object pick, e.g. network structure) — orange marker. ObjectPick, } diff --git a/src/ui/overlay.rs b/src/ui/overlay.rs index a08b2d9ce..dce1f52c4 100644 --- a/src/ui/overlay.rs +++ b/src/ui/overlay.rs @@ -501,7 +501,7 @@ impl canvas::Program for SelectionCanvas { // ── Snap marker ─────────────────────────────────────────────────── if let Some((sp, snap_type)) = self.snap { let (r, g, b) = if snap_type == SnapType::ObjectPick { - (0.95_f32, 0.50, 0.08) // C3D-style orange object snap + (0.95_f32, 0.50, 0.08) // orange object-snap marker } else { (1.0, 0.9, 0.1) // classic yellow OSNAP }; @@ -513,7 +513,7 @@ impl canvas::Program for SelectionCanvas { }; match snap_type { SnapType::ObjectPick => { - // Target box + center dot (Civil 3D acquisition glyph). + // Target box + center dot (object-acquisition glyph). let h = 7.0_f32; let rect = canvas::Path::rectangle( Point::new(sp.x - h, sp.y - h),