forked from 1b-agent/opencadstudio-upstream
Hakan SevenandClaude Opus 4.7
9b5073752d
Every entity file ended with the same three-trait wrapper block:
impl Grippable for T {
fn grips(&self) -> Vec<GripDef> { grips(self) }
fn apply_grip(&mut self, ...) { apply_grip(self, ...) }
}
impl PropertyEditable for T { ... }
impl Transformable for T { ... }
— 23 lines of pure delegation around five same-named free functions.
Replace with `crate::impl_entity_basics!(T);` (a macro in
entities/traits.rs that expands to the three trait impls).
Applied where the file already follows the free-fn delegation
convention (Arc, Circle, Ellipse, Insert, Leader, Line, LwPolyline,
MultiLeader, Ole2Frame, Point, Spline, Viewport). Files that inlined
the trait method bodies directly (Ray, XLine, Shape, Solid, Tolerance,
MLine, Mesh, Solid3D/Region/Body, Table, RasterImage, Wipeout,
Underlay, Hatch, Polyline, Polyline2D, Polyline3D, Dimension) left
alone — they already skip the indirection. Text/MText/Attribute use
the with-text-style flavour and will move once that variant is needed
beyond the existing two manual impls.
A second macro `impl_entity_basics_with_text_styles!` is included for
the text-like flavour but no entity uses it yet.
Net: -204 lines.
Co-Authored-By: Claude Opus 4.7 <[email protected]>
491 lines
17 KiB
Rust
491 lines
17 KiB
Rust
use acadrust::entities::{LwPolyline, LwVertex};
|
||
use glam::Vec3;
|
||
use truck_modeling::{builder, Edge, Point3, Wire};
|
||
|
||
use crate::command::EntityTransform;
|
||
use crate::entities::common::{
|
||
diamond_grip, edit_prop as edit, parse_f64, ro_prop as ro, 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::TangentGeom;
|
||
|
||
const TAU: f64 = std::f64::consts::TAU;
|
||
|
||
/// Midpoint position on an arc segment defined by its bulge.
|
||
fn arc_midpoint(p0: [f64; 2], p1: [f64; 2], bulge: f64) -> [f64; 2] {
|
||
match crate::entities::common::BulgeArc::from_bulge(p0, p1, bulge) {
|
||
Some(arc) => arc.sample(0.5),
|
||
None => [(p0[0] + p1[0]) * 0.5, (p0[1] + p1[1]) * 0.5],
|
||
}
|
||
}
|
||
|
||
/// Compute the DXF bulge for an arc that passes through p0, mid_pt, and p1.
|
||
/// Returns None when the three points are collinear (straight segment).
|
||
fn bulge_from_midpoint(p0: [f64; 2], p1: [f64; 2], mid: [f64; 2]) -> Option<f64> {
|
||
// Circumcircle of (p0, mid, p1)
|
||
let ax = 2.0 * (mid[0] - p0[0]);
|
||
let ay = 2.0 * (mid[1] - p0[1]);
|
||
let bx = 2.0 * (p1[0] - p0[0]);
|
||
let by = 2.0 * (p1[1] - p0[1]);
|
||
let ca = mid[0] * mid[0] + mid[1] * mid[1] - p0[0] * p0[0] - p0[1] * p0[1];
|
||
let cb = p1[0] * p1[0] + p1[1] * p1[1] - p0[0] * p0[0] - p0[1] * p0[1];
|
||
let det = ax * by - ay * bx;
|
||
if det.abs() < 1e-12 {
|
||
return None; // collinear
|
||
}
|
||
let cx = (ca * by - cb * ay) / det;
|
||
let cy = (ax * cb - bx * ca) / det;
|
||
let a0 = (p0[1] - cy).atan2(p0[0] - cx);
|
||
let a1 = (p1[1] - cy).atan2(p1[0] - cx);
|
||
// Determine arc direction: cross product (p1-p0) × (mid-p0)
|
||
let cross = (p1[0] - p0[0]) * (mid[1] - p0[1]) - (p1[1] - p0[1]) * (mid[0] - p0[0]);
|
||
let (sa, mut ea) = if cross > 0.0 { (a0, a1) } else { (a1, a0) };
|
||
if ea < sa {
|
||
ea += TAU;
|
||
}
|
||
let span = ea - sa; // central angle in (0, TAU]
|
||
let bulge = (span / 4.0).tan();
|
||
Some(if cross >= 0.0 { bulge } else { -bulge })
|
||
}
|
||
|
||
/// Tessellate a thick polyline segment list into NaN-separated Lines geometry.
|
||
/// Shared by LwPolyline and Polyline2D thickness paths.
|
||
fn thick_segments(
|
||
seg_data: &[(f64, f64, f64, f64)], // (x0, y0, x1, y1) per seg — or use run of (x,y,bulge)
|
||
path_pts: &[[f64; 3]],
|
||
thickness: f64,
|
||
normal: (f64, f64, f64),
|
||
key_verts: Vec<[f64; 3]>,
|
||
tangents: Vec<TangentGeom>,
|
||
) -> TruckEntity {
|
||
let (nx, ny, nz) = normal;
|
||
let t = thickness;
|
||
let off = |p: [f64; 3]| -> [f64; 3] {
|
||
[p[0] + t * nx, p[1] + t * ny, p[2] + t * nz]
|
||
};
|
||
let mut pts: Vec<[f64; 3]> = Vec::with_capacity(path_pts.len() * 2 + seg_data.len() * 3 + 4);
|
||
// Bottom path
|
||
pts.extend_from_slice(path_pts);
|
||
pts.push([f64::NAN; 3]);
|
||
// Top path
|
||
for &p in path_pts {
|
||
pts.push(off(p));
|
||
}
|
||
// Walls at each vertex (seg_data.0/.1 = start x/y of each seg, last seg appends its end too)
|
||
if !seg_data.is_empty() {
|
||
pts.push([f64::NAN; 3]);
|
||
for (k, &(x0, y0, _x1, _y1)) in seg_data.iter().enumerate() {
|
||
let pb = key_verts[k];
|
||
let _ = (x0, y0); // key_verts already has correct WCS
|
||
pts.push(pb);
|
||
pts.push(off(pb));
|
||
if k + 1 < seg_data.len() {
|
||
pts.push([f64::NAN; 3]);
|
||
}
|
||
}
|
||
// Last wall at the final vertex
|
||
if let Some(&last) = key_verts.last() {
|
||
pts.push([f64::NAN; 3]);
|
||
pts.push(last);
|
||
pts.push(off(last));
|
||
}
|
||
}
|
||
TruckEntity {
|
||
object: TruckObject::Lines(pts),
|
||
snap_pts: vec![],
|
||
tangent_geoms: tangents,
|
||
key_vertices: key_verts,
|
||
fill_tris: vec![],
|
||
}
|
||
}
|
||
|
||
fn to_truck(pline: &LwPolyline) -> TruckEntity {
|
||
let verts = &pline.vertices;
|
||
if verts.is_empty() {
|
||
return TruckEntity {
|
||
object: TruckObject::Point(builder::vertex(Point3::new(0.0, 0.0, 0.0))),
|
||
snap_pts: vec![],
|
||
tangent_geoms: vec![],
|
||
key_vertices: vec![],
|
||
fill_tris: vec![],
|
||
};
|
||
}
|
||
|
||
let elev = pline.elevation;
|
||
let normal = (pline.normal.x, pline.normal.y, pline.normal.z);
|
||
let count = verts.len();
|
||
let seg_count = if pline.is_closed { count } else { count - 1 };
|
||
let mut edges: Vec<Edge> = Vec::new();
|
||
let mut tangents: Vec<TangentGeom> = Vec::new();
|
||
let mut key_verts: Vec<[f64; 3]> = Vec::new();
|
||
|
||
// Convert OCS (x, y, elevation) to WCS Point3.
|
||
let to_wcs = |x: f64, y: f64| -> (f64, f64, f64) {
|
||
crate::scene::transform::ocs_point_to_wcs((x, y, elev), normal)
|
||
};
|
||
let to_pt = |v: &LwVertex| -> Point3 {
|
||
let (wx, wy, wz) = to_wcs(v.location.x, v.location.y);
|
||
Point3::new(wx, wy, wz)
|
||
};
|
||
|
||
if pline.thickness.abs() > 1e-10 {
|
||
let mut path: Vec<[f64; 3]> = Vec::new();
|
||
let mut kv: Vec<[f64; 3]> = Vec::new();
|
||
let mut tgs: Vec<TangentGeom> = Vec::new();
|
||
let mut seg_data: Vec<(f64, f64, f64, f64)> = Vec::new();
|
||
// First vertex
|
||
let (w0x, w0y, w0z) = to_wcs(verts[0].location.x, verts[0].location.y);
|
||
path.push([w0x, w0y, w0z]);
|
||
kv.push([w0x, w0y, w0z]);
|
||
for i in 0..seg_count {
|
||
let va = &verts[i];
|
||
let vb = &verts[(i + 1) % count];
|
||
let (ox0, oy0) = (va.location.x, va.location.y);
|
||
let (ox1, oy1) = (vb.location.x, vb.location.y);
|
||
let bulge = va.bulge;
|
||
if bulge.abs() < 1e-9 {
|
||
let (wx, wy, wz) = to_wcs(ox1, oy1);
|
||
path.push([wx, wy, wz]);
|
||
let p1_pt = path[path.len() - 2];
|
||
let p2_pt = *path.last().unwrap();
|
||
tgs.push(TangentGeom::Line {
|
||
p1: [p1_pt[0] as f32, p1_pt[1] as f32, p1_pt[2] as f32],
|
||
p2: [p2_pt[0] as f32, p2_pt[1] as f32, p2_pt[2] as f32],
|
||
});
|
||
} else if let Some(arc) =
|
||
crate::entities::common::BulgeArc::from_bulge([ox0, oy0], [ox1, oy1], bulge)
|
||
{
|
||
let (wcx, wcy, wcz) = to_wcs(arc.center[0], arc.center[1]);
|
||
tgs.push(TangentGeom::Circle {
|
||
center: [wcx as f32, wcy as f32, wcz as f32],
|
||
radius: arc.radius as f32,
|
||
});
|
||
for j in 1..=16usize {
|
||
let s = arc.sample(j as f64 / 16.0);
|
||
let (wx, wy, wz) = to_wcs(s[0], s[1]);
|
||
path.push([wx, wy, wz]);
|
||
}
|
||
}
|
||
let (wbx, wby, wbz) = to_wcs(ox1, oy1);
|
||
kv.push([wbx, wby, wbz]);
|
||
seg_data.push((ox0, oy0, ox1, oy1));
|
||
}
|
||
return thick_segments(&seg_data, &path, pline.thickness, normal, kv, tgs);
|
||
}
|
||
|
||
// plinegen=false: NaN-separated segments so the linetype pattern restarts per vertex.
|
||
if !pline.plinegen {
|
||
let mut pts: Vec<[f64; 3]> = Vec::new();
|
||
let mut tgs: Vec<TangentGeom> = Vec::new();
|
||
let mut kv: Vec<[f64; 3]> = Vec::new();
|
||
let to_f32 = |p: [f64; 3]| -> [f32; 3] { [p[0] as f32, p[1] as f32, p[2] as f32] };
|
||
for i in 0..seg_count {
|
||
let va = &verts[i];
|
||
let vb = &verts[(i + 1) % count];
|
||
let (ox0, oy0) = (va.location.x, va.location.y);
|
||
let (ox1, oy1) = (vb.location.x, vb.location.y);
|
||
let bulge = va.bulge;
|
||
let (wx0, wy0, wz0) = to_wcs(ox0, oy0);
|
||
let p_start = [wx0, wy0, wz0];
|
||
pts.push(p_start);
|
||
if i == 0 {
|
||
kv.push(p_start);
|
||
}
|
||
if bulge.abs() < 1e-9 {
|
||
let (wx1, wy1, wz1) = to_wcs(ox1, oy1);
|
||
let p_end = [wx1, wy1, wz1];
|
||
pts.push(p_end);
|
||
kv.push(p_end);
|
||
tgs.push(TangentGeom::Line {
|
||
p1: to_f32(p_start),
|
||
p2: to_f32(p_end),
|
||
});
|
||
} else if let Some(arc) =
|
||
crate::entities::common::BulgeArc::from_bulge([ox0, oy0], [ox1, oy1], bulge)
|
||
{
|
||
for j in 1..=16usize {
|
||
let s = arc.sample(j as f64 / 16.0);
|
||
let (wx, wy, wz) = to_wcs(s[0], s[1]);
|
||
pts.push([wx, wy, wz]);
|
||
}
|
||
let (wx1, wy1, wz1) = to_wcs(ox1, oy1);
|
||
kv.push([wx1, wy1, wz1]);
|
||
let (wcx, wcy, wcz) = to_wcs(arc.center[0], arc.center[1]);
|
||
tgs.push(TangentGeom::Circle {
|
||
center: [wcx as f32, wcy as f32, wcz as f32],
|
||
radius: arc.radius as f32,
|
||
});
|
||
}
|
||
if i + 1 < seg_count {
|
||
pts.push([f64::NAN; 3]);
|
||
}
|
||
}
|
||
return TruckEntity {
|
||
object: TruckObject::SegmentedLines(pts),
|
||
snap_pts: vec![],
|
||
tangent_geoms: tgs,
|
||
key_vertices: kv,
|
||
fill_tris: vec![],
|
||
};
|
||
}
|
||
|
||
for i in 0..seg_count {
|
||
let v0 = &verts[i];
|
||
let v1 = &verts[(i + 1) % count];
|
||
let p0 = to_pt(v0);
|
||
let p1 = to_pt(v1);
|
||
let bulge = v0.bulge;
|
||
|
||
if bulge.abs() < 1e-9 {
|
||
let tv0 = builder::vertex(p0);
|
||
let tv1 = builder::vertex(p1);
|
||
edges.push(builder::line(&tv0, &tv1));
|
||
tangents.push(TangentGeom::Line {
|
||
p1: [p0.x as f32, p0.y as f32, p0.z as f32],
|
||
p2: [p1.x as f32, p1.y as f32, p1.z as f32],
|
||
});
|
||
} else if let Some(arc) = crate::entities::common::BulgeArc::from_bulge(
|
||
[v0.location.x, v0.location.y],
|
||
[v1.location.x, v1.location.y],
|
||
bulge as f64,
|
||
) {
|
||
let mid_s = arc.sample(0.5);
|
||
let (mid_wx, mid_wy, mid_wz) = to_wcs(mid_s[0], mid_s[1]);
|
||
let p_mid = Point3::new(mid_wx, mid_wy, mid_wz);
|
||
let tv0 = builder::vertex(p0);
|
||
let tv1 = builder::vertex(p1);
|
||
edges.push(builder::circle_arc(&tv0, &tv1, p_mid));
|
||
let (wcx, wcy, wcz) = to_wcs(arc.center[0], arc.center[1]);
|
||
tangents.push(TangentGeom::Circle {
|
||
center: [wcx as f32, wcy as f32, wcz as f32],
|
||
radius: arc.radius as f32,
|
||
});
|
||
}
|
||
|
||
if i == 0 {
|
||
key_verts.push([p0.x, p0.y, p0.z]);
|
||
}
|
||
key_verts.push([p1.x, p1.y, p1.z]);
|
||
}
|
||
|
||
TruckEntity {
|
||
object: TruckObject::Contour(edges.into_iter().collect::<Wire>()),
|
||
snap_pts: vec![],
|
||
tangent_geoms: tangents,
|
||
key_vertices: key_verts,
|
||
fill_tris: vec![],
|
||
}
|
||
}
|
||
|
||
fn grips(pline: &LwPolyline) -> Vec<GripDef> {
|
||
let elev = pline.elevation as f32;
|
||
let n = pline.vertices.len();
|
||
let seg_count = if pline.is_closed {
|
||
n
|
||
} else {
|
||
n.saturating_sub(1)
|
||
};
|
||
|
||
let mut out: Vec<GripDef> = pline
|
||
.vertices
|
||
.iter()
|
||
.enumerate()
|
||
.map(|(i, v)| square_grip(i, Vec3::new(v.location.x as f32, v.location.y as f32, elev)))
|
||
.collect();
|
||
|
||
// Diamond midpoint grip for each arc segment
|
||
for i in 0..seg_count {
|
||
let v0 = &pline.vertices[i];
|
||
if v0.bulge.abs() < 1e-9 {
|
||
continue;
|
||
}
|
||
let v1 = &pline.vertices[(i + 1) % n];
|
||
let mid = arc_midpoint(
|
||
[v0.location.x, v0.location.y],
|
||
[v1.location.x, v1.location.y],
|
||
v0.bulge,
|
||
);
|
||
out.push(diamond_grip(
|
||
n + i,
|
||
Vec3::new(mid[0] as f32, mid[1] as f32, elev),
|
||
));
|
||
}
|
||
out
|
||
}
|
||
|
||
fn properties(pline: &LwPolyline) -> PropSection {
|
||
PropSection {
|
||
title: "Geometry".into(),
|
||
props: vec![
|
||
ro("Vertices", "vertices", pline.vertices.len().to_string()),
|
||
ro(
|
||
"Closed",
|
||
"closed",
|
||
if pline.is_closed { "Yes" } else { "No" },
|
||
),
|
||
edit("Elevation", "elevation", pline.elevation),
|
||
],
|
||
}
|
||
}
|
||
|
||
fn apply_geom_prop(pline: &mut LwPolyline, field: &str, value: &str) {
|
||
let Some(v) = parse_f64(value) else {
|
||
return;
|
||
};
|
||
if field == "elevation" {
|
||
pline.elevation = v;
|
||
}
|
||
}
|
||
|
||
fn apply_grip(pline: &mut LwPolyline, grip_id: usize, apply: GripApply) {
|
||
let n = pline.vertices.len();
|
||
if grip_id < n {
|
||
// Vertex position grip
|
||
let v = &mut pline.vertices[grip_id];
|
||
match apply {
|
||
GripApply::Absolute(p) => {
|
||
v.location.x = p.x as f64;
|
||
v.location.y = p.y as f64;
|
||
}
|
||
GripApply::Translate(d) => {
|
||
v.location.x += d.x as f64;
|
||
v.location.y += d.y as f64;
|
||
}
|
||
}
|
||
} else {
|
||
// Arc midpoint grip for segment (grip_id - n)
|
||
let seg = grip_id - n;
|
||
let count = if pline.is_closed {
|
||
n
|
||
} else {
|
||
n.saturating_sub(1)
|
||
};
|
||
if seg >= count {
|
||
return;
|
||
}
|
||
let new_mid: [f64; 2] = match apply {
|
||
GripApply::Absolute(p) => [p.x as f64, p.y as f64],
|
||
GripApply::Translate(d) => {
|
||
let v0 = &pline.vertices[seg];
|
||
let v1 = &pline.vertices[(seg + 1) % n];
|
||
let old = arc_midpoint(
|
||
[v0.location.x, v0.location.y],
|
||
[v1.location.x, v1.location.y],
|
||
v0.bulge,
|
||
);
|
||
[old[0] + d.x as f64, old[1] + d.y as f64]
|
||
}
|
||
};
|
||
let p0 = [
|
||
pline.vertices[seg].location.x,
|
||
pline.vertices[seg].location.y,
|
||
];
|
||
let p1 = [
|
||
pline.vertices[(seg + 1) % n].location.x,
|
||
pline.vertices[(seg + 1) % n].location.y,
|
||
];
|
||
if let Some(new_bulge) = bulge_from_midpoint(p0, p1, new_mid) {
|
||
pline.vertices[seg].bulge = new_bulge.clamp(-1e6, 1e6);
|
||
}
|
||
}
|
||
}
|
||
|
||
fn apply_transform(pline: &mut LwPolyline, t: &EntityTransform) {
|
||
crate::scene::transform::apply_standard_entity_transform(pline, t, |entity, p1, p2| {
|
||
for v in &mut entity.vertices {
|
||
crate::scene::transform::reflect_xy_point(&mut v.location.x, &mut v.location.y, p1, p2);
|
||
}
|
||
});
|
||
}
|
||
|
||
impl TruckConvertible for LwPolyline {
|
||
fn to_truck(&self, _document: &acadrust::CadDocument) -> Option<TruckEntity> {
|
||
Some(to_truck(self))
|
||
}
|
||
}
|
||
|
||
crate::impl_entity_basics!(LwPolyline);
|
||
|
||
pub(crate) fn wide_fills(pl: &acadrust::entities::LwPolyline) -> Vec<Vec<[f32; 2]>> {
|
||
let hw_const = (pl.constant_width / 2.0) as f32;
|
||
let verts = &pl.vertices;
|
||
let n = verts.len();
|
||
if n < 2 {
|
||
return vec![];
|
||
}
|
||
let seg_count = if pl.is_closed { n } else { n - 1 };
|
||
let mut out = Vec::new();
|
||
for i in 0..seg_count {
|
||
let v0 = &verts[i];
|
||
let v1 = &verts[(i + 1) % n];
|
||
let hw0 = if v0.start_width > 1e-9 {
|
||
v0.start_width as f32 / 2.0
|
||
} else {
|
||
hw_const
|
||
};
|
||
let hw1 = if v0.end_width > 1e-9 {
|
||
v0.end_width as f32 / 2.0
|
||
} else {
|
||
hw_const
|
||
};
|
||
if hw0 < 1e-6 && hw1 < 1e-6 {
|
||
continue;
|
||
}
|
||
let p0 = [v0.location.x as f32, v0.location.y as f32];
|
||
let p1 = [v1.location.x as f32, v1.location.y as f32];
|
||
if let Some(poly) = crate::entities::common::polyline_segment_fill(p0, p1, hw0, hw1, v0.bulge as f32) {
|
||
out.push(poly);
|
||
}
|
||
}
|
||
out
|
||
}
|
||
|
||
impl crate::entities::traits::MassPropsCalc for acadrust::entities::LwPolyline {
|
||
fn mass_props(&self) -> crate::entities::traits::MassProps {
|
||
let p = self;
|
||
let n = p.vertices.len();
|
||
if n < 2 {
|
||
return crate::entities::traits::MassProps {
|
||
area: 0.0,
|
||
perimeter: 0.0,
|
||
cx: 0.0,
|
||
cy: 0.0,
|
||
};
|
||
}
|
||
// Shoelace area + perimeter
|
||
let mut area_sum = 0.0f64;
|
||
let mut perimeter = 0.0f64;
|
||
let mut cx_sum = 0.0f64;
|
||
let mut cy_sum = 0.0f64;
|
||
let n_segs = if p.is_closed { n } else { n - 1 };
|
||
for idx in 0..n_segs {
|
||
let v0 = &p.vertices[idx];
|
||
let v1 = &p.vertices[(idx + 1) % n];
|
||
let x0 = v0.location.x;
|
||
let y0 = v0.location.y;
|
||
let x1 = v1.location.x;
|
||
let y1 = v1.location.y;
|
||
area_sum += x0 * y1 - x1 * y0;
|
||
perimeter += ((x1 - x0).powi(2) + (y1 - y0).powi(2)).sqrt();
|
||
cx_sum += (x0 + x1) * (x0 * y1 - x1 * y0);
|
||
cy_sum += (y0 + y1) * (x0 * y1 - x1 * y0);
|
||
}
|
||
let area = (area_sum / 2.0).abs();
|
||
let (cx, cy) = if area > 1e-12 {
|
||
(cx_sum / (6.0 * area), cy_sum / (6.0 * area))
|
||
} else {
|
||
let sx: f64 = p.vertices.iter().map(|v| v.location.x).sum::<f64>() / n as f64;
|
||
let sy: f64 = p.vertices.iter().map(|v| v.location.y).sum::<f64>() / n as f64;
|
||
(sx, sy)
|
||
};
|
||
crate::entities::traits::MassProps {
|
||
area,
|
||
perimeter,
|
||
cx,
|
||
cy,
|
||
}
|
||
}
|
||
}
|