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>
361 lines
10 KiB
Rust
361 lines
10 KiB
Rust
// LEADER command
|
|
//
|
|
// Flow:
|
|
// 1. Click the arrowhead point, then one or more bend points.
|
|
// 2. Enter (≥2 points) places the leader line plus a linked, empty MText
|
|
// annotation at the landing, and opens the in-place MText editor so the
|
|
// user types the annotation. Escape leaves the leader without text.
|
|
//
|
|
// The MText is a separate entity referenced by the leader's annotation_handle
|
|
// (DXF group 340); editing/erasing them stays in sync via that link.
|
|
|
|
use acadrust::entities::mtext::AttachmentPoint;
|
|
use acadrust::entities::{Leader, LeaderCreationType, MText};
|
|
use acadrust::types::Vector3;
|
|
use acadrust::EntityType;
|
|
use glam::{DVec3, Mat4, Vec3};
|
|
|
|
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/leader.svg"));
|
|
|
|
pub fn tool() -> ToolDef {
|
|
ToolDef {
|
|
id: "LEADER",
|
|
label: "Leader",
|
|
icon: ICON,
|
|
event: ModuleEvent::Command("LEADER".to_string()),
|
|
}
|
|
}
|
|
|
|
pub struct LeaderCommand {
|
|
verts: Vec<DVec3>,
|
|
plane: WorkingPlane,
|
|
dimension_style: String,
|
|
text_style: String,
|
|
text_height: f64,
|
|
display_scale: f64,
|
|
gap: f64,
|
|
arrow_size: f64,
|
|
annotative: bool,
|
|
}
|
|
|
|
impl LeaderCommand {
|
|
pub fn with_defaults(
|
|
defaults: crate::scene::creation_style::DimensionCreationDefaults,
|
|
annotation_multiplier: f64,
|
|
) -> Self {
|
|
let display_scale = if defaults.annotative {
|
|
annotation_multiplier
|
|
} else {
|
|
defaults.scale
|
|
};
|
|
|
|
Self {
|
|
verts: Vec::new(),
|
|
plane: WorkingPlane::default(),
|
|
dimension_style: defaults.style_name,
|
|
text_style: defaults.text_style_name,
|
|
text_height: defaults.text_height,
|
|
display_scale,
|
|
gap: defaults.gap,
|
|
arrow_size: defaults.arrow_size,
|
|
annotative: defaults.annotative,
|
|
}
|
|
}
|
|
|
|
fn finish(&self) -> CmdResult {
|
|
if self.verts.len() < 2 {
|
|
return CmdResult::Cancel;
|
|
}
|
|
|
|
let local: Vec<DVec3> = self
|
|
.verts
|
|
.iter()
|
|
.map(|point| self.plane.to_local(*point))
|
|
.collect();
|
|
|
|
let displayed_height = self.text_height * self.display_scale;
|
|
|
|
let displayed_landing = if self.arrow_size > 1.0e-9 {
|
|
self.arrow_size * self.display_scale
|
|
} else {
|
|
displayed_height * 1.5
|
|
};
|
|
|
|
// The user supplies only the arrow point and elbow. The horizontal
|
|
// landing is stored as a real third LEADER vertex so it can have its own grip.
|
|
let mut leader_points = local.clone();
|
|
|
|
let first = local[0];
|
|
let elbow = local[1];
|
|
let sign = if elbow.x >= first.x { 1.0 } else { -1.0 };
|
|
|
|
let landing_end = DVec3::new(
|
|
elbow.x + sign * displayed_landing,
|
|
elbow.y,
|
|
elbow.z,
|
|
);
|
|
|
|
leader_points.push(landing_end);
|
|
|
|
let leader = build_leader(
|
|
&leader_points,
|
|
Mat4::IDENTITY,
|
|
&self.dimension_style,
|
|
self.text_height,
|
|
self.gap,
|
|
self.arrow_size,
|
|
);
|
|
|
|
// The MTEXT starts at the real end of the landing.
|
|
let (anchor, attach) =
|
|
annotation_anchor(&leader_points, 0.0, Mat4::IDENTITY);
|
|
|
|
// Store the MTEXT at its native model-space size for the current
|
|
// annotation scale. Its annotation contexts then scale it relatively
|
|
// when another representation becomes active.
|
|
let mtext_height = displayed_height;
|
|
|
|
let mtext = build_mtext(
|
|
"",
|
|
anchor,
|
|
mtext_height,
|
|
attach,
|
|
Mat4::IDENTITY,
|
|
&self.text_style,
|
|
self.annotative,
|
|
);
|
|
|
|
CmdResult::CommitManyAndEditText {
|
|
entities: vec![
|
|
self.plane.place_entity(EntityType::Leader(leader)),
|
|
self.plane.place_entity(EntityType::MText(mtext)),
|
|
],
|
|
edit_index: 1,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl CadCommand for LeaderCommand {
|
|
fn name(&self) -> &'static str {
|
|
"LEADER"
|
|
}
|
|
|
|
fn set_working_plane(&mut self, plane: WorkingPlane) {
|
|
self.plane = plane;
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
if self.verts.is_empty() {
|
|
t!("LEADER Specify arrowhead point:").into_owned()
|
|
} else {
|
|
t!("LEADER Specify landing point:").into_owned()
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult {
|
|
self.verts.push(pt);
|
|
|
|
if self.verts.len() >= 2 {
|
|
self.finish()
|
|
} else {
|
|
CmdResult::NeedPoint
|
|
}
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
self.finish()
|
|
}
|
|
|
|
fn on_escape(&mut self) -> CmdResult {
|
|
CmdResult::Cancel
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> {
|
|
if self.verts.is_empty() {
|
|
return None;
|
|
}
|
|
let mut pts: Vec<Vec3> = self
|
|
.verts
|
|
.iter()
|
|
.map(|point| self.plane.to_local(*point).as_vec3())
|
|
.collect();
|
|
pts.push(self.plane.to_local(pt).as_vec3());
|
|
let mut preview = preview_wire(
|
|
&pts,
|
|
(self.arrow_size * self.display_scale) as f32,
|
|
);
|
|
preview.points = preview
|
|
.points
|
|
.iter()
|
|
.map(|point| {
|
|
if point[0].is_nan() {
|
|
*point
|
|
} else {
|
|
self.plane
|
|
.to_world(Vec3::from_array(*point).as_dvec3())
|
|
.as_vec3()
|
|
.to_array()
|
|
}
|
|
})
|
|
.collect();
|
|
Some(preview)
|
|
}
|
|
}
|
|
|
|
// ── Helpers ─────────────────────────────────────────────────────────────────
|
|
|
|
fn dv3(p: DVec3) -> Vector3 {
|
|
Vector3::new(p.x, p.y, p.z)
|
|
}
|
|
|
|
fn build_leader(
|
|
verts: &[DVec3],
|
|
ucs: Mat4,
|
|
dimension_style: &str,
|
|
text_height: f64,
|
|
gap: f64,
|
|
arrow_size: f64,
|
|
) -> Leader {
|
|
let mut l = Leader::from_vertices(verts.iter().map(|p| dv3(*p)).collect());
|
|
l.creation_type = LeaderCreationType::WithText;
|
|
|
|
// New leaders store the landing as their final real vertex, so the renderer
|
|
// must not append a second synthetic hookline.
|
|
l.hookline_enabled = false;
|
|
l.dimension_style = dimension_style.to_string();
|
|
l.text_height = text_height;
|
|
l.dimension_gap = gap;
|
|
l.arrow_size = arrow_size;
|
|
// The hookline / text read along the UCS X axis (DXF "horizontal direction
|
|
// for text"); the renderer uses it instead of world horizontal.
|
|
let ux = ucs.transform_vector3(Vec3::X).normalize_or(Vec3::X);
|
|
l.horizontal_direction = Vector3::new(ux.x as f64, ux.y as f64, 0.0);
|
|
l
|
|
}
|
|
|
|
/// Text anchor at the end of the landing line, and the attachment point that
|
|
/// keeps the text reading away from the leader (text to the right of a
|
|
/// left-pointing landing, to the left of a right-pointing one).
|
|
fn annotation_anchor(
|
|
verts: &[DVec3],
|
|
landing_length: f64,
|
|
ucs: Mat4,
|
|
) -> (DVec3, AttachmentPoint) {
|
|
let last = *verts.last().unwrap();
|
|
let prev = verts[verts.len() - 2];
|
|
|
|
let ux = ucs
|
|
.transform_vector3(Vec3::X)
|
|
.normalize_or(Vec3::X)
|
|
.as_dvec3();
|
|
|
|
let to_right = (last - prev).dot(ux) >= 0.0;
|
|
let sign = if to_right { 1.0_f64 } else { -1.0_f64 };
|
|
|
|
let anchor = last + ux * (sign * landing_length);
|
|
|
|
let attach = if to_right {
|
|
AttachmentPoint::MiddleLeft
|
|
} else {
|
|
AttachmentPoint::MiddleRight
|
|
};
|
|
|
|
(anchor, attach)
|
|
}
|
|
|
|
fn build_mtext(
|
|
text: &str,
|
|
pos: DVec3,
|
|
height: f64,
|
|
attach: AttachmentPoint,
|
|
ucs: Mat4,
|
|
text_style: &str,
|
|
annotative: bool,
|
|
) -> MText {
|
|
let mut m = MText::new();
|
|
m.value = text.to_string();
|
|
m.insertion_point = dv3(pos);
|
|
m.height = height;
|
|
m.style = text_style.to_string();
|
|
m.is_annotative = annotative;
|
|
m.attachment_point = attach;
|
|
// Text reads along the UCS X axis.
|
|
let ux = ucs.transform_vector3(Vec3::X);
|
|
m.rotation = (ux.y as f64).atan2(ux.x as f64);
|
|
m
|
|
}
|
|
|
|
fn preview_wire(pts: &[Vec3], arrow_size: f32) -> WireModel {
|
|
let mut points: Vec<[f32; 3]> = pts.iter().map(|p| [p.x, p.y, p.z]).collect();
|
|
if pts.len() >= 2 {
|
|
let [w1, w2] = arrowhead_wings(pts[0], pts[1], arrow_size);
|
|
points.push([f32::NAN; 3]);
|
|
points.push([w1.x, w1.y, w1.z]);
|
|
points.push([pts[0].x, pts[0].y, pts[0].z]);
|
|
points.push([w2.x, w2.y, w2.z]);
|
|
}
|
|
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: "leader_preview".into(),
|
|
points,
|
|
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(),
|
|
}
|
|
}
|
|
|
|
pub fn arrowhead_wings(tip: Vec3, next: Vec3, size: f32) -> [Vec3; 2] {
|
|
let d = next - tip;
|
|
let len = (d.x * d.x + d.y * d.y).sqrt().max(1e-9);
|
|
let (dx, dy) = (d.x / len, d.y / len);
|
|
let angle = std::f32::consts::PI / 6.0;
|
|
let (s, c) = angle.sin_cos();
|
|
[
|
|
Vec3::new(
|
|
tip.x + (dx * c - dy * s) * size,
|
|
tip.y + (dx * s + dy * c) * size,
|
|
tip.z,
|
|
),
|
|
Vec3::new(
|
|
tip.x + (dx * c + dy * s) * size,
|
|
tip.y + (-dx * s + dy * c) * size,
|
|
tip.z,
|
|
),
|
|
]
|
|
}
|
|
|
|
|
|
// ── Autocomplete registry ─────────────────────────────────
|
|
inventory::submit!(crate::command::CommandRegistration { names: &["LEADER"] }); // LeaderCommand
|