forked from 1b-agent/opencadstudio-upstream
Whole command/snap/grip/cursor chain now builds on f64 DVec3 end to end,
so picked points, snaps and grip drags stay precise at UTM-scale
coordinates instead of quantizing to ~0.5 m through f32.
- All ~80 command files migrated: draw (line/circle/arc/ellipse/shapes
in full f64; others via point methods), modify, annotate, insert, view,
inquiry, layers, groups, clipboard, layout.
- Entity apply_grip impls updated for GripApply::{Absolute,Translate}(DVec3).
- Construction sites (EntityTransform/CmdResult/DynAnchor) emit DVec3;
wire-preview boundaries cast to f32 only at the GPU edge.
- Modify/annotate commands keep internal Vec3 geometry where precision is
non-critical, casting at the DVec3 boundary; key draw commands store f64.
Builds clean (no warnings). Visual verification of crosshair/snap/grip at
extreme UTM zoom pending.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
126 lines
3.7 KiB
Rust
126 lines
3.7 KiB
Rust
use acadrust::entities::{Dimension, DimensionRadius};
|
|
use acadrust::types::Vector3;
|
|
use acadrust::EntityType;
|
|
|
|
use crate::command::{CadCommand, CmdResult};
|
|
use crate::modules::{IconKind, ModuleEvent, ToolDef};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
use glam::{DVec3, Vec3};
|
|
|
|
pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_radius.svg"));
|
|
|
|
pub fn tool() -> ToolDef {
|
|
ToolDef {
|
|
id: "DIMRADIUS",
|
|
label: "Radius",
|
|
icon: ICON,
|
|
event: ModuleEvent::Command("DIMRADIUS".to_string()),
|
|
}
|
|
}
|
|
|
|
enum Step {
|
|
CenterPoint,
|
|
RadiusPoint(Vec3),
|
|
TextPoint { center: Vec3, point: Vec3 },
|
|
}
|
|
|
|
pub struct RadiusDimensionCommand {
|
|
step: Step,
|
|
}
|
|
|
|
impl RadiusDimensionCommand {
|
|
pub fn new() -> Self {
|
|
Self {
|
|
step: Step::CenterPoint,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl CadCommand for RadiusDimensionCommand {
|
|
fn name(&self) -> &'static str {
|
|
"DIMRADIUS"
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
match self.step {
|
|
Step::CenterPoint => "DIMRADIUS Specify center point:".into(),
|
|
Step::RadiusPoint(_) => "DIMRADIUS Specify radius point:".into(),
|
|
Step::TextPoint { .. } => "DIMRADIUS Specify dimension line location:".into(),
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult { let pt = pt.as_vec3();
|
|
match self.step {
|
|
Step::CenterPoint => {
|
|
self.step = Step::RadiusPoint(pt);
|
|
CmdResult::NeedPoint
|
|
}
|
|
Step::RadiusPoint(center) => {
|
|
self.step = Step::TextPoint { center, point: pt };
|
|
CmdResult::NeedPoint
|
|
}
|
|
Step::TextPoint { center, point } => {
|
|
let mut dim = DimensionRadius::new(v3(center), v3(point));
|
|
dim.base.definition_point = v3(point);
|
|
dim.base.text_middle_point = v3(pt);
|
|
dim.base.insertion_point = v3(pt);
|
|
dim.leader_length = point.distance(pt) as f64;
|
|
dim.base.actual_measurement = dim.measurement();
|
|
CmdResult::CommitAndExit(EntityType::Dimension(Dimension::Radius(dim)))
|
|
}
|
|
}
|
|
}
|
|
|
|
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();
|
|
match self.step {
|
|
Step::CenterPoint => None,
|
|
Step::RadiusPoint(center) => Some(preview_wire(vec![center, pt])),
|
|
Step::TextPoint { center, point } => Some(preview_wire(vec![
|
|
center,
|
|
point,
|
|
Vec3::new(f32::NAN, f32::NAN, f32::NAN),
|
|
point,
|
|
pt,
|
|
])),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn v3(pt: Vec3) -> Vector3 {
|
|
Vector3::new(pt.x as f64, pt.y as f64, pt.z as f64)
|
|
}
|
|
|
|
fn preview_wire(points: Vec<Vec3>) -> WireModel {
|
|
WireModel {
|
|
name: "dimradius_preview".to_string(),
|
|
points: points.into_iter().map(|p| [p.x, p.y, p.z]).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,
|
|
vp_scissor: None,
|
|
fill_tris: vec![],
|
|
fill_tris_low: Vec::new(),
|
|
}
|
|
}
|
|
|
|
|
|
// ── Autocomplete registry ─────────────────────────────────
|
|
inventory::submit!(crate::command::CommandRegistration { names: &["DIMRADIUS"] }); // RadiusDimensionCommand
|