forked from 1b-agent/opencadstudio-upstream
Switching to a Layout re-tessellated the whole model — `memo_miss=186455`, 2034 ms — to arrive at geometry identical to what was already in the memo. The only thing that differed was colour. `local_wires_for` already knows this: it stores the raw colour and drops its background argument with `let _ = bg_color;`, noting that `Batches::finalize` applies `adapt_to_bg` last, "so the cache no longer has to rebuild on BACKGROUND / layout-switch". The tessellation memo's guard had not been told, and still mixed the background in, so every entry was discarded on a switch. `finalize` now records what its colour resolution consumed — the raw colour, the raw glyph colours, and the three flags it branches on — as `WireModel::bg_adapt`, and `resolve_colors_for_bg` replays it for another background. The guard drops the background, so a memo entry serves any layout. The resolution recomputes from the recorded raw colour rather than from the resolved one, which makes it idempotent and therefore safe over a set that mixes memo hits with freshly tessellated misses. Re-adapting the resolved colour would not be safe: `adapt_to_bg` snaps a near-white colour to pure black on a light background, and pure black comes back pure *white* on a dark one, losing the tint. A test pins that asymmetry so the raw colour is not optimised away later. The contract is tested against the real `finalize` rather than a copy of its logic: for every background pair, building under one and resolving for the other lands exactly where building under the other would have. `bg_adapt` is `None` for wires built anywhere else, and the resolution skips them, so nothing outside the block cache changes colour. It is also `None` when the resolution would be a no-op — a preserved colour with no canvas fill looks the same under every background — which keeps the common case at no cost. Ordering is unchanged: the pass runs inside the builder, before `append_scene_markers` and `apply_refedit_fade`, both of which have their own separate background dependency. `wires-build` gains `colors=` so the pass has a number of its own. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
123 lines
3.6 KiB
Rust
123 lines
3.6 KiB
Rust
// TOLERANCE command — place a GD&T (geometric dimensioning & tolerancing) frame.
|
|
//
|
|
// The structured editor prepares the frame; this command places it.
|
|
|
|
use acadrust::entities::Tolerance;
|
|
use acadrust::types::Vector3;
|
|
use acadrust::EntityType;
|
|
use glam::DVec3;
|
|
|
|
use crate::command::{CadCommand, CmdResult, WorkingPlane};
|
|
use crate::modules::{IconKind, ModuleEvent, ToolDef};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
use crate::t;
|
|
|
|
pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/tolerance.svg"));
|
|
|
|
pub fn tool() -> ToolDef {
|
|
ToolDef {
|
|
id: "TOLERANCE",
|
|
label: "Tolerance",
|
|
icon: ICON,
|
|
event: ModuleEvent::Command("TOLERANCE".to_string()),
|
|
}
|
|
}
|
|
|
|
pub struct ToleranceCommand {
|
|
text: String,
|
|
preview_strokes: Vec<Vec<[f32; 2]>>,
|
|
plane: WorkingPlane,
|
|
}
|
|
|
|
impl ToleranceCommand {
|
|
pub fn with_text(text: String, preview_strokes: Vec<Vec<[f32; 2]>>) -> Self {
|
|
Self {
|
|
text,
|
|
preview_strokes,
|
|
plane: WorkingPlane::default(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl CadCommand for ToleranceCommand {
|
|
fn set_working_plane(&mut self, plane: WorkingPlane) {
|
|
self.plane = plane;
|
|
}
|
|
|
|
fn name(&self) -> &'static str {
|
|
"TOLERANCE"
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
t!("TOLERANCE Specify insertion point:").into_owned()
|
|
}
|
|
|
|
fn wants_text_input(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult {
|
|
let point = self.plane.to_local(pt);
|
|
let ins = Vector3::new(point.x, point.y, point.z);
|
|
let tol = Tolerance::with_text(ins, self.text.clone());
|
|
CmdResult::CommitAndExit(self.plane.place_entity(EntityType::Tolerance(tol)))
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
CmdResult::Cancel
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> {
|
|
let mut points = Vec::new();
|
|
for stroke in &self.preview_strokes {
|
|
if stroke.len() < 2 {
|
|
continue;
|
|
}
|
|
if !points.is_empty() {
|
|
points.push(DVec3::splat(f64::NAN));
|
|
}
|
|
points.extend(stroke.iter().map(|[x, y]| {
|
|
pt + self.plane.x * *x as f64 + self.plane.y * *y as f64
|
|
}));
|
|
}
|
|
Some(WireModel {
|
|
bg_adapt: None,
|
|
point_marker: None,
|
|
taper_widths: Vec::new(),
|
|
pattern_stations: Vec::new(),
|
|
world_width: 0.0,
|
|
depth_override: None,
|
|
display_visible: true,
|
|
plot_visible: true,
|
|
fill_is_3d: false,
|
|
fill_is_2d_solid: false,
|
|
render_instance: None,
|
|
pick_tris: Vec::new(),
|
|
pick_tris_low: Vec::new(),
|
|
dash_from_start: false,
|
|
dash_align_end: None,
|
|
text_verts: Vec::new(),
|
|
name: "tolerance_preview".into(),
|
|
points: points.iter().map(|point| point.as_vec3().to_array()).collect(),
|
|
points_low: Vec::new(),
|
|
color: WireModel::CYAN,
|
|
selected: false,
|
|
pattern_length: 0.0,
|
|
pattern: [0.0; 8],
|
|
line_weight_px: 1.0,
|
|
snap_pts: vec![],
|
|
tangent_geoms: vec![],
|
|
aci: 0,
|
|
key_vertices: vec![],
|
|
aabb: WireModel::UNBOUNDED_AABB,
|
|
plinegen: true,
|
|
fill_tris: vec![],
|
|
fill_tris_low: Vec::new(),
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
// ── Autocomplete registry ─────────────────────────────────
|
|
inventory::submit!(crate::command::CommandRegistration { names: &["TOLERANCE"] }); // ToleranceCommand
|