forked from 1b-agent/opencadstudio-upstream
chore: drop brand names and orphaned PICK_HIGHLIGHT colours
Neutralise vendor references in comments to plain behavioural descriptions (object acquisition / object snap). Remove the PICK_HIGHLIGHT and PICK_HIGHLIGHT_DIM wire colours: their only consumer was the stripped storm-sewer add-on, and the retained plugin acquisition pathway draws the ObjectPick snap glyph and per-command hover previews instead, so the constants are dead. Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
5a36494ed7
commit
02b0fc4dcf
6 files changed
+8
-13
No files matched your search
+1
-1
@@ -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| {
|
||||
|
||||
+2
-2
@@ -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.
|
||||
|
||||
+2
-2
@@ -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.
|
||||
//
|
||||
|
||||
@@ -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,
|
||||
|
||||
+1
-1
@@ -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,
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -501,7 +501,7 @@ impl canvas::Program<Message> 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<Message> 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),
|
||||
|
||||
Reference in new issue
Block a user