The last four truck crates are gone from the manifest. What they were doing falls into three parts, and each now has one answer instead of two. NURBS evaluation. truck was carrying B-spline curves and surfaces for the SPLINE entity, hatch boundaries, BLEND's endpoint frames, the spline preview and ACIS spline-surface faces. The kernel now has both, over one de Boor written across however many coordinates a control point holds — so a plane curve and a space curve cannot drift apart, and a surface is the same algorithm applied twice. The rational and the polynomial cases stop being separate types: weights absent means polynomial. The entity conversion. Every LINE, ARC, ELLIPSE, SPLINE and polyline was built into truck topology purely so it could be sampled back into points. They are sampled through `entities::curve` now, which is where each one's geometry is already defined once and what EXTRUDE and REVOLVE read — so a circle drawn on screen and a circle handed to the Model tab come from the same definition. That retires four of TruckObject's variants and the module is renamed for what it does. SWEEP and LOFT. Both only ever produced a mesh, so both are built from point lists: a band of quads per span, and a lid where a profile closes. Lofting profiles of different densities resamples them by distance rather than by index, so a circle lofted to a square no longer twists. Two things worth noting for anyone reading the old comments. The tolerance globals that lived in the tessellation module were never about truck at all — they are the per-frame chord height, and they move to `curve_tol`. And the rule that a profile handed over as `Lines` silently broke EXTRUDE and REVOLVE no longer holds: those read the curve directly and never look at this channel. The two `automation` test failures are unchanged from before this and are not caused by it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
197 lines
7 KiB
Rust
197 lines
7 KiB
Rust
use acadrust::entities::Circle;
|
||
use crate::t;
|
||
|
||
use crate::command::EntityTransform;
|
||
use crate::entities::common::{
|
||
center_grip, edit_prop as edit, parse_f64, ro_prop as ro, square_grip,
|
||
};
|
||
use crate::entities::traits::RenderConvertible;
|
||
use crate::scene::convert::acad_to_render::{extrusion_wall_tris, RenderEntity, RenderObject};
|
||
use crate::scene::model::object::{GripApply, GripDef, PropSection};
|
||
use crate::scene::model::wire_model::TangentGeom;
|
||
|
||
fn to_render(circle: &Circle) -> RenderEntity {
|
||
let cx = circle.center.x;
|
||
let cy = circle.center.y;
|
||
let cz = circle.center.z;
|
||
let r = circle.radius;
|
||
let normal = (circle.normal.x, circle.normal.y, circle.normal.z);
|
||
|
||
let (ax, ay) = crate::scene::view::transform::ocs_axes(normal);
|
||
let (cwx, cwy, cwz) = crate::scene::view::transform::ocs_point_to_wcs((cx, cy, cz), normal);
|
||
|
||
let rf = r as f32;
|
||
// Centre and quadrants come from the entity's own curve, so the same
|
||
// definition answers here, in the tessellation and in a trim.
|
||
let curve = crate::entities::curve::circle_curve(circle);
|
||
let snap_pts = crate::entities::curve::snap_from(&curve).snap_pts;
|
||
let tangent = TangentGeom::Circle {
|
||
center: [cwx as f32, cwy as f32, cwz as f32],
|
||
radius: rf,
|
||
};
|
||
|
||
if circle.thickness.abs() > 1e-10 {
|
||
let t = circle.thickness;
|
||
let (nx, ny, nz) = normal;
|
||
let n = 64usize;
|
||
let tau = std::f64::consts::TAU;
|
||
let circ_pt = |a: f64| -> (f64, f64, f64) {
|
||
let (c, s) = (a.cos(), a.sin());
|
||
(
|
||
cwx + r * (c * ax.0 + s * ay.0),
|
||
cwy + r * (c * ax.1 + s * ay.1),
|
||
cwz + r * (c * ax.2 + s * ay.2),
|
||
)
|
||
};
|
||
let base: Vec<[f64; 3]> = (0..=n)
|
||
.map(|i| {
|
||
let (x, y, z) = circ_pt(i as f64 * tau / n as f64);
|
||
[x, y, z]
|
||
})
|
||
.collect();
|
||
let mut pts: Vec<[f64; 3]> = Vec::with_capacity((n + 1) * 2 + 4 * 3);
|
||
pts.extend_from_slice(&base);
|
||
pts.push([f64::NAN; 3]);
|
||
for &[x, y, z] in &base {
|
||
pts.push([x + t * nx, y + t * ny, z + t * nz]);
|
||
}
|
||
pts.push([f64::NAN; 3]);
|
||
for i in 0..4usize {
|
||
let (x, y, z) = circ_pt(i as f64 * std::f64::consts::FRAC_PI_2);
|
||
pts.push([x, y, z]);
|
||
pts.push([x + t * nx, y + t * ny, z + t * nz]);
|
||
if i < 3 {
|
||
pts.push([f64::NAN; 3]);
|
||
}
|
||
}
|
||
return RenderEntity {
|
||
pick_tris: extrusion_wall_tris(&base, [t * nx, t * ny, t * nz]),
|
||
object: RenderObject::Lines(pts),
|
||
snap_pts,
|
||
tangent_geoms: vec![tangent],
|
||
key_vertices: vec![],
|
||
fill_tris: vec![],
|
||
};
|
||
}
|
||
|
||
// Sampled from the entity's own curve rather than as a
|
||
// `circle_arc` (arc-through-three-points). At large WCS coordinates
|
||
// (e.g. −1.2M UTM) the three-point fit cancels catastrophically — the
|
||
// circle comes back with a ~3% radius wobble and uneven segment lengths,
|
||
// which then throws off a dashed linetype's dash spacing. Direct
|
||
// evaluation only adds a small ±r term to the centre, so it stays
|
||
// precise; the `Lines` path RTE-splits the absolute-f64 points into the
|
||
// double-single the shader reconstructs.
|
||
let pts = crate::entities::curve::curve_points(&curve);
|
||
|
||
RenderEntity {
|
||
pick_tris: Vec::new(),
|
||
object: RenderObject::Lines(pts),
|
||
snap_pts,
|
||
tangent_geoms: vec![tangent],
|
||
key_vertices: vec![],
|
||
fill_tris: vec![],
|
||
}
|
||
}
|
||
|
||
fn grips(circle: &Circle) -> Vec<GripDef> {
|
||
let ctr = glam::DVec3::new(circle.center.x, circle.center.y, circle.center.z);
|
||
let r = circle.radius;
|
||
vec![
|
||
center_grip(0, ctr),
|
||
square_grip(1, ctr + glam::DVec3::new(r, 0.0, 0.0)),
|
||
square_grip(2, ctr + glam::DVec3::new(0.0, r, 0.0)),
|
||
square_grip(3, ctr - glam::DVec3::new(r, 0.0, 0.0)),
|
||
square_grip(4, ctr - glam::DVec3::new(0.0, r, 0.0)),
|
||
]
|
||
}
|
||
|
||
fn properties(circle: &Circle) -> Vec<PropSection> {
|
||
use std::f64::consts::PI;
|
||
let r = circle.radius;
|
||
vec![PropSection {
|
||
title: t!("Geometry").into_owned(),
|
||
props: vec![
|
||
edit(t!("Center X").as_ref(), "center_x", circle.center.x),
|
||
edit(t!("Center Y").as_ref(), "center_y", circle.center.y),
|
||
edit(t!("Center Z").as_ref(), "center_z", circle.center.z),
|
||
edit(t!("Radius").as_ref(), "radius", r),
|
||
edit(t!("Diameter").as_ref(), "diameter", r * 2.0),
|
||
edit(t!("Circumference").as_ref(), "circumference", 2.0 * PI * r),
|
||
edit(t!("Area").as_ref(), "area", PI * r * r),
|
||
ro(t!("Normal X").as_ref(), "normal_x", format!("{:.4}", circle.normal.x)),
|
||
ro(t!("Normal Y").as_ref(), "normal_y", format!("{:.4}", circle.normal.y)),
|
||
ro(t!("Normal Z").as_ref(), "normal_z", format!("{:.4}", circle.normal.z)),
|
||
],
|
||
}]
|
||
}
|
||
|
||
fn apply_geom_prop(circle: &mut Circle, field: &str, value: &str) {
|
||
use std::f64::consts::PI;
|
||
let Some(v) = parse_f64(value) else {
|
||
return;
|
||
};
|
||
match field {
|
||
"center_x" => circle.center.x = v,
|
||
"center_y" => circle.center.y = v,
|
||
"center_z" => circle.center.z = v,
|
||
"radius" if v > 0.0 => circle.radius = v,
|
||
"diameter" if v > 0.0 => circle.radius = v / 2.0,
|
||
"circumference" if v > 0.0 => circle.radius = v / (2.0 * PI),
|
||
"area" if v > 0.0 => circle.radius = (v / PI).sqrt(),
|
||
_ => {}
|
||
}
|
||
}
|
||
|
||
fn apply_grip(circle: &mut Circle, grip_id: usize, apply: GripApply) {
|
||
match (grip_id, apply) {
|
||
(0, GripApply::Absolute(p)) => {
|
||
circle.center.x = p.x as f64;
|
||
circle.center.y = p.y as f64;
|
||
circle.center.z = p.z as f64;
|
||
}
|
||
(0, GripApply::Translate(d)) => {
|
||
circle.center.x += d.x as f64;
|
||
circle.center.y += d.y as f64;
|
||
circle.center.z += d.z as f64;
|
||
}
|
||
(1..=4, GripApply::Absolute(p)) => {
|
||
let dx = p.x - circle.center.x;
|
||
let dy = p.y - circle.center.y;
|
||
circle.radius = (dx * dx + dy * dy).sqrt();
|
||
}
|
||
_ => {}
|
||
}
|
||
}
|
||
|
||
fn apply_transform(circle: &mut Circle, t: &EntityTransform) {
|
||
crate::scene::view::transform::apply_standard_entity_transform(circle, t, |entity, p1, p2| {
|
||
crate::scene::view::transform::reflect_xy_point(
|
||
&mut entity.center.x,
|
||
&mut entity.center.y,
|
||
p1,
|
||
p2,
|
||
);
|
||
});
|
||
}
|
||
|
||
impl RenderConvertible for Circle {
|
||
fn to_render(&self, _document: &acadrust::CadDocument) -> Option<RenderEntity> {
|
||
Some(to_render(self))
|
||
}
|
||
}
|
||
|
||
crate::impl_entity_basics!(Circle);
|
||
|
||
impl crate::entities::traits::MassPropsCalc for Circle {
|
||
fn mass_props(&self) -> crate::entities::traits::MassProps {
|
||
use std::f64::consts::{PI, TAU};
|
||
let r = self.radius;
|
||
crate::entities::traits::MassProps {
|
||
area: PI * r * r,
|
||
perimeter: TAU * r,
|
||
cx: self.center.x,
|
||
cy: self.center.y,
|
||
}
|
||
}
|
||
}
|