Grip markers drew visibly offset from the entity on large-coordinate (UTM-scale) drawings: every Grippable impl cast the f64 entity coordinates to f32 BEFORE the world-offset subtraction, and at 1e7 magnitude an f32 holds ~0.9 drawing units of rounding error. The wires subtract the offset in f64 first (precision-preserving), so the grips landed up to ~1 unit away from the geometry they belong to. GripDef.world is now DVec3: producers fill it straight from the f64 entity data, refresh_selected_grips subtracts the world offset in f64, and only the small offset-local result is cast to f32 for screen-space projection (grips_to_screen / find_hit_grip) and drag state. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
355 lines
12 KiB
Rust
355 lines
12 KiB
Rust
use acadrust::entities::Arc;
|
|
use glam::Vec3;
|
|
use truck_modeling::{builder, Point3};
|
|
|
|
use crate::command::EntityTransform;
|
|
use crate::entities::common::{center_grip, edit_prop as edit, parse_f64, square_grip};
|
|
use crate::entities::traits::TruckConvertible;
|
|
use crate::scene::acad_to_truck::{TruckEntity, TruckObject};
|
|
use crate::scene::object::{GripApply, GripDef, PropSection};
|
|
use crate::scene::wire_model::{SnapHint, TangentGeom};
|
|
|
|
const TAU: f64 = std::f64::consts::TAU;
|
|
|
|
fn to_truck(arc: &Arc) -> TruckEntity {
|
|
let cx = arc.center.x;
|
|
let cy = arc.center.y;
|
|
let cz = arc.center.z;
|
|
let r = arc.radius;
|
|
let sa = arc.start_angle;
|
|
let ea = arc.end_angle;
|
|
let normal = (arc.normal.x, arc.normal.y, arc.normal.z);
|
|
|
|
// Compute OCS basis vectors for this entity's normal.
|
|
let (ax, ay) = crate::scene::transform::ocs_axes(normal);
|
|
|
|
let ccw_end = if ea >= sa { ea } else { ea + TAU };
|
|
let mid_a = sa + (ccw_end - sa) * 0.5;
|
|
|
|
// Arc centre in WCS.
|
|
let (cwx, cwy, cwz) = crate::scene::transform::ocs_point_to_wcs((cx, cy, cz), normal);
|
|
|
|
// Arc points in WCS: centre_wcs + r*cos(a)*Ax + r*sin(a)*Ay
|
|
let arc_pt = |a: f64| {
|
|
let (c, s) = (a.cos(), a.sin());
|
|
Point3::new(
|
|
cwx + r * c * ax.0 + r * s * ay.0,
|
|
cwy + r * c * ax.1 + r * s * ay.1,
|
|
cwz + r * c * ax.2 + r * s * ay.2,
|
|
)
|
|
};
|
|
|
|
let cv = Vec3::new(cwx as f32, cwy as f32, cwz as f32);
|
|
// Arc-length centre — one well-defined midpoint snap. Circles and
|
|
// ellipses (closed curves) deliberately don't emit this; see #34.
|
|
let mid_pt_3 = arc_pt(mid_a);
|
|
let mv = Vec3::new(mid_pt_3.x as f32, mid_pt_3.y as f32, mid_pt_3.z as f32);
|
|
let tangent = TangentGeom::Circle {
|
|
center: [cwx as f32, cwy as f32, cwz as f32],
|
|
radius: r as f32,
|
|
};
|
|
|
|
if arc.thickness.abs() > 1e-10 {
|
|
let t = arc.thickness;
|
|
let (nx, ny, nz) = normal;
|
|
let n = 32usize;
|
|
let ccw_end = if ea >= sa { ea } else { ea + TAU };
|
|
let (start_a, end_a) = (sa, ccw_end);
|
|
let mut pts: Vec<[f64; 3]> = Vec::with_capacity((n + 1) * 2 + 8);
|
|
for i in 0..=n {
|
|
let a = start_a + (end_a - start_a) * (i as f64 / n as f64);
|
|
let p = arc_pt(a);
|
|
pts.push([p.x, p.y, p.z]);
|
|
}
|
|
pts.push([f64::NAN; 3]);
|
|
for i in 0..=n {
|
|
let a = start_a + (end_a - start_a) * (i as f64 / n as f64);
|
|
let p = arc_pt(a);
|
|
pts.push([p.x + t * nx, p.y + t * ny, p.z + t * nz]);
|
|
}
|
|
pts.push([f64::NAN; 3]);
|
|
let ps = arc_pt(sa);
|
|
pts.push([ps.x, ps.y, ps.z]);
|
|
pts.push([ps.x + t * nx, ps.y + t * ny, ps.z + t * nz]);
|
|
pts.push([f64::NAN; 3]);
|
|
let pe = arc_pt(ea);
|
|
pts.push([pe.x, pe.y, pe.z]);
|
|
pts.push([pe.x + t * nx, pe.y + t * ny, pe.z + t * nz]);
|
|
return TruckEntity {
|
|
object: TruckObject::Lines(pts),
|
|
snap_pts: vec![(cv, SnapHint::Center), (mv, SnapHint::Midpoint)],
|
|
tangent_geoms: vec![tangent],
|
|
key_vertices: vec![],
|
|
fill_tris: vec![],
|
|
};
|
|
}
|
|
|
|
let p_start = arc_pt(sa);
|
|
let p_end = arc_pt(ea);
|
|
let p_mid = arc_pt(mid_a);
|
|
let v_start = builder::vertex(p_start);
|
|
let v_end = builder::vertex(p_end);
|
|
let edge = builder::circle_arc(&v_start, &v_end, p_mid);
|
|
TruckEntity {
|
|
object: TruckObject::Curve(edge),
|
|
snap_pts: vec![(cv, SnapHint::Center), (mv, SnapHint::Midpoint)],
|
|
tangent_geoms: vec![tangent],
|
|
key_vertices: vec![],
|
|
fill_tris: vec![],
|
|
}
|
|
}
|
|
|
|
fn angle_span(start: f32, end: f32) -> f32 {
|
|
let mut span = end - start;
|
|
if span < 0.0 {
|
|
span += std::f32::consts::TAU;
|
|
}
|
|
span
|
|
}
|
|
|
|
fn grips(arc: &Arc) -> Vec<GripDef> {
|
|
let ctr = glam::DVec3::new(arc.center.x, arc.center.y, arc.center.z);
|
|
let r = arc.radius;
|
|
let sa = arc.start_angle as f32;
|
|
let ea = arc.end_angle as f32;
|
|
let ma = (sa + angle_span(sa, ea) * 0.5) as f64;
|
|
let (sa, ea) = (arc.start_angle, arc.end_angle);
|
|
vec![
|
|
center_grip(0, ctr),
|
|
square_grip(1, ctr + glam::DVec3::new(r * sa.cos(), r * sa.sin(), 0.0)),
|
|
square_grip(2, ctr + glam::DVec3::new(r * ea.cos(), r * ea.sin(), 0.0)),
|
|
center_grip(3, ctr + glam::DVec3::new(r * ma.cos(), r * ma.sin(), 0.0)),
|
|
]
|
|
}
|
|
|
|
fn properties(arc: &Arc) -> PropSection {
|
|
PropSection {
|
|
title: "Geometry".into(),
|
|
props: vec![
|
|
edit("Center X", "center_x", arc.center.x),
|
|
edit("Center Y", "center_y", arc.center.y),
|
|
edit("Center Z", "center_z", arc.center.z),
|
|
edit("Radius", "radius", arc.radius),
|
|
edit(
|
|
"Start Angle (deg)",
|
|
"start_angle",
|
|
arc.start_angle.to_degrees(),
|
|
),
|
|
edit("End Angle (deg)", "end_angle", arc.end_angle.to_degrees()),
|
|
],
|
|
}
|
|
}
|
|
|
|
fn apply_geom_prop(arc: &mut Arc, field: &str, value: &str) {
|
|
let Some(v) = parse_f64(value) else {
|
|
return;
|
|
};
|
|
match field {
|
|
"center_x" => arc.center.x = v,
|
|
"center_y" => arc.center.y = v,
|
|
"center_z" => arc.center.z = v,
|
|
"radius" if v > 0.0 => arc.radius = v,
|
|
"start_angle" => arc.start_angle = v.to_radians(),
|
|
"end_angle" => arc.end_angle = v.to_radians(),
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
fn apply_grip(arc: &mut Arc, grip_id: usize, apply: GripApply) {
|
|
match (grip_id, apply) {
|
|
(0, GripApply::Translate(d)) => {
|
|
arc.center.x += d.x as f64;
|
|
arc.center.y += d.y as f64;
|
|
arc.center.z += d.z as f64;
|
|
}
|
|
(0, GripApply::Absolute(p)) => {
|
|
arc.center.x = p.x as f64;
|
|
arc.center.y = p.y as f64;
|
|
arc.center.z = p.z as f64;
|
|
}
|
|
(1, GripApply::Absolute(p)) => {
|
|
let dx = p.x - arc.center.x as f32;
|
|
let dy = p.y - arc.center.y as f32;
|
|
arc.start_angle = (dy as f64).atan2(dx as f64);
|
|
}
|
|
(2, GripApply::Absolute(p)) => {
|
|
let dx = p.x - arc.center.x as f32;
|
|
let dy = p.y - arc.center.y as f32;
|
|
arc.end_angle = (dy as f64).atan2(dx as f64);
|
|
}
|
|
(3, GripApply::Translate(d)) => {
|
|
let sa = arc.start_angle as f32;
|
|
let ea = arc.end_angle as f32;
|
|
let span = angle_span(sa, ea);
|
|
let mid_a = sa + span * 0.5;
|
|
let current_mid_x = arc.center.x as f32 + arc.radius as f32 * mid_a.cos();
|
|
let current_mid_y = arc.center.y as f32 + arc.radius as f32 * mid_a.sin();
|
|
let new_mid_x = current_mid_x + d.x;
|
|
let new_mid_y = current_mid_y + d.y;
|
|
let dx = new_mid_x - arc.center.x as f32;
|
|
let dy = new_mid_y - arc.center.y as f32;
|
|
let new_r = (dx * dx + dy * dy).sqrt() as f64;
|
|
if new_r > 1e-6 {
|
|
arc.radius = new_r;
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
|
|
fn apply_transform(arc: &mut Arc, t: &EntityTransform) {
|
|
crate::scene::transform::apply_standard_entity_transform(arc, t, |entity, p1, p2| {
|
|
crate::scene::transform::reflect_xy_point(
|
|
&mut entity.center.x,
|
|
&mut entity.center.y,
|
|
p1,
|
|
p2,
|
|
);
|
|
let dx = (p2.x - p1.x) as f64;
|
|
let dy = (p2.y - p1.y) as f64;
|
|
let line_angle = dy.atan2(dx);
|
|
let tmp = entity.start_angle;
|
|
entity.start_angle = 2.0 * line_angle - entity.end_angle;
|
|
entity.end_angle = 2.0 * line_angle - tmp;
|
|
});
|
|
}
|
|
|
|
impl TruckConvertible for Arc {
|
|
fn to_truck(&self, _document: &acadrust::CadDocument) -> Option<TruckEntity> {
|
|
Some(to_truck(self))
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::Grippable for Arc {
|
|
fn grips(&self) -> Vec<GripDef> {
|
|
grips(self)
|
|
}
|
|
fn apply_grip(&mut self, grip_id: usize, apply: GripApply) {
|
|
apply_grip(self, grip_id, apply);
|
|
}
|
|
fn grip_menu(&self, grip_id: usize) -> Vec<crate::scene::object::GripMenuItem> {
|
|
use crate::scene::object::{GripMenuAction, GripMenuItem};
|
|
match grip_id {
|
|
0 => vec![GripMenuItem {
|
|
label: "Stretch",
|
|
action: GripMenuAction::Stretch,
|
|
}],
|
|
3 => vec![
|
|
GripMenuItem {
|
|
label: "Stretch",
|
|
action: GripMenuAction::Stretch,
|
|
},
|
|
GripMenuItem {
|
|
label: "Radius",
|
|
action: GripMenuAction::Radius,
|
|
},
|
|
GripMenuItem {
|
|
label: "Arc Length",
|
|
action: GripMenuAction::ArcLength,
|
|
},
|
|
],
|
|
_ => vec![
|
|
GripMenuItem {
|
|
label: "Stretch",
|
|
action: GripMenuAction::Stretch,
|
|
},
|
|
GripMenuItem {
|
|
label: "Lengthen",
|
|
action: GripMenuAction::Lengthen,
|
|
},
|
|
],
|
|
}
|
|
}
|
|
fn apply_grip_menu(&mut self, _grip_id: usize, _action: crate::scene::object::GripMenuAction) {
|
|
// Radius / Arc Length / Lengthen all need a follow-up prompt;
|
|
// the actual edit happens in `apply_grip_menu_value`.
|
|
}
|
|
|
|
fn grip_menu_value_prompt(
|
|
&self,
|
|
_grip_id: usize,
|
|
action: crate::scene::object::GripMenuAction,
|
|
) -> Option<&'static str> {
|
|
use crate::scene::object::GripMenuAction as A;
|
|
match action {
|
|
A::Radius => Some("New radius"),
|
|
A::ArcLength => Some("New arc length"),
|
|
A::Lengthen => Some("Distance"),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn apply_grip_menu_value(
|
|
&mut self,
|
|
grip_id: usize,
|
|
action: crate::scene::object::GripMenuAction,
|
|
value: f64,
|
|
) {
|
|
use crate::scene::object::GripMenuAction as A;
|
|
match action {
|
|
A::Radius if value > 0.0 => self.radius = value,
|
|
A::ArcLength if value > 0.0 && self.radius > 1e-9 => {
|
|
// Hold start_angle, derive new end_angle from arc length
|
|
// = r * Δθ.
|
|
let new_span = value / self.radius;
|
|
self.end_angle = self.start_angle + new_span;
|
|
}
|
|
A::Lengthen => {
|
|
// Extend either end by `value` arc-length units along
|
|
// the arc. Positive `value` lengthens; negative
|
|
// shortens. Grip 1 = start endpoint, grip 2 = end endpoint.
|
|
if self.radius < 1e-9 {
|
|
return;
|
|
}
|
|
let dtheta = value / self.radius;
|
|
match grip_id {
|
|
1 => self.start_angle -= dtheta,
|
|
2 => self.end_angle += dtheta,
|
|
_ => {}
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::PropertyEditable for Arc {
|
|
fn geometry_properties(&self, _text_style_names: &[String]) -> PropSection {
|
|
properties(self)
|
|
}
|
|
fn apply_geom_prop(&mut self, field: &str, value: &str) {
|
|
apply_geom_prop(self, field, value);
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::Transformable for Arc {
|
|
fn apply_transform(&mut self, t: &EntityTransform) {
|
|
apply_transform(self, t);
|
|
}
|
|
}
|
|
|
|
impl crate::entities::traits::MassPropsCalc for acadrust::entities::Arc {
|
|
fn mass_props(&self) -> crate::entities::traits::MassProps {
|
|
use std::f64::consts::TAU;
|
|
let r = self.radius;
|
|
let span = {
|
|
let s = (self.end_angle - self.start_angle).rem_euclid(TAU);
|
|
if s < 1e-6 {
|
|
TAU
|
|
} else {
|
|
s
|
|
}
|
|
};
|
|
// Sector area (pie slice)
|
|
let area = 0.5 * r * r * span;
|
|
let arc_len = r * span;
|
|
// Centroid of arc (chord midpoint direction)
|
|
let mid_rad = self.start_angle + span / 2.0;
|
|
crate::entities::traits::MassProps {
|
|
area,
|
|
perimeter: arc_len,
|
|
cx: self.center.x + r * mid_rad.cos(),
|
|
cy: self.center.y + r * mid_rad.sin(),
|
|
}
|
|
}
|
|
}
|