AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(geometry): honor polyline OCS in commands

Browse source 
Route editing and derived geometry through kernel world-space curves.\n\nRefs #797\nRefs #798\nRefs #799
This commit is contained in:
Hakan Seven 2026-08-18 22:09:48 +03:00
commit 7c818d15e9
12 changed files with 127 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/app/command_driver.rs
View file

@ -2677,13 +2677,21 @@ impl OpenCADStudio {
}
}
acadrust::EntityType::LwPolyline(p) => {
for v in &mut p.vertices {
let Some(mut world) =
crate::entities::curve::lwpolyline_world_xy(p)
else {
continue;
};
for v in &mut world.vertices {
if in_win(v.location.x, v.location.y) {
v.location.x += dx;
v.location.y += dy;
stretched = true;
}
}
if stretched {
*p = world;
}
}
acadrust::EntityType::Polyline2D(p) => {
for v in &mut p.vertices {

40
src/app/commands/draw.rs
View file

@ -857,33 +857,21 @@ impl OpenCADStudio {
use acadrust::types::Vector3;
let mut loops: Vec<Vec<Vector3>> = Vec::new();
for (_, e) in self.tabs[i].scene.selected_entities().iter() {
match e {
let supported = matches!(
e,
acadrust::EntityType::LwPolyline(pl)
if pl.is_closed && pl.vertices.len() >= 3 =>
{
loops.push(
pl.vertices
.iter()
.map(|v| Vector3::new(v.location.x, v.location.y, 0.0))
.collect(),
);
}
acadrust::EntityType::Circle(c) => {
let n = 64;
loops.push(
(0..n)
.map(|k| {
let a = std::f64::consts::TAU * k as f64 / n as f64;
Vector3::new(
c.center.x + c.radius * a.cos(),
c.center.y + c.radius * a.sin(),
c.center.z,
)
})
.collect(),
);
}
_ => {}
if pl.is_closed && pl.vertices.len() >= 3
) || matches!(e, acadrust::EntityType::Circle(_));
if supported {
let Some(curve) = crate::entities::curve::entity_curve(e) else {
continue;
};
loops.push(
crate::entities::curve::curve_points(&curve)
.into_iter()
.map(|point| Vector3::new(point[0], point[1], point[2]))
.collect(),
);
}
}
if loops.is_empty() {

53
src/app/model_ops.rs
View file

@ -258,31 +258,22 @@ impl super::OpenCADStudio {
/// reusing the box primitive + the boolean union path.
pub(super) fn solid_polysolid(&mut self, width: f64, height: f64) -> Task<Message> {
let i = self.active_tab;
let found: Option<(Handle, Vec<[f64; 2]>, bool)> = self.tabs[i]
let found: Option<(Handle, Vec<[f64; 3]>)> = self.tabs[i]
.scene
.selected_entities()
.iter()
.filter(|(h, _)| !self.tabs[i].scene.is_layer_locked(*h))
.find_map(|(h, e)| match e {
EntityType::LwPolyline(pl) => Some((
*h,
pl.vertices
.iter()
.map(|v| [v.location.x, v.location.y])
.collect(),
pl.is_closed,
)),
EntityType::LwPolyline(_) => crate::entities::curve::entity_curve(e)
.map(|curve| (*h, crate::entities::curve::curve_points(&curve))),
_ => None,
});
let Some((handle, pts, closed)) = found else {
let Some((handle, pts)) = found else {
self.command_line
.push_error(crate::t!("POLYSOLID: select a polyline first.").as_ref());
return Task::none();
};
let mut segs: Vec<([f64; 2], [f64; 2])> = pts.windows(2).map(|w| (w[0], w[1])).collect();
if closed && pts.len() > 2 {
segs.push((pts[pts.len() - 1], pts[0]));
}
let segs: Vec<([f64; 3], [f64; 3])> = pts.windows(2).map(|w| (w[0], w[1])).collect();
let mut acc: Option<Body> = None;
let mut used = 0usize;
for (a, b) in &segs {
@ -302,7 +293,7 @@ impl super::OpenCADStudio {
[cos, sin, 0.0],
[-sin, cos, 0.0],
[0.0, 0.0, 1.0],
[a[0], a[1], 0.0],
[a[0], a[1], a[2]],
)
})
else {
@ -570,15 +561,22 @@ impl super::OpenCADStudio {
.selected_entities()
.iter()
.filter(|(h, _)| !self.tabs[i].scene.is_layer_locked(*h))
.find_map(|(h, e)| match e {
EntityType::LwPolyline(pl) => Some((
.find_map(|(h, e)| {
let EntityType::LwPolyline(_) = e else {
return None;
};
let curve = crate::entities::curve::entity_curve(e)?;
let cadkernel::geom2d::Curve::Polyline(polyline) = &curve.curve else {
return None;
};
Some((
*h,
pl.vertices
polyline
.vertices
.iter()
.map(|v| [v.location.x, v.location.y, 0.0])
.map(|vertex| curve.plane.point_at(vertex.position))
.collect(),
)),
_ => None,
))
});
let Some((handle, fit)) = found else {
self.command_line
@ -595,7 +593,7 @@ impl super::OpenCADStudio {
let p = |k: usize| glam::DVec3::new(fit[k][0], fit[k][1], fit[k][2]);
// Catmull-Rom → cubic Bézier control points: [P0, b1,b2,P1, b1,b2,P2, …].
let mut ctrl: Vec<Vector3> = Vec::with_capacity(3 * m + 1);
ctrl.push(Vector3::new(fit[0][0], fit[0][1], 0.0));
ctrl.push(Vector3::new(fit[0][0], fit[0][1], fit[0][2]));
for seg in 0..m {
let p0 = p(seg);
let p1 = p(seg + 1);
@ -603,9 +601,9 @@ impl super::OpenCADStudio {
let next = if seg + 2 <= m { p(seg + 2) } else { p1 };
let b1 = p0 + (p1 - prev) / 6.0;
let b2 = p1 - (next - p0) / 6.0;
ctrl.push(Vector3::new(b1.x, b1.y, 0.0));
ctrl.push(Vector3::new(b2.x, b2.y, 0.0));
ctrl.push(Vector3::new(p1.x, p1.y, 0.0));
ctrl.push(Vector3::new(b1.x, b1.y, b1.z));
ctrl.push(Vector3::new(b2.x, b2.y, b2.z));
ctrl.push(Vector3::new(p1.x, p1.y, p1.z));
}
// Clamped piecewise-Bézier knots (degree 3): len == ctrl.len()+degree+1.
let mut knots: Vec<f64> = vec![0.0; 4];
@ -617,7 +615,10 @@ impl super::OpenCADStudio {
spl.degree = 3;
spl.control_points = ctrl;
spl.knots = knots;
spl.fit_points = fit.iter().map(|q| Vector3::new(q[0], q[1], 0.0)).collect();
spl.fit_points = fit
.iter()
.map(|q| Vector3::new(q[0], q[1], q[2]))
.collect();
// flags.rational defaults to false (non-rational) — exactly what we want.
self.push_undo_snapshot(i, "SPLINEFIT");
self.tabs[i].scene.erase_entities(&[handle]);