forked from 1b-agent/opencadstudio-upstream
Hakan SevenandClaude Opus 4.8
4f7a98a2ad
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>
91 lines
2.7 KiB
Rust
91 lines
2.7 KiB
Rust
// AREA command — compute area and perimeter of a polygon picked point by point.
|
|
// Press Enter to close and calculate.
|
|
|
|
use glam::{DVec3, Vec3};
|
|
|
|
use crate::command::{CadCommand, CmdResult};
|
|
use crate::scene::model::wire_model::WireModel;
|
|
|
|
pub struct AreaCommand {
|
|
points: Vec<Vec3>,
|
|
}
|
|
|
|
impl AreaCommand {
|
|
pub fn new() -> Self {
|
|
Self { points: vec![] }
|
|
}
|
|
}
|
|
|
|
impl CadCommand for AreaCommand {
|
|
fn name(&self) -> &'static str {
|
|
"AREA"
|
|
}
|
|
|
|
fn prompt(&self) -> String {
|
|
if self.points.is_empty() {
|
|
"AREA Specify first corner point (Enter to cancel):".into()
|
|
} else {
|
|
format!(
|
|
"AREA Specify next point ({} picked, Enter to calculate):",
|
|
self.points.len()
|
|
)
|
|
}
|
|
}
|
|
|
|
fn on_point(&mut self, pt: DVec3) -> CmdResult { let pt = pt.as_vec3();
|
|
self.points.push(pt);
|
|
CmdResult::NeedPoint
|
|
}
|
|
|
|
fn on_enter(&mut self) -> CmdResult {
|
|
if self.points.len() < 3 {
|
|
return CmdResult::Cancel;
|
|
}
|
|
// Shoelace formula in the world XY plane.
|
|
let n = self.points.len();
|
|
let mut area_sum = 0.0f32;
|
|
let mut perimeter = 0.0f32;
|
|
for idx in 0..n {
|
|
let a = self.points[idx];
|
|
let b = self.points[(idx + 1) % n];
|
|
area_sum += a.x * b.y - b.x * a.y;
|
|
perimeter += (b - a).length();
|
|
}
|
|
let area = (area_sum * 0.5).abs();
|
|
let msg = format!("Area = {area:.4}, Perimeter = {perimeter:.4}");
|
|
CmdResult::Measurement(msg)
|
|
}
|
|
|
|
fn on_mouse_move(&mut self, pt: DVec3) -> Option<WireModel> { let pt = pt.as_vec3();
|
|
if self.points.is_empty() {
|
|
return None;
|
|
}
|
|
let mut pts: Vec<[f32; 3]> = self.points.iter().map(|p| [p.x, p.y, p.z]).collect();
|
|
pts.push([pt.x, pt.y, pt.z]);
|
|
pts.push([self.points[0].x, self.points[0].y, self.points[0].z]);
|
|
Some(WireModel {
|
|
name: "area_preview".into(),
|
|
points: pts,
|
|
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: &["AREA"] }); // AreaCommand
|