forked from 1b-agent/opencadstudio-upstream
Hakan SevenandClaude Opus 4.8
5bd683cf4e
MLINE dashed elements were fully CPU-expanded (apply_along) — one wire per dash — to keep the parallel lines in phase. Move pure-dash elements onto the GPU dash shader and end-align every element to the multiline's centre-line so they share one interior phase. - wire_distances now accumulates arc-length from the double-single (high+low) points, so the dash phase stays precise at UTM coordinates. f32-high-only deltas quantised ~0.1 there and drifted the parallel lines apart — the original reason MLINE dashes were CPU-side. - New WireModel.dash_align_end carries a shared begin/end dash length. The shader uses it as align_end for every parallel element (the interior phase depends on align_end, not the wire's own length) while align_total stays the element's own length, so each still ends on a dash at its own endpoint. - MLINE tessellation derives that length once from the centre-line, routes pure dash/space/dot elements to the GPU pattern and text-bearing elements to apply_along. - apply_along gained an "A"-type mode (shared reference length): a solid begin/end dash and a phased interior, so its dashes — and embedded text — line up with the GPU-dashed sibling elements instead of tiling from start. Pure-dash MLINEs now cost one WireModel + pattern per element instead of N segments; single (non-MLINE) entities keep the from-start tiling unchanged. Co-Authored-By: Claude Opus 4.8 <[email protected]>
97 lines
2.6 KiB
Rust
97 lines
2.6 KiB
Rust
// ZOOM WINDOW command — pick two corners to define the zoom area.
|
|
|
|
use glam::{DVec3, Vec3};
|
|
|
|
use crate::command::{CadCommand, CmdResult};
|
|
use crate::modules::{IconKind, ModuleEvent, ToolDef};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
|
|
pub const ICON: IconKind =
|
|
IconKind::Svg(include_bytes!("../../../assets/icons/zoom_window.svg"));
|
|
|
|
/// Ribbon button: zoom into a rectangle picked by two corners.
|
|
pub fn tool() -> ToolDef {
|
|
ToolDef {
|
|
id: "ZOOM_WINDOW",
|
|
label: "Zoom Window",
|
|
icon: ICON,
|
|
event: ModuleEvent::Command("ZOOM WINDOW".to_string()),
|
|
}
|
|
}
|
|
|
|
pub struct ZoomWindowCommand {
|
|
first: Option<Vec3>,
|
|
}
|
|
|
|
impl ZoomWindowCommand {
|
|
pub fn new() -> Self {
|
|
Self { first: None }
|
|
}
|
|
}
|
|
|
|
impl CadCommand for ZoomWindowCommand {
|
|
fn name(&self) -> &'static str {
|
|
"ZOOM WINDOW"
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
if self.first.is_none() {
|
|
"ZOOM WINDOW Specify first corner:".into()
|
|
} else {
|
|
"ZOOM WINDOW Specify opposite corner:".into()
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult { let pt = pt.as_vec3();
|
|
if let Some(p1) = self.first {
|
|
CmdResult::ZoomToWindow { p1: p1.as_dvec3(), p2: pt.as_dvec3() }
|
|
} else {
|
|
self.first = Some(pt);
|
|
CmdResult::NeedPoint
|
|
}
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
CmdResult::Cancel
|
|
}
|
|
|
|
fn on_escape(&mut self) -> CmdResult {
|
|
CmdResult::Cancel
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> { let pt = pt.as_vec3();
|
|
let p1 = self.first?;
|
|
let min = p1.min(pt);
|
|
let max = p1.max(pt);
|
|
// Draw a rectangle preview
|
|
Some(WireModel {
|
|
dash_from_start: false,
|
|
dash_align_end: None,
|
|
text_verts: Vec::new(),
|
|
name: "zoom_window_preview".into(),
|
|
points: vec![
|
|
[min.x, min.y, 0.0],
|
|
[max.x, min.y, 0.0],
|
|
[max.x, max.y, 0.0],
|
|
[min.x, max.y, 0.0],
|
|
[min.x, min.y, 0.0],
|
|
],
|
|
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,
|
|
vp_scissor: None,
|
|
fill_tris: vec![],
|
|
fill_tris_low: Vec::new(),
|
|
})
|
|
}
|
|
}
|