SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Shell refuses a wall thicker than a rim instead of returning a corrupt body: the topology-preserving face offset now checks every planar face's moved loops, and a loop that turns inside out or two loops that cross (a rim or ledge narrower than the move, e.g. a bowl opening sliding past the slab's outer edge) is an error naming the spot. Before, the self-crossing cavity went into the boolean and the shelled body came back with roughly twice its volume and its centre of mass outside the body, so every later cut failed its volume check
CypherNaugh_0x9508ee749ca7
diff --git a/crates/kernel/src/offset.rs b/crates/kernel/src/offset.rsindex 57ca3d3e6c..14988ed8f9 100644--- a/crates/kernel/src/offset.rs+++ b/crates/kernel/src/offset.rs@@ -423,6 +423,70 @@ fn span_step(ns: &[Vec3], s: &[f64]) -> Option<Vec3> {}/// A line or circular arc through an edge (by samples): `None` for other curves.+/// Maximum straight edges per face checked pairwise for crossings.+const MAX_CROSSING_EDGES: usize = 2000;++/// Where the moved straight edges of a planar face cross each other (or a loop of straight+/// edges turns round), if they do. Faces next to a collapsed round are left to the other checks.+fn crossed_loops(+ faces: &[mt::Face],+ old: &[Surf],+ newpos: &HashMap<mt::VertexID, Vec3>,+ edge_collapsed: &dyn Fn(&mt::Edge) -> bool,+ size: f64,+) -> Option<Vec3> {+ let eps = size * 1e-9;+ for (f, sf) in faces.iter().zip(old) {+ let Surf::Plane { n, .. } = *sf else { continue };+ if f.edge_iter().any(|e| edge_collapsed(&e)) {+ continue;+ }+ let (u, w) = (n.any_perp(), n.cross(n.any_perp()));+ let flat = |p: Vec3| (p.dot(u), p.dot(w));+ // Straight edges as (vertex ids, old ends, new ends) in the plane.+ let mut segs: Vec<([mt::VertexID; 2], [(f64, f64); 2])> = Vec::new();+ for wire in f.absolute_boundaries() {+ let (mut area_old, mut area_new, mut straight) = (0.0, 0.0, true);+ for e in wire.edge_iter() {+ let (v0, v1) = (e.front(), e.back());+ let (Some(q0), Some(q1)) = (newpos.get(&v0.id()), newpos.get(&v1.id())) else { return None };+ let (o0, o1, n0, n1) = (flat(from_p3(v0.point())), flat(from_p3(v1.point())), flat(*q0), flat(*q1));+ area_old += o0.0 * o1.1 - o1.0 * o0.1;+ area_new += n0.0 * n1.1 - n1.0 * n0.1;+ if arc_mid(e, size * 1e-6) == Some(None) {+ segs.push(([v0.id(), v1.id()], [n0, n1]));+ } else {+ straight = false;+ }+ }+ if straight && area_old.abs() > eps && area_old * area_new <= 0.0 {+ return wire.vertex_iter().next().and_then(|v| newpos.get(&v.id()).copied());+ }+ }+ if segs.len() > MAX_CROSSING_EDGES {+ continue;+ }+ let side = |a: (f64, f64), c: (f64, f64), p: (f64, f64)| (c.0 - a.0) * (p.1 - a.1) - (c.1 - a.1) * (p.0 - a.0);+ for (i, (ia, [a0, a1])) in segs.iter().enumerate() {+ for (ib, [b0, b1]) in segs.iter().skip(i + 1) {+ if ia.iter().any(|v| ib.contains(v)) {+ continue;+ }+ let (s0, s1) = (side(*a0, *a1, *b0), side(*a0, *a1, *b1));+ let (t0, t1) = (side(*b0, *b1, *a0), side(*b0, *b1, *a1));+ let tol = eps * size;+ if ((s0 > tol && s1 < -tol) || (s0 < -tol && s1 > tol)) && ((t0 > tol && t1 < -tol) || (t0 < -tol && t1 > tol)) {+ let k = t0 / (t0 - t1);+ let (x, y) = (a0.0 + (a1.0 - a0.0) * k, a0.1 + (a1.1 - a0.1) * k);+ let d = n.dot(newpos.get(&ia[0]).copied().unwrap_or_default());+ return Some(u * x + w * y + n * d);+ }+ }+ }+ }+ None+}+pub(crate) fn arc_mid(e: &mt::Edge, tol: f64) -> Option<Option<Vec3>> {use mt::{BoundedCurve, ParametricCurve};let c = e.curve();@@ -626,6 +690,15 @@ pub(crate) fn offset_body(b: &Body, shift: impl Fn(usize, Vec3) -> f64) -> Resulreturn Err(fail("not supported yet: the move is larger than a wall or step is thick (faces would cross)"));}}+ // A plane's loops crossing after the move: a rim or ledge narrower than the move (the hole+ // in a top face sliding past its outer edge) turns part of the face inside out, though no+ // edge turns round.+ if let Some(at) = crossed_loops(&faces, &old, &newpos, &edge_collapsed, size) {+ return Err(fail(&format!(+ "not supported yet: the move is larger than a rim or ledge near [{:.1}, {:.1}, {:.1}] is wide (a face would turn inside out)",+ at.x, at.y, at.z+ )));+ }guard("offset", || {// Vertices of collapsed faces that land together become one.let on_collapsed: std::collections::HashSet<mt::VertexID> = facesdiff --git a/crates/kernel/src/tests.rs b/crates/kernel/src/tests.rsindex 10e7dd7e5e..93afea8c82 100644--- a/crates/kernel/src/tests.rs+++ b/crates/kernel/src/tests.rs@@ -782,6 +782,27 @@ fn shell_non_convex() {assert!(rel(v, outer - cavity) < 1e-6, "{v} vs {}", outer - cavity);}+/// A basin: a slab with a tapered pocket and a 4 mm front rim, shelled from below. A wall+/// thicker than the rim (with the pocket's slope) would turn the top face inside out: refused,+/// not a body with wrong mass properties.+#[test]+fn shell_thicker_than_a_rim_is_refused() {+ let slab = box_solid(Vec3::ZERO, Vec3::new(100.0, 60.0, 30.0)).unwrap();+ let rect = |x0: f64, y0: f64, x1: f64, y1: f64| Loop2::polygon(&[Vec2::new(x0, y0), Vec2::new(x1, y0), Vec2::new(x1, y1), Vec2::new(x0, y1)]);+ let at = |z: f64| Plane::new(Vec3::new(0.0, 0.0, z), Vec3::X, Vec3::Y).unwrap();+ let pocket = loft(&[(at(30.0), rect(20.0, 4.0, 80.0, 50.0)), (at(10.0), rect(30.0, 20.0, 70.0, 40.0))]).unwrap();+ let basin = boolean(&slab, &pocket, BoolOp::Cut).unwrap().unwrap();+ let open = [Vec3::new(50.0, 30.0, 0.0)];+ let e = shell(&basin, &open, 6.0).unwrap_err().to_string();+ assert!(e.contains("rim or ledge"), "{e}");+ let (whole, thin) = (measure(&basin).unwrap(), measure(&shell(&basin, &open, 1.0).unwrap()).unwrap());+ assert!(thin.volume > 0.0 && thin.volume < whole.volume, "{} vs {}", thin.volume, whole.volume);+ let (lo, hi) = (thin.bbox.min, thin.bbox.max);+ let c = thin.centroid;+ assert!(c.x > lo.x && c.x < hi.x && c.y > lo.y && c.y < hi.y && c.z > lo.z && c.z < hi.z, "{c:?}");+ assert!((c.x - 50.0).abs() < 1e-3, "{c:?}");+}+#[test]#[ignore]fn debug_drilled_hole() {