SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Wave 291/509: Tessellation: a loop corner on a side collapsed within its vertex's tolerance is a pole; a face no method plans is left out, named (and 3 more)
jyviko53f4d607e2d9
diff --git a/crates/geom/src/brep/eval.rs b/crates/geom/src/brep/eval.rsindex e4cf59bdd2..9b34a8d1fd 100644--- a/crates/geom/src/brep/eval.rs+++ b/crates/geom/src/brep/eval.rs@@ -294,20 +294,8 @@ impl SurfaceEval {/// period (or its whole range) moves the point no more than `reach` (a boundary point that/// lies at a pole to within a tolerance, where its periodic parameter is free).pub fn pole_within(&self, uv: [f64; 2], reach: f64) -> [bool; 2] {- let mut out = self.pole(uv);- let Some((_, su, sv)) = self.derivs(uv[0], uv[1]) else { return out };- let dom = self.domain();- for (d, speed) in [su.len(), sv.len()].into_iter().enumerate() {- let span = match (dom.period.get(d).copied().flatten(), dom.range.get(d).copied().flatten()) {- (Some(period), _) => 0.5 * period,- (None, Some((a, b))) => (b - a).abs(),- (None, None) => continue,- };- if let Some(flag) = out.get_mut(d) {- *flag |= speed * span <= reach;- }- }- out+ let Some((_, su, sv)) = self.derivs(uv[0], uv[1]) else { return [false; 2] };+ uv::collapsed([su.len(), sv.len()], &self.domain(), reach)}}diff --git a/crates/geom/src/tess/uv.rs b/crates/geom/src/tess/uv.rsindex 0ec7e28bb1..65040c9425 100644--- a/crates/geom/src/tess/uv.rs+++ b/crates/geom/src/tess/uv.rs@@ -320,6 +320,32 @@ pub fn degenerate(s: &EvalSurface, uv: [f64; 2], d: usize) -> bool {this.len() <= 1e-9 * other.len().max(1e-12)}+/// [`degenerate`], or within `reach` mm of a pole (see [`collapsed`]): a boundary point on a+/// patch side collapsed to within a tolerance, not to a point, where its parameter along `d` is+/// as free as at a pole.+pub fn degenerate_within(s: &EvalSurface, dom: &Domain, uv: [f64; 2], d: usize, reach: f64) -> bool {+ let Some((_, su, sv)) = s.derivs(uv[0], uv[1]) else { return false };+ let speed = [su.len(), sv.len()];+ collapsed(speed, dom, reach).get(d).copied().unwrap_or(false)+}++/// Along each direction, whether a point whose parameter speeds (mm per unit) are `speed` is a+/// pole, or within `reach` mm of one: moving along the direction there not at all (to 1e-9 of+/// the other's speed), or across half its period (or its whole range) by no more than `reach`.+pub fn collapsed(speed: [f64; 2], dom: &Domain, reach: f64) -> [bool; 2] {+ let [a, b] = speed;+ let mut out = [a <= 1e-9 * b.max(1e-12), b <= 1e-9 * a.max(1e-12)];+ for (d, flag) in out.iter_mut().enumerate() {+ let span = match (dom.period[d], dom.range[d]) {+ (Some(period), _) => 0.5 * period,+ (None, Some((lo, hi))) => (hi - lo).abs(),+ (None, None) => continue,+ };+ *flag |= speed[d] * span <= reach;+ }+ out+}+#[cfg(test)]mod tests {use super::*;diff --git a/crates/kernel/src/body.rs b/crates/kernel/src/body.rsindex 97b46c9412..6bb9fcccd6 100644--- a/crates/kernel/src/body.rs+++ b/crates/kernel/src/body.rs@@ -878,7 +878,8 @@ impl Body {}/// The body's volume from a mesh at `tol`, measured once per (record, tolerance): clones of- /// a body share the measurement. `None` when the body cannot be meshed.+ /// a body share the measurement. `None` when the body cannot be meshed, or a face of it was+ /// left out of the mesh (an open mesh has no volume).pub fn volume_at(&self, tol: f64) -> Option<f64> {let key = if tol.is_finite() && tol > 0.0 { tol } else { 0.05 };let key = key.to_bits();@@ -889,7 +890,11 @@ impl Body {{return Some(volume);}- let volume = self.mesh(&MeshTolerance::chord(f64::from_bits(key))).ok()?.measure().volume;+ let mesh = self.mesh(&MeshTolerance::chord(f64::from_bits(key))).ok()?;+ if self.faces_without_triangles(&mesh) > 0 {+ return None;+ }+ let volume = mesh.measure().volume;if let Some(cell) = &self.volume&& let Ok(mut slot) = cell.lock(){@@ -913,7 +918,8 @@ impl Body {/// joins, protected creases). Triangles carry their face index and the edges their polylines,/// in the record's order; neighbouring faces share every boundary node, so the mesh is/// watertight wherever the B-rep is. A mesh body gives its own triangles. A face the planner- /// cannot mesh is an error that names it and why.+ /// cannot mesh is left out (logged with why; [`Body::unmeshed_faces`] counts it) and the rest+ /// meshed; a body none of whose faces mesh is an error that names the first and why.pub fn mesh(&self, t: &MeshTolerance) -> Result<Mesh> {crate::profile::timed(crate::profile::Kind::Tessellate, "mesh", || self.mesh_untimed(t))}@@ -956,6 +962,10 @@ impl Body {for f in &stats.lenient {log::warn!("display plan: face {} filled leniently in (u, v), a defect in its pcurves or seams: {}", f.face, f.reason);}+ // A face no method plans is left out (no triangles; `unmeshed_faces` counts it) and named.+ for f in &stats.unmeshed {+ log::warn!("display plan: face {} left out of the mesh: {}", f.face, f.reason);+ }Ok(plan)}@@ -1047,6 +1057,14 @@ impl Body {return 0;}let Ok(m) = self.mesh(&MeshTolerance::chord(coarse_tolerance(self.size()))) else { return self.face_count() };+ self.faces_without_triangles(&m)+ }++ /// Faces of the body with no triangles in its mesh `m` (left out by the mesher).+ fn faces_without_triangles(&self, m: &Mesh) -> usize {+ if self.is_mesh() {+ return 0;+ }let mut has = vec![false; self.face_count()];for f in &m.tri_face {if let Some(h) = has.get_mut(*f as usize) {diff --git a/crates/kernel/src/step_in/mod.rs b/crates/kernel/src/step_in/mod.rsindex b92d8a0f2f..290644b3c8 100644--- a/crates/kernel/src/step_in/mod.rs+++ b/crates/kernel/src/step_in/mod.rs@@ -55,6 +55,10 @@ pub struct ImportedBody {pub closed: bool,/// Faces read from the file (each body face is one of them: `face_origin`).pub file_faces: usize,+ /// No B-rep could be made of the solid: `body` is a mesh body of the faces that could be+ /// read and meshed on their own, shown so the solid is not lost, and this is why the solid+ /// was refused (the import's warnings say so too).+ pub shown_as_mesh: Option<String>,}/// One product occurrence in the file's assembly tree.@@ -715,10 +719,13 @@ impl Reader {// What the read of the item found, reported once.if let Some(failed) = read {let label = self.label(item);+ if let Some(why) = &part.refused {+ self.warn(format!("{label}: shown as a mesh: {why}"));+ }for f in &failed {self.warn(format!("{label}: {f}"));}- if !part.closed {+ if !part.closed && part.refused.is_none() {self.warn(format!("{label}: imported as an open body (the shell is not closed)"));}}@@ -773,6 +780,7 @@ impl Reader {file_faces,source_item: item,face_origin,+ shown_as_mesh: part.refused.clone(),});}Err(parallel::Failure { read, msg }) => {diff --git a/crates/kernel/src/step_in/parallel.rs b/crates/kernel/src/step_in/parallel.rsindex f1e6257d4f..13293ddb4b 100644--- a/crates/kernel/src/step_in/parallel.rs+++ b/crates/kernel/src/step_in/parallel.rs@@ -26,6 +26,9 @@ pub(super) struct Part {pub file_faces: usize,/// The file face of each kernel face.pub face_origin: Vec<u64>,+ /// No B-rep could be made of the solid: the body is a mesh of the faces that could be read+ /// on their own ([`mesh_part`]), and this is why the solid was refused.+ pub refused: Option<String>,}/// A prepared instance.@@ -63,7 +66,7 @@ fn prepare(ex: &Exchange, job: &Job) -> Prepared {let (part, read) = match &job.source {Source::Oriented(part) => (part.clone(), None),Source::Item { item, units } => {- let (part, read) = smlib_part(ex, *item, *units)?;+ let (part, read) = smlib_part(ex, *item, *units).or_else(|refused| mesh_part(ex, *item, *units, refused))?;(Arc::new(part), Some(read))}};@@ -85,7 +88,7 @@ fn placed(body: &Body, m: &M4) -> crate::Result<Body> {/// A solid item read with the STEP reader into its schema 4 record, then into SMLib as given,/// and brought back as a body: the part SMLib made of the file. A solid the reader or SMLib-/// refuses is not imported, with the reason.+/// refuses fails with the reason ([`mesh_part`] then shows what it can of it).pub(super) fn smlib_part(ex: &Exchange, item: u64, units: Units) -> std::result::Result<(Part, Vec<String>), Failure> {let solid = solidcraft_profile::scope("import", "step.read_solid", || {solidcraft_step::topology::read_solid_with(ex, item, units, &solidcraft_smlib::pcurves::SmlibTrims)@@ -109,10 +112,54 @@ pub(super) fn smlib_part(ex: &Exchange, item: u64, units: Units) -> std::result:_ => return Err(Failure { read: false, msg: "not supported yet: SMLib renumbered the solid's faces".into() }),}}- let part = Part { body, closed: !solid.sheet, file_faces: solid.face_origin.len(), face_origin };+ let part = Part { body, closed: !solid.sheet, file_faces: solid.face_origin.len(), face_origin, refused: None };Ok((part, solid.notes))}+/// A solid the reader or SMLib refuses, still shown: each of its faces read on its own+/// ([`solidcraft_step::topology::read_faces_with`]) and meshed by the planner as a one-face+/// surface body, the faces' triangles together a mesh body. It is no B-rep (modelling+/// operations refuse it); `refused` says why. Faces that cannot be read or meshed on their own+/// are left out, each named in the notes. With no face to show, the solid stays refused.+fn mesh_part(ex: &Exchange, item: u64, units: Units, refused: Failure) -> std::result::Result<(Part, Vec<String>), Failure> {+ let _span = solidcraft_profile::span("import", "step.refused_mesh");+ let faces = match solidcraft_step::topology::read_faces_with(ex, item, units, &solidcraft_smlib::pcurves::SmlibTrims) {+ Ok(faces) => faces,+ Err(_) => return Err(refused),+ };+ let mut notes = Vec::new();+ let mut bodies = Vec::with_capacity(faces.len());+ for f in &faces {+ match f.record.clone().map_err(KernelError::Failed).and_then(Body::from_record) {+ Ok(b) => bodies.push((f.face, b)),+ Err(e) => notes.push(format!("not shown: {}", e.to_string().trim_start_matches("the operation failed: "))),+ }+ }+ // Every face at the display tolerance of the whole solid.+ let bounds: solidcraft_geom::Aabb3 = bodies.iter().flat_map(|(_, b)| b.record().vertices.iter().map(|v| crate::body::v3(v.point))).collect();+ let size = if bounds.is_empty() { 0.0 } else { bounds.diagonal() };+ let tol = crate::MeshTolerance::display_of(if size.is_finite() { size } else { 0.0 });+ let (mut positions, mut triangles) = (Vec::new(), Vec::new());+ for (face, b) in &bodies {+ match b.mesh(&tol) {+ Ok(m) if !m.triangles.is_empty() => {+ let Ok(base) = u32::try_from(positions.len()) else { break };+ positions.extend_from_slice(&m.positions);+ triangles.extend(m.triangles.iter().map(|t| t.map(|i| i.saturating_add(base))));+ }+ Ok(_) => notes.push(format!("not shown: face #{face}: no triangles")),+ Err(e) => notes.push(format!("not shown: face #{face}: {}", e.to_string().trim_start_matches("the operation failed: "))),+ }+ }+ if triangles.is_empty() {+ return Err(Failure { msg: format!("{} (no face could be shown as a mesh either)", refused.msg), ..refused });+ }+ let body = crate::meshbody::mesh_body(&positions, &triangles)+ .map_err(|e| Failure { msg: format!("{} (its mesh: {e})", refused.msg), read: refused.read })?;+ let closed = body.is_closed_mesh();+ Ok((Part { body, closed, file_faces: faces.len(), face_origin: Vec::new(), refused: Some(refused.msg) }, notes))+}+/// Prepare `jobs`, the results in the jobs' order. Solids still to read and orient (the slow/// part) are shared out between up to `workers` threads, each taking the next job when it is/// done with one, so one large part does not hold up the rest.diff --git a/crates/kernel/src/step_in/tests.rs b/crates/kernel/src/step_in/tests.rsindex aa623ce210..d89f5934da 100644--- a/crates/kernel/src/step_in/tests.rs+++ b/crates/kernel/src/step_in/tests.rs@@ -2096,3 +2096,128 @@ fn an_edge_over_a_spheres_pole_is_split_there() {let m = measure(&imp.bodies[0].body).unwrap();assert!(rel(m.area, excess * r * r) < 1e-3, "{} vs {}", m.area, excess * r * r);}++/// A planar bicubic patch whose v = 0 side is shrunk to `side` mm (a corner of a round written as+/// a four-sided patch, Poppy Humanoid's connectors write them), bounded by three edges, its+/// boundary iso curves counter-clockwise in (u, v): up the u = 1 side, back across v = 1, down+/// the u = 0 side. The two side edges end `side` apart at one vertex, the end of the u = 0 side,+/// whose tolerance covers that gap; the face tolerance (the file's 1e-6 mm) does not.+fn patch_with_a_side_shrunk(side: f64) -> String {+ let f = |x: f64| format!("{x:.17E}");+ // (i, j), i along u: the v = 0 row runs over `side`, the v = 1 row over 30 mm.+ let p = |i: usize, j: usize| {+ let v = j as f64 / 3.0;+ [(1.0 - v) * side * i as f64 / 3.0 + v * 10.0 * i as f64, 30.0 * v, 0.0]+ };+ let pt = |id: usize, q: [f64; 3]| format!("#{id}=CARTESIAN_POINT('',({},{},{}));\n", f(q[0]), f(q[1]), f(q[2]));+ let mut t = String::from(HEAD);+ let mut rows = Vec::new();+ for i in 0..4 {+ rows.push(format!("({})", (0..4).map(|j| format!("#{}", 100 + i * 4 + j)).collect::<Vec<_>>().join(",")));+ for j in 0..4 {+ t += &pt(100 + i * 4 + j, p(i, j));+ }+ }+ t += &format!(+ "#10=B_SPLINE_SURFACE_WITH_KNOTS('',3,3,({}),.UNSPECIFIED.,.F.,.F.,.F.,(4,4),(4,4),(0.,1.),(0.,1.),.UNSPECIFIED.);\n",+ rows.join(",")+ );+ // A at (0, 0), C at (1, 1), B at (0, 1).+ for (k, q) in [p(0, 0), p(3, 3), p(0, 3)].into_iter().enumerate() {+ t += &pt(200 + k, q);+ t += &format!("#{}=VERTEX_POINT('',#{});\n", 210 + k, 200 + k);+ }+ let sides: [[(usize, usize); 4]; 3] = [[(3, 0), (3, 1), (3, 2), (3, 3)], [(3, 3), (2, 3), (1, 3), (0, 3)], [(0, 3), (0, 2), (0, 1), (0, 0)]];+ for (k, side) in sides.iter().enumerate() {+ for (m, &(i, j)) in side.iter().enumerate() {+ t += &pt(300 + k * 4 + m, p(i, j));+ }+ let pts: Vec<String> = (0..4).map(|m| format!("#{}", 300 + k * 4 + m)).collect();+ t += &format!("#{}=B_SPLINE_CURVE_WITH_KNOTS('',3,({}),.UNSPECIFIED.,.F.,.F.,(4,4),(0.,1.),.UNSPECIFIED.);\n", 400 + k, pts.join(","));+ t += &format!(+ "#{}=EDGE_CURVE('',#{},#{},#{},.T.);\n#{}=ORIENTED_EDGE('',*,*,#{},.T.);\n",+ 500 + k,+ 210 + k,+ 210 + (k + 1) % 3,+ 400 + k,+ 510 + k,+ 500 + k+ );+ }+ t += "#520=EDGE_LOOP('',(#510,#511,#512));\n#521=FACE_OUTER_BOUND('',#520,.T.);\n#522=ADVANCED_FACE('',(#521),#10,.T.);\n";+ t += "#530=OPEN_SHELL('',(#522));\n#531=SHELL_BASED_SURFACE_MODEL('Corner',(#530));\n#532=MANIFOLD_SURFACE_SHAPE_REPRESENTATION('',(#531),#540);\n";+ t += &context(540, "(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.))");+ t += TAIL;+ t+}++#[test]+fn a_patch_side_shrunk_within_its_vertexs_tolerance_is_a_pole_of_the_loop() {+ // 4 µm: four times the face's tolerance, within the vertex's (1.5 × its 4 µm gap). The loop+ // runs along the shrunk side between the side edges' ends, a pole for it, and the face reads+ // with the patch's area: a trapezoid 30 mm high, 30 mm and `side` wide.+ let side = 4e-3 * 1e-3;+ let imp = step_import(&patch_with_a_side_shrunk(side)).unwrap();+ assert_eq!(imp.bodies.len(), 1, "{:?}", imp.warnings);+ let m = measure(&imp.bodies[0].body).unwrap();+ let area = 0.5 * (30.0 + side) * 30.0;+ assert!(rel(m.area, area) < 1e-6, "{} vs {area}", m.area);+}++/// A solid no B-rep can be made of is still shown: a cup whose wall, a cylinder face, has one+/// bound (the rim it shares with its bottom) and no far one is refused, as Poppy Humanoid's+/// stock head is. Each face is read and meshed on its own instead: the bottom shows, as a mesh+/// body that says why the solid was refused; the wall, which cannot be read on its own either,+/// is left out and named. Modelling operations refuse the mesh body.+#[test]+fn a_refused_solid_is_shown_as_a_mesh_of_the_faces_that_read() {+ let text = format!(+ "{HEAD}+#1=CARTESIAN_POINT('',(0.,0.,0.));+#2=DIRECTION('',(0.,0.,1.));+#3=DIRECTION('',(1.,0.,0.));+#4=DIRECTION('',(0.,0.,-1.));+#5=AXIS2_PLACEMENT_3D('',#1,#2,#3);+#6=AXIS2_PLACEMENT_3D('',#1,#4,#3);+#7=CARTESIAN_POINT('',(5.,0.,0.));+#8=VERTEX_POINT('',#7);+#9=CIRCLE('',#5,5.);+#10=EDGE_CURVE('',#8,#8,#9,.T.);+#11=ORIENTED_EDGE('',*,*,#10,.F.);+#12=EDGE_LOOP('',(#11));+#13=FACE_OUTER_BOUND('',#12,.T.);+#14=PLANE('',#6);+#15=ADVANCED_FACE('Bottom',(#13),#14,.T.);+#16=ORIENTED_EDGE('',*,*,#10,.T.);+#17=EDGE_LOOP('',(#16));+#18=FACE_OUTER_BOUND('',#17,.T.);+#19=CYLINDRICAL_SURFACE('',#5,5.);+#20=ADVANCED_FACE('Wall',(#18),#19,.T.);+#21=CLOSED_SHELL('',(#15,#20));+#22=MANIFOLD_SOLID_BREP('Cup',#21);+#23=SHAPE_REPRESENTATION('',(#22),$);+{TAIL}"+ );+ let imp = step_import(&text).unwrap();+ assert_eq!(imp.bodies.len(), 1, "{:?}", imp.warnings);+ let cup = &imp.bodies[0];+ assert!(cup.body.is_mesh(), "{:?}", imp.warnings);+ let why = cup.shown_as_mesh.as_deref().unwrap_or_default();+ assert!(why.contains("face #20: a face around an open surface of revolution with one bound"), "{why}");+ assert_eq!(cup.file_faces, 2);+ // The report keeps the refusal and names the face left out.+ assert!(imp.warnings.iter().any(|w| w.contains("'Cup': shown as a mesh: ") && w.contains(why)), "{:?}", imp.warnings);+ assert!(imp.warnings.iter().any(|w| w.contains("'Cup': not shown: face #20: ")), "{:?}", imp.warnings);+ // The bottom, a 5 mm disk facing down.+ let m = measure(&cup.body).unwrap();+ assert!(rel(m.area, std::f64::consts::PI * 25.0) < 1e-2, "area {}", m.area);+ let (positions, triangles) = cup.body.triangle_mesh().unwrap();+ assert!(positions.iter().all(|p| p.z.abs() < 1e-9 && p.x.hypot(p.y) <= 5.0 + 1e-6), "the bottom only");+ let down = triangles+ .iter()+ .map(|t| (positions[t[1] as usize] - positions[t[0] as usize]).cross(positions[t[2] as usize] - positions[t[0] as usize]).z)+ .sum::<f64>();+ assert!(down < 0.0, "the bottom faces out of the cup: {down}");+ let refused = fillet(&cup.body, &[Vec3::new(5.0, 0.0, 0.0)], 1.0).err().map(|e| e.to_string()).unwrap_or_default();+ assert!(refused.contains("needs a solid body"), "{refused}");+}diff --git a/crates/kernel/src/tess/mod.rs b/crates/kernel/src/tess/mod.rsindex 08d9b192f8..d956b2adb2 100644--- a/crates/kernel/src/tess/mod.rs+++ b/crates/kernel/src/tess/mod.rs@@ -18,9 +18,10 @@//! named in the plan's stats ([`PlanStats::lenient`], with why it was refused) so it is//! reported and fixed there; it is filled leniently in (u, v) (the sides crossing one already//! kept are left out, see [`Lenient`]) so the display has no hole. A face that refuses even-//! that (its loops do not close in (u, v), or wind round a seam or pole), or whose pcurves do-//! not lie on its edges, is an error naming the face (and the edge) and why; there is no-//! other mesher to fall back to.+//! that (its loops do not close in (u, v), or wind round a seam or pole) is left out of the+//! plan with no triangles and named in [`PlanStats::unmeshed`], and the rest of the body is+//! meshed; there is no other mesher to fall back to. A face whose pcurves do not lie on its edges is an error naming the face and+//! the edge, as is a body none of whose faces can be planned.pub(crate) mod cdt;pub(crate) mod collar;@@ -64,12 +65,15 @@ pub struct PlanStats {pub delaunay: usize,/// Faces every method refused, filled leniently in (u, v) (see [`Lenient`]) so the display/// has no hole: each still a defect upstream, in its pcurves or seams.- pub lenient: Vec<LenientFace>,+ pub lenient: Vec<RefusedFace>,+ /// Faces even the lenient fill refused: left out of the plan (no triangles), so the rest of+ /// the body is still meshed, each with why it could not be planned.+ pub unmeshed: Vec<RefusedFace>,}-/// A face filled leniently: its index in the record and why the strict plan refused it.+/// A face a method refused: its index in the record and why.#[derive(Clone, Debug, PartialEq, Eq)]-pub struct LenientFace {+pub struct RefusedFace {pub face: usize,pub reason: String,}@@ -198,7 +202,7 @@ pub(crate) fn plan(b: &brep::Brep, tol: f64, turn: Option<size::Turn>) -> Resultreturn Err(unsupported(format!("face {fi}: missing")));};let refused = tangled.iter().find(|(f, _)| *f == fi).map(|(_, why)| why.as_str());- let (fp, stats) = plan_or_fill(fi, kind(face.parameters()), eval, &fb.loops, &rules, *size, refused)?;+ let (fp, stats) = plan_or_fill(fi, kind(face.parameters()), eval, &fb.loops, &rules, *size, fb.reach, refused)?;let fwd = forward.get(fi).copied().unwrap_or(true);let fp =FacePlan { flip: !fwd, triangles: if fwd { fp.triangles } else { fp.triangles.into_iter().map(|[a, b, c]| [a, c, b]).collect() }, ..fp };@@ -206,16 +210,31 @@ pub(crate) fn plan(b: &brep::Brep, tol: f64, turn: Option<size::Turn>) -> Result});let mut plan = TessPlan::default();let mut stats = PlanStats::default();- for (r, eval) in planned.into_iter().zip(evals) {- let (fp, s) = r?;+ // A face no method plans is left out, named in the stats, and the rest of the body is+ // meshed; a body none of whose faces plan is the first face's error.+ let mut first_error: Option<KernelError> = None;+ for (fi, (r, eval)) in planned.into_iter().zip(evals).enumerate() {let surface = u32::try_from(plan.surfaces.len()).map_err(|_| unsupported("too many faces"))?;plan.surfaces.push(eval);+ let (fp, s) = match r {+ Ok(done) => done,+ Err(e) => {+ stats.unmeshed.push(RefusedFace { face: fi, reason: e.to_string() });+ first_error.get_or_insert(e);+ (FacePlan { face: u32::try_from(fi).unwrap_or(u32::MAX), ..FacePlan::default() }, PlanStats::default())+ }+ };plan.faces.push(FacePlan { surface: Some(surface), ..fp });stats.planar += s.planar;stats.structured += s.structured;stats.delaunay += s.delaunay;stats.lenient.extend(s.lenient);}+ if let Some(e) = first_error+ && stats.unmeshed.len() == faces.len()+ {+ return Err(e);+ }plan.edges = nodes.into_iter().map(|n| n.points).collect();plan.edge_faces = edge_faces.into_iter().map(|fs| fs.into_iter().map(|f| u32::try_from(f).unwrap_or(u32::MAX)).collect()).collect();Ok((plan, stats))@@ -226,7 +245,8 @@ pub(crate) fn plan(b: &brep::Brep, tol: f64, turn: Option<size::Turn>) -> Result/// at the node's curve parameter. A seam edge's two uses on one face have their own pcurves, so/// its two sides are told apart. A pcurve runs on continuously; where one edge meets the next, a/// pcurve that starts a whole period along from where the previous one ended is moved back by-/// it, except in a direction the meeting point is a pole of: there the parameter is free, and+/// it, except in a direction the meeting point is a pole of (or lies on a patch side collapsed+/// to within its vertex's tolerance, see [`Boundary::reach`]): there the parameter is free, and/// the two pcurves' own values are where the face's boundary runs along the pole from and to/// (a meridian revolved half a turn meets the other at the pole half a period away; unwrapped,/// its loop would wind round the surface). Each loop then starts at a node off every pole whose@@ -251,7 +271,21 @@ fn boundary() -> Result<Boundary> {let dom = uv::domain(s);let fail = |e: u32, why: String| unsupported(format!("face {fi} ({}): edge {e}: {why}", kind(&face.surface)));- let mut out = Boundary { loops: Vec::with_capacity(face.loops.len()), segments: Vec::with_capacity(face.loops.len()) };+ // How near a pole a node is one: the tolerance of a vertex of the face that lies on a patch+ // side collapsed to within it, not to a point, as the record check takes a loop's pole; at+ // most the chord tolerance, finer than which the mesh resolves nothing (a vertex tolerance+ // as large as the surface's features would make a pole of every node near one).+ let mut reach: f64 = 0.0;+ for oe in face_edges(face) {+ let (Some(edge), Some([p0, p1])) = (b.edges.get(oe.edge as usize), oe.pcurve.interval()) else { continue };+ let tol = edge.vertices.get(usize::from(!oe.forward)).and_then(|v| b.vertices.get(*v as usize)).map_or(0.0, |v| v.tolerance.min(rules.tol));+ let Some(q) = oe.pcurve.eval(if oe.forward { p0 } else { p1 }).map(|q| map.to_eval(q)) else { continue };+ if tol.is_finite() && tol > reach && (0..2).any(|d| uv::degenerate_within(s, &dom, q, d, tol)) {+ reach = tol;+ }+ }+ let pole_along = |q: [f64; 2], d: usize| uv::degenerate_within(s, &dom, q, d, reach);+ let mut out = Boundary { loops: Vec::with_capacity(face.loops.len()), segments: Vec::with_capacity(face.loops.len()), reach };// Each vertex's parameters, from the first edge use of the face to start there.let mut at_vertex: std::collections::HashMap<u32, [f64; 2]> = std::collections::HashMap::new();for l in &face.loops {@@ -290,7 +324,7 @@ fn boundary(if let (Some(e), Some(&start)) = (end, eq.first()) {for d in 0..2 {let Some(per) = dom.period[d] else { continue };- if !(uv::degenerate(s, e, d) || uv::degenerate(s, start, d)) {+ if !(pole_along(e, d) || pole_along(start, d)) {shift[d] = per * ((e[d] - start[d]) / per).round();}}@@ -321,7 +355,7 @@ fn boundary(uvs.extend(eq);}let n = uvs.len();- let pole = |q: &[f64; 2]| (0..2).any(|d| uv::degenerate(s, *q, d));+ let pole = |q: &[f64; 2]| (0..2).any(|d| pole_along(*q, d));if let Some(k) = (0..n).find(|&k| uvs.get(k).is_some_and(|q| !pole(q)) && uvs.get((k + n - 1) % n).is_some_and(|q| !pole(q))) {uvs.rotate_left(k);pts.rotate_left(k);@@ -336,10 +370,13 @@ fn boundary(}/// A face's boundary loops, and for each loop node the edge segment that starts there: the-/// edge, and the segment's place along it from its start vertex.+/// edge, and the segment's place along it from its start vertex. `reach`: how near a pole a+/// point of the face is taken as one (see [`uv::degenerate_within`]): the tolerance of a vertex+/// of it on a patch side collapsed to within that tolerance, else 0.struct Boundary {loops: Vec<seam::Loop>,segments: Vec<Vec<(u32, u32)>>,+ reach: f64,}/// Edges are sampled to the chord tolerance each on its own, so where two curves of one face@@ -360,7 +397,7 @@ fn untangle() -> Result<Vec<(usize, String)>> {let crossing = |fi: usize, fb: &Boundary| -> Vec<(u32, u32)> {let Some(s) = evals.get(fi) else { return Vec::new() };- tangle::crossing(s, &fb.loops).into_iter().filter_map(|(l, k)| fb.segments.get(l)?.get(k).copied()).collect()+ tangle::crossing(s, fb.reach, &fb.loops).into_iter().filter_map(|(l, k)| fb.segments.get(l)?.get(k).copied()).collect()};let indexed: Vec<usize> = (0..boundaries.len()).collect();let curved = evals.iter().filter(|e| !matches!(e, EvalSurface::Plane { .. })).count();@@ -499,9 +536,9 @@ fn area2(uv: &[[f64; 2]]) -> f64 {/// unchanged across the pole. Across a pole it may jump by any amount, so the run from the/// second pole back to the first is moved one period along, whichever way keeps the loop/// within one period with a positive area: the seam's two uses then lie a period apart.-fn open_pole_to_pole(s: &EvalSurface, dom: &uv::Domain, l: &mut seam::Loop) {+fn open_pole_to_pole(s: &EvalSurface, dom: &uv::Domain, reach: f64, l: &mut seam::Loop) {let n = l.uv.len();- let poles: Vec<usize> = (0..n).filter(|&k| l.uv.get(k).is_some_and(|q| (0..2).any(|d| uv::degenerate(s, *q, d)))).collect();+ let poles: Vec<usize> = (0..n).filter(|&k| l.uv.get(k).is_some_and(|q| (0..2).any(|d| uv::degenerate_within(s, dom, *q, d, reach)))).collect();let [p0, p1] = poles.as_slice() else { return };for d in 0..2 {let Some(per) = dom.period[d] else { continue };@@ -547,11 +584,11 @@ fn open_pole_to_pole(s: &EvalSurface, dom: &uv::Domain, l: &mut seam::Loop) {/// The poles of a loop where it turns straight back along a seam: the nodes either side have/// the same parameters.-fn turning_poles(s: &EvalSurface, per: f64, uv: &[[f64; 2]]) -> Vec<usize> {+fn turning_poles(s: &EvalSurface, dom: &uv::Domain, reach: f64, per: f64, uv: &[[f64; 2]]) -> Vec<usize> {let n = uv.len();let near = |a: Option<&[f64; 2]>, b: Option<&[f64; 2]>| a.zip(b).is_some_and(|(a, b)| (a[0] - b[0]).abs().max((a[1] - b[1]).abs()) <= 1e-9 * per);(0..n)- .filter(|&k| uv.get(k).is_some_and(|q| (0..2).any(|d| uv::degenerate(s, *q, d))))+ .filter(|&k| uv.get(k).is_some_and(|q| (0..2).any(|d| uv::degenerate_within(s, dom, *q, d, reach)))).filter(|&k| near(uv.get((k + n - 1) % n), uv.get((k + 1) % n))).collect()}@@ -564,7 +601,7 @@ fn turning_poles(s: &EvalSurface, per: f64, uv: &[[f64; 2]]) -> Vec<usize> {/// to the pole, and starts at the node before it: the seam's uses then bound the face's parameter box on either side, and share/// their nodes as every other edge does. Kept as it was unless the opened loop spans at most a/// period with a positive area.-fn open_at_pole(s: &EvalSurface, dom: &uv::Domain, l: &mut seam::Loop) {+fn open_at_pole(s: &EvalSurface, dom: &uv::Domain, reach: f64, l: &mut seam::Loop) {let n = l.uv.len();if n < 4 || l.pts.len() != n {return;@@ -574,7 +611,7 @@ fn open_at_pole(s: &EvalSurface, dom: &uv::Domain, l: &mut seam::Loop) {if (seam::drift(l, d, per).abs() - per).abs() > per * 1e-6 {continue;}- let [pole] = turning_poles(s, per, &l.uv)[..] else { continue };+ let [pole] = turning_poles(s, dom, reach, per, &l.uv)[..] else { continue };// From the node after the pole round to the pole, unwrapped along the way.let order: Vec<usize> = (1..=n).map(|i| (pole + i) % n).collect();let mut uv: Vec<[f64; 2]> = Vec::with_capacity(n);@@ -633,9 +670,10 @@ fn holes_beside_outer(dom: &uv::Domain, loops: &mut [seam::Loop]) {/// One face, planned by [`plan_face`]; a face it refuses because its loops cross in (u, v) is/// planned once more leniently (see [`Lenient`]) and named in the stats with the first refusal,/// so the defect upstream is still reported. When the lenient fill refuses too, the first-/// refusal is the error. `refused`: a face whose boundary still crosses itself after-/// [`untangle`] (two edges meeting tangentially at a cusp, whose chords cross however often-/// they are halved), filled leniently straight away with that reason.+/// refusal is the error (and [`plan`] leaves the face out, named). `refused`: a face whose+/// boundary still crosses itself after [`untangle`] (two edges meeting tangentially at a cusp,+/// whose chords cross however often they are halved), filled leniently straight away with that+/// reason.fn plan_or_fill(fi: usize,kind: &str,@@ -643,20 +681,21 @@ fn plan_or_fill(loops: &[seam::Loop],rules: &size::Rules,size: (f64, [f64; 2]),+ reach: f64,refused: Option<&str>,) -> Result<(FacePlan, PlanStats)> {let mut stats = PlanStats::default();let strict = match refused {Some(why) => Err(unsupported(why.to_string())),- None => plan_face(fi, kind, s, loops, rules, size, &mut stats, Lenient::No),+ None => plan_face(fi, kind, s, loops, rules, size, reach, &mut stats, Lenient::No),};match strict {Ok(fp) => Ok((fp, stats)),Err(first) => {let mut stats = PlanStats::default();- match plan_face(fi, kind, s, loops, rules, size, &mut stats, Lenient::Yes) {+ match plan_face(fi, kind, s, loops, rules, size, reach, &mut stats, Lenient::Yes) {Ok(fp) => {- stats.lenient.push(LenientFace { face: fi, reason: first.to_string() });+ stats.lenient.push(RefusedFace { face: fi, reason: first.to_string() });Ok((fp, stats))}Err(_) => Err(first),@@ -667,7 +706,8 @@ fn plan_or_fill(/// One face: boundary loops in 3D (shared edge nodes) to parameters and triangles./// `size`: the face's target side length (mm) and the surface's mean speed along u and v.-/// `lenient`: the last resort for a face no method could plan (see [`Lenient`]).+/// `reach`: how near a pole a point is taken as one ([`Boundary::reach`]). `lenient`: the last resort+/// for a face no method could plan (see [`Lenient`]).#[allow(clippy::too_many_arguments)]fn plan_face(fi: usize,@@ -676,6 +716,7 @@ fn plan_face(loops: &[seam::Loop],rules: &size::Rules,size: (f64, [f64; 2]),+ reach: f64,stats: &mut PlanStats,lenient: Lenient,) -> Result<FacePlan> {@@ -689,7 +730,7 @@ fn plan_face(// A loop that runs up a seam from a pole and straight back down it (a half sphere bounded// by its rim and its seam used both ways) winds once as projected: it is opened at the pole.for l in projected.iter_mut() {- open_at_pole(s, &dom, l);+ open_at_pole(s, &dom, reach, l);}let wound: Vec<usize> = (0..2).filter(|&d| dom.period[d].is_some_and(|per| seam::winds(&projected, d, per))).collect();// A face cut along a seam is a long winding strip whose sides are the cut lines and the@@ -708,7 +749,7 @@ fn plan_face(// kernel writes it) projects onto one parameter line: its second run is a period along.if !seamed {for l in projected.iter_mut() {- open_pole_to_pole(s, &dom, l);+ open_pole_to_pole(s, &dom, reach, l);}holes_beside_outer(&dom, &mut projected);}@@ -723,7 +764,7 @@ fn plan_face(// At a pole the parameter along the degenerate direction is free: one copy with// the previous node's value, one with the next node's.let (prev, next) = (luv.get((k + n - 1) % n).copied(), luv.get((k + 1) % n).copied());- let pole = (0..2).find(|&d| uv::degenerate(s, *q, d));+ let pole = (0..2).find(|&d| uv::degenerate_within(s, &dom, *q, d, reach));match (pole, prev, next) {(Some(d), Some(a), Some(b)) => {let mut qa = *q;@@ -875,7 +916,7 @@ fn plan_face(all.extend(extra);// Whatever the layout, no triangle leaves the surface by more than the tolerance.if !planar {- sag::refine(s, tol, &fixed, &mut all, &mut triangles, MAX_REFINE);+ sag::refine(s, tol, reach, &fixed, &mut all, &mut triangles, MAX_REFINE);}// Both evaluators take a closed spline's parameters inside its active interval.for q in &mut all {diff --git a/crates/kernel/src/tess/sag.rs b/crates/kernel/src/tess/sag.rsindex 1d96e79948..02ebb35ef5 100644--- a/crates/kernel/src/tess/sag.rs+++ b/crates/kernel/src/tess/sag.rs@@ -14,12 +14,15 @@ use solidcraft_geom::tess::EvalSurface;/// Split the triangles `tris` of a face (indices into `uv`; the first `fixed.len()` points sit/// at `fixed`, the rest on the surface at their parameters) until none of them lies farther-/// than `tol` from the surface `s`, adding at most `max_points` points to `uv`.-pub(crate) fn refine(s: &EvalSurface, tol: f64, fixed: &[Vec3], uv: &mut Vec<[f64; 2]>, tris: &mut Vec<[u32; 3]>, max_points: usize) {+/// than `tol` from the surface `s`, adding at most `max_points` points to `uv`. `reach`: how near+/// a pole a point is taken as one (see [`super::uv::degenerate_within`]).+pub(crate) fn refine(s: &EvalSurface, tol: f64, reach: f64, fixed: &[Vec3], uv: &mut Vec<[f64; 2]>, tris: &mut Vec<[u32; 3]>, max_points: usize) {if !(tol.is_finite() && tol > 0.0) || tris.is_empty() {return;}let at = |q: [f64; 2]| s.eval(q[0], q[1]).0;+ let dom = super::uv::domain(s);+ let mean = |qs: &[[f64; 2]]| mean(s, &dom, reach, qs);// How far the flat point `c` lies from the surface, measured along the normal at the surface// point of the same parameters: those parameters need not be the nearest (a straight line in// the parameters is no geodesic near a pole), and only the departure across the surface@@ -64,7 +67,7 @@ pub(crate) fn refine(s: &EvalSurface, tol: f64, fixed: &[Vec3], uv: &mut Vec<[f6if len <= shortest {continue;}- let sag = *sag_of.entry(e).or_insert_with(|| off(mean(s, &[ua, ub]), (xa + xb) * 0.5));+ let sag = *sag_of.entry(e).or_insert_with(|| off(mean(&[ua, ub]), (xa + xb) * 0.5));inner.push((sag, len, e));}// The surface's departure from a flat triangle is about quadratic over it: at the@@ -72,7 +75,7 @@ pub(crate) fn refine(s: &EvalSurface, tol: f64, fixed: &[Vec3], uv: &mut Vec<[f6// inside the face divides by four. A triangle whose middle is off splits its side inside// the face that sags most, while that side still contributes; what is left comes from// its boundary sides, which the edges' own sampling keeps within the tolerance.- let centroid = mean(s, &[qa, qb, qc]);+ let centroid = mean(&[qa, qb, qc]);let worst = inner.iter().max_by(|x, y| x.0.total_cmp(&y.0)).copied();let split = match worst {Some((sag, _, e)) if sag > tol => e,@@ -80,7 +83,7 @@ pub(crate) fn refine(s: &EvalSurface, tol: f64, fixed: &[Vec3], uv: &mut Vec<[f6_ => continue,};let (Some(ua), Some(ub)) = (q(split.0), q(split.1)) else { continue };- let m = mean(s, &[ua, ub]);+ let m = mean(&[ua, ub]);let mi = uv.len() as u32;uv.push(m);pos.push(at(m));@@ -92,10 +95,10 @@ pub(crate) fn refine(s: &EvalSurface, tol: f64, fixed: &[Vec3], uv: &mut Vec<[f6/// The mean of parameter points, as the surface point between them: at a pole the parameter/// along the degenerate direction is free (the pole copy carries a neighbour's), so there the/// mean takes it from the other points alone.-fn mean(s: &EvalSurface, qs: &[[f64; 2]]) -> [f64; 2] {+fn mean(s: &EvalSurface, dom: &super::uv::Domain, reach: f64, qs: &[[f64; 2]]) -> [f64; 2] {let mut out = [0.0; 2];for (d, slot) in out.iter_mut().enumerate() {- let free: Vec<f64> = qs.iter().filter(|q| !super::uv::degenerate(s, **q, d)).map(|q| q[d]).collect();+ let free: Vec<f64> = qs.iter().filter(|q| !super::uv::degenerate_within(s, dom, **q, d, reach)).map(|q| q[d]).collect();let pick: Vec<f64> = if free.is_empty() { qs.iter().map(|q| q[d]).collect() } else { free };*slot = pick.iter().sum::<f64>() / pick.len().max(1) as f64;}diff --git a/crates/kernel/src/tess/tangle.rs b/crates/kernel/src/tess/tangle.rsindex 68db1a9760..c53a982cef 100644--- a/crates/kernel/src/tess/tangle.rs+++ b/crates/kernel/src/tess/tangle.rs@@ -33,10 +33,10 @@ impl Chord {/// another, each once and in order. On a closed surface the boundary crosses itself where any/// copies of two chords, whole periods apart, cross; chords ending on a pole, where the/// parameter along the pole is free, are left out. Adjacent chords of a loop share a node and-/// never cross.-pub(crate) fn crossing(s: &EvalSurface, loops: &[seam::Loop]) -> Vec<(usize, usize)> {+/// never cross. `reach`: how near a pole a node is taken as one (see [`uv::degenerate_within`]).+pub(crate) fn crossing(s: &EvalSurface, reach: f64, loops: &[seam::Loop]) -> Vec<(usize, usize)> {let dom = uv::domain(s);- let pole = |q: [f64; 2]| (0..2).any(|d| uv::degenerate(s, q, d));+ let pole = |q: [f64; 2]| (0..2).any(|d| uv::degenerate_within(s, &dom, q, d, reach));let mut chords: Vec<Chord> = Vec::new();for (li, l) in loops.iter().enumerate() {let n = l.uv.len();diff --git a/crates/kernel/src/tess/tests.rs b/crates/kernel/src/tess/tests.rsindex 5ee223aaa9..45f5163c2f 100644--- a/crates/kernel/src/tess/tests.rs+++ b/crates/kernel/src/tess/tests.rs@@ -99,7 +99,7 @@ fn a_box_is_a_regular_grid_on_every_face() {fn primitives_are_watertight_with_the_right_volume() {for tol in [0.05, 0.005] {let s = check("box", &ok(crate::box_solid(Vec3::ZERO, Vec3::new(10.0, 6.0, 4.0))), tol, 240.0);- assert_eq!(s, PlanStats { planar: 6, structured: 0, delaunay: 0, lenient: Vec::new() });+ assert_eq!(s, PlanStats { planar: 6, ..PlanStats::default() });let s = check("cylinder", &ok(crate::cylinder(Vec3::new(1.0, 2.0, 3.0), Vec3::new(0.0, 1.0, 1.0), 2.5, 7.0)), tol, PI * 2.5 * 2.5 * 7.0);assert_eq!(s.delaunay, 0, "cylinder walls are structured");let s = check("torus", &ok(crate::torus(Vec3::ZERO, 6.0, 1.5)), tol, 2.0 * PI * PI * 6.0 * 1.5 * 1.5);@@ -725,8 +725,8 @@ fn a_curved_face_crossing_itself_is_filled_on_its_surface() {let size = size::face_size(&s, &uv::domain(&s), &rules);let loops = std::slice::from_ref(&l);let mut stats = PlanStats::default();- assert!(plan_face(0, "spline", &s, loops, &rules, size, &mut stats, Lenient::No).is_err());- let Ok(fp) = plan_face(0, "spline", &s, loops, &rules, size, &mut stats, Lenient::Yes) else { panic!("a lenient fill") };+ assert!(plan_face(0, "spline", &s, loops, &rules, size, 0.0, &mut stats, Lenient::No).is_err());+ let Ok(fp) = plan_face(0, "spline", &s, loops, &rules, size, 0.0, &mut stats, Lenient::Yes) else { panic!("a lenient fill") };assert!(!fp.triangles.is_empty());assert!(fp.uv.len() > fp.fixed.len(), "{} points, {} on the boundary", fp.uv.len(), fp.fixed.len());// Each point inside the face on the surface where its parameters put it.@@ -743,7 +743,7 @@ fn a_curved_face_crossing_itself_is_filled_on_its_surface() {fn a_face_filled_leniently_is_named_in_the_stats() {let (s, l, rules) = a_face_crossing_itself();let size = size::face_size(&s, &uv::domain(&s), &rules);- let Ok((fp, stats)) = plan_or_fill(7, "spline", &s, std::slice::from_ref(&l), &rules, size, None) else { panic!("filled leniently") };+ let Ok((fp, stats)) = plan_or_fill(7, "spline", &s, std::slice::from_ref(&l), &rules, size, 0.0, None) else { panic!("filled leniently") };assert!(!fp.triangles.is_empty());assert_eq!((stats.planar, stats.structured, stats.delaunay), (0, 0, 0));let [lenient] = stats.lenient.as_slice() else { panic!("one lenient face: {:?}", stats.lenient) };@@ -760,7 +760,7 @@ fn a_face_untangling_cannot_resolve_is_filled_leniently_and_named() {let (s, l, rules) = a_face_crossing_itself();let size = size::face_size(&s, &uv::domain(&s), &rules);let why = "face 7 (spline): boundary crosses itself: edges [1, 2] run closer together than their chords can follow";- let Ok((fp, stats)) = plan_or_fill(7, "spline", &s, std::slice::from_ref(&l), &rules, size, Some(why)) else { panic!("filled leniently") };+ let Ok((fp, stats)) = plan_or_fill(7, "spline", &s, std::slice::from_ref(&l), &rules, size, 0.0, Some(why)) else { panic!("filled leniently") };assert!(!fp.triangles.is_empty());let [lenient] = stats.lenient.as_slice() else { panic!("one lenient face: {:?}", stats.lenient) };assert_eq!(lenient.face, 7);@@ -807,3 +807,60 @@ fn a_face_bounded_by_two_short_arcs_keeps_an_area_to_mesh() {let lens = made.faces.first().and_then(|&f| plan.faces.get(f)).expect("the lens's plan");assert!(!lens.triangles.is_empty(), "the lens has triangles");}++/// Half of a square pyramid's sides as one spline face: degree 1, closed round the square+/// (u in [0, 4], a corner at each whole u) and from the base (v = 0) up to a top side collapsed+/// to a square 1e-7 mm across, not to a point, as the patch's side in Poppy Humanoid's connector+/// a quarter of a sphere cap's corner sits on. Its loop runs down the side at u = 0, along the+/// base to u = 2 and up again, then across the top back to the corner it started at, half a+/// period along. Taken for no pole, that step is taken as the nearest copy, and the loop winds+/// once round the surface with no partner to cut it along.+fn pyramid_past_a_near_pole(pole_tolerance: f64) -> solidcraft_geom::brep::Brep {+ use solidcraft_geom::brep::{self as b, Curve, Curve2, Surface};+ let top = 1e-7;+ let corner = |u: usize, r: f64, z: f64| {+ let [x, y] = [[1.0, 0.0], [0.0, 1.0], [-1.0, 0.0], [0.0, -1.0]][u % 4];+ [r * x, r * y, z]+ };+ let points: Vec<Vec<[f64; 3]>> = (0..5).map(|u| vec![corner(u, 1.0, 0.0), corner(u, top, 1.0)]).collect();+ let surface = Surface::Spline { u_knots: vec![0.0, 0.0, 1.0, 2.0, 3.0, 4.0, 4.0], v_knots: vec![0.0, 0.0, 1.0, 1.0], points };+ let edge =+ |curve: Curve, interval: [f64; 2], vertices: [u32; 2]| b::Edge { nurbs: None, curve, interval, vertices, tolerance: 1e-6, uses: Vec::new() };+ let edges = vec![+ edge(Curve::Line { start: corner(0, 1.0, 0.0), end: corner(0, top, 1.0) }, [0.0, 1.0], [1, 0]),+ edge(Curve::Polyline { points: vec![corner(0, 1.0, 0.0), corner(1, 1.0, 0.0), corner(2, 1.0, 0.0)] }, [0.0, 2.0], [1, 2]),+ edge(Curve::Line { start: corner(2, 1.0, 0.0), end: corner(2, top, 1.0) }, [0.0, 1.0], [2, 0]),+ ];+ let line = |t: [f64; 2], a: [f64; 2], z: [f64; 2]| Curve2::Spline { knots: vec![t[0], t[0], t[1], t[1]], points: vec![a, z] };+ let uses = vec![+ b::OrientedEdge { edge: 0, forward: false, pcurve: line([0.0, 1.0], [0.0, 0.0], [0.0, 1.0]) },+ b::OrientedEdge { edge: 1, forward: true, pcurve: line([0.0, 2.0], [0.0, 0.0], [2.0, 0.0]) },+ b::OrientedEdge { edge: 2, forward: true, pcurve: line([0.0, 1.0], [2.0, 0.0], [2.0, 1.0]) },+ ];+ let face = b::Face { nurbs: None, surface, domain: [[0.0, 2.0], [0.0, 1.0]], loops: vec![b::Loop::Edges { edges: uses }] };+ let vertex = |point: [f64; 3], tolerance: f64| b::Vertex { point, tolerance };+ let loose = b::Brep {+ version: b::VERSION,+ tolerance: 1e-7,+ regions: vec![b::Region { shells: vec![0], void: false }],+ shells: vec![b::Shell::Faces { faces: vec![b::OrientedFace { face: 0, forward: true }], wires: Vec::new() }],+ faces: vec![face],+ edges,+ vertices: vec![vertex([0.0, 0.0, 1.0], pole_tolerance), vertex(corner(0, 1.0, 0.0), 1e-7), vertex(corner(2, 1.0, 0.0), 1e-7)],+ };+ ok(loose.canonical().map_err(|e| crate::KernelError::Invalid(format!("{e:?}")))).brep+}++/// The corner of [`pyramid_past_a_near_pole`] within its vertex's tolerance of the collapsed top+/// side is a pole, and the face plans strictly over both its sides; with a tolerance short of+/// the top's size it is no pole, and the loop winds.+#[test]+fn a_loop_corner_within_its_tolerance_of_a_pole_is_a_pole() {+ let (made, stats) = ok(plan(&pyramid_past_a_near_pole(1e-6), 0.01, None));+ assert!(stats.lenient.is_empty() && stats.unmeshed.is_empty(), "{stats:?}");+ // Two of the pyramid's sides, each a triangle of area √3 / 2.+ let area = made.evaluate().measure().area;+ assert!((area - 3f64.sqrt()).abs() < 0.01 * 3f64.sqrt(), "area {area}");+ let Err(e) = plan(&pyramid_past_a_near_pole(1e-8), 0.01, None) else { panic!("no pole without the tolerance") };+ assert!(e.to_string().contains("winds around the surface"), "{e}");+}diff --git a/crates/kernel/src/tess/uv.rs b/crates/kernel/src/tess/uv.rsindex b4cb790ec9..7ee1b0f237 100644--- a/crates/kernel/src/tess/uv.rs+++ b/crates/kernel/src/tess/uv.rs@@ -3,7 +3,7 @@//! face's parameter box.use solidcraft_geom::tess::EvalSurface;-pub(crate) use solidcraft_geom::tess::uv::{Domain, degenerate, domain, unwrap};+pub(crate) use solidcraft_geom::tess::uv::{Domain, degenerate_within, domain, unwrap};use super::size::Rules;diff --git a/crates/step/src/topology.rs b/crates/step/src/topology.rsindex 719aac904c..897499ecdc 100644--- a/crates/step/src/topology.rs+++ b/crates/step/src/topology.rs@@ -310,39 +310,106 @@ fn read_with<'a>(trims: Option<&dyn Trims>,) -> R<Solid> {let e = entity(ex, item)?;- let p = e.params();- let name = p.first().and_then(Param::as_str).unwrap_or("").to_string();+ let name = e.params().first().and_then(Param::as_str).unwrap_or("").to_string();let mut b = Builder::new(ex, reader, tolerance(&context), budget, trims);// The file's faces, edges, vertices and their geometry read into the builder.let topology = solidcraft_profile::span("import", "step.topology");- let (shells, kind) = match e.name() {- "MANIFOLD_SOLID_BREP" => (vec![b.shell(rid(p.get(1), "outer shell")?)?], Kind::Solid),+ let (ids, kind) = item_shells(e)?;+ let mut shells = Vec::with_capacity(ids.len());+ for s in ids {+ shells.push(b.shell(s)?);+ }+ drop(topology);+ b.finish(item, name, shells, kind)+}++/// A face of a solid read on its own ([`read_faces_with`]).+#[derive(Clone, Debug)]+pub struct FaceRead {+ /// The face's entity in the file (the ADVANCED_FACE or FACE_SURFACE, or the ORIENTED_FACE+ /// the shell lists when it could not be read).+ pub face: u64,+ /// The face as a one-face surface body, facing as its shell uses it; else why it could not+ /// be read (naming the face).+ pub record: R<Brep>,+}++/// Each face of a solid item read on its own, as a one-face surface body: what can still be+/// shown of a solid that cannot be read whole, or whose body the kernel refuses. A face is read+/// as [`read_solid_with`] reads it, with its own edges and vertices (so its tolerances cover its+/// own gaps only); a face that cannot be read on its own says why and the others are still read.+pub fn read_faces_with(ex: &Exchange, item: u64, context: units::Context, trims: &dyn Trims) -> R<Vec<FaceRead>> {+ let (shells, _) = item_shells(entity(ex, item)?)?;+ let mut reader = Reader::new(ex, context.units);+ let mut budget = MAX_FILE_FACES;+ let mut out = Vec::new();+ for s in shells {+ let (faces, flip) = shell_faces(ex, s)?;+ for f in faces {+ if out.len() >= MAX_FACES {+ return Err(format!("more than {MAX_FACES} faces"));+ }+ let mut b = Builder::new(ex, &mut reader, tolerance(&context), &mut budget, Some(trims));+ let read = b.face(f, 0).and_then(|(face, forward)| b.finish(item, String::new(), vec![vec![(face, forward != flip)]], Kind::Model));+ let named = |m: String| if m.starts_with(&format!("face #{f}")) { m } else { format!("face #{f}: {m}") };+ out.push(match read {+ Ok(s) => FaceRead { face: s.face_origin.first().copied().unwrap_or(f), record: Ok(s.brep) },+ Err(m) => FaceRead { face: f, record: Err(named(m)) },+ });+ }+ }+ Ok(out)+}++/// The shells of a solid item (the outer shell first, then its voids), and what kind it is.+fn item_shells(e: &Entity) -> R<(Vec<u64>, Kind)> {+ let p = e.params();+ match e.name() {+ "MANIFOLD_SOLID_BREP" => Ok((vec![rid(p.get(1), "outer shell")?], Kind::Solid)),"BREP_WITH_VOIDS" => {- let mut shells = vec![b.shell(rid(p.get(1), "outer shell")?)?];+ let mut shells = vec![rid(p.get(1), "outer shell")?];let voids = refs(p.get(2), "voids")?;if voids.len() >= brep::MAX_SHELLS {return Err(format!("{} voids", voids.len()));}- for v in voids {- shells.push(b.shell(v)?);- }- (shells, Kind::Voids)+ shells.extend(voids);+ Ok((shells, Kind::Voids))}"SHELL_BASED_SURFACE_MODEL" => {let ids = refs(p.get(1), "surface model shells")?;if ids.is_empty() || ids.len() > brep::MAX_SHELLS {return Err(format!("a surface model with {} shells", ids.len()));}- let mut shells = Vec::with_capacity(ids.len());- for s in ids {- shells.push(b.shell(s)?);+ Ok((ids, Kind::Model))+ }+ n => Err(unsupported(n)),+ }+}++/// The faces a shell lists, and whether the shell turns them over (an oriented shell used+/// against its faces).+fn shell_faces(ex: &Exchange, id: u64) -> R<(Vec<u64>, bool)> {+ let e = entity(ex, id)?;+ let p = e.params();+ let (faces, flip) = match e.name() {+ "CLOSED_SHELL" | "OPEN_SHELL" => (refs(p.get(1), "shell faces")?, false),+ "ORIENTED_CLOSED_SHELL" | "ORIENTED_OPEN_SHELL" => {+ let inner = rid(p.get(2), "oriented shell element")?;+ let inner_e = entity(ex, inner)?;+ if !matches!(inner_e.name(), "CLOSED_SHELL" | "OPEN_SHELL") {+ return Err(format!("#{inner}: {}", unsupported(format!("shell {}", inner_e.name()))));}- (shells, Kind::Model)+ (refs(inner_e.params().get(1), "shell faces")?, !flag(p.get(3), "oriented shell orientation")?)}- n => return Err(unsupported(n)),+ n => return Err(format!("#{id}: {}", unsupported(format!("shell {n}")))),};- drop(topology);- b.finish(item, name, shells, kind)+ if faces.is_empty() {+ return Err(format!("shell #{id} has no faces"));+ }+ if faces.len() > MAX_FACES {+ return Err(format!("shell #{id} with {} faces", faces.len()));+ }+ Ok((faces, flip))}#[derive(Clone, Copy, PartialEq, Eq)]@@ -772,26 +839,7 @@ impl<'b, 'a> Builder<'b, 'a> {}fn shell(&mut self, id: u64) -> R<Vec<(u32, bool)>> {- let e = entity(self.ex, id)?;- let p = e.params();- let (faces, flip) = match e.name() {- "CLOSED_SHELL" | "OPEN_SHELL" => (refs(p.get(1), "shell faces")?, false),- "ORIENTED_CLOSED_SHELL" | "ORIENTED_OPEN_SHELL" => {- let inner = rid(p.get(2), "oriented shell element")?;- let inner_e = entity(self.ex, inner)?;- if !matches!(inner_e.name(), "CLOSED_SHELL" | "OPEN_SHELL") {- return Err(format!("#{inner}: {}", unsupported(format!("shell {}", inner_e.name()))));- }- (refs(inner_e.params().get(1), "shell faces")?, !flag(p.get(3), "oriented shell orientation")?)- }- n => return Err(format!("#{id}: {}", unsupported(format!("shell {n}")))),- };- if faces.is_empty() {- return Err(format!("shell #{id} has no faces"));- }- if faces.len() > MAX_FACES {- return Err(format!("shell #{id} with {} faces", faces.len()));- }+ let (faces, flip) = shell_faces(self.ex, id)?;let mut out = Vec::with_capacity(faces.len());for f in faces {let (face, forward) = self.face(f, 0)?;@@ -1168,10 +1216,12 @@ impl<'b, 'a> Builder<'b, 'a> {// its domain.let natural = surface.natural();// At a pole (where the surface collapses to a point across a direction, to within the- // tolerance, as the pcurves closed the loop there) a loop may jump in that direction: the- // seam's two uses meet there a period apart.+ // tolerance of the vertex the two uses meet at) a loop may jump in that direction: the+ // seam's two uses meet there a period apart, and a side collapsed to within the vertex's+ // tolerance (a corner patch with one side shrunk to a few µm) is run along between them,+ // its boundary iso line. As the record check (`brep::geometry`) takes it.let poles = SurfaceEval::new(&surface).ok();- let at_pole = |uv: [f64; 2]| poles.as_ref().is_some_and(|e| e.pole_within(uv, tol).iter().any(|p| *p));+ let at_pole = |uv: [f64; 2], reach: f64| poles.as_ref().is_some_and(|e| e.pole_within(uv, reach).iter().any(|p| *p));for (l, pc) in edge_loops.iter().zip(&pcs) {let mut ends = Vec::with_capacity(l.len());for (&(_, forward), c) in l.iter().zip(pc) {@@ -1181,7 +1231,11 @@ impl<'b, 'a> Builder<'b, 'a> {}for k in 0..ends.len() {let (Some((start, _)), Some((_, end))) = (ends.get(k), ends.get(if k == 0 { ends.len() - 1 } else { k - 1 })) else { continue };- if at_pole(*start) || at_pole(*end) {+ // The vertex use k starts at, where the one before it ends.+ let &(e, forward) = l.get(k).ok_or("edge use")?;+ let v = self.edges.get(e as usize).ok_or("edge reference")?.vertices[if forward { 0 } else { 1 }];+ let reach = self.vertices.get(v as usize).ok_or("vertex reference")?.tolerance.max(tol);+ if at_pole(*start, reach) || at_pole(*end, reach) {continue;}for d in 0..2 {@@ -1191,7 +1245,21 @@ impl<'b, 'a> Builder<'b, 'a> {continue;}if !((start[d] - end[d]).abs() <= 0.5 * (b - a)) {- return Err(unsupported("a loop across a closed spline surface's seam without a seam edge"));+ // Whether the surface closes across `d` there: its two boundaries meet.+ let ends_at = |x: f64| {+ let mut q = *start;+ q[d] = x;+ poles.as_ref().and_then(|s| s.point(q))+ };+ let closed = matches!((ends_at(*a), ends_at(*b)), (Some(p), Some(q)) if p.dist(q) <= reach);+ return Err(unsupported(if closed {+ "a loop across a closed spline surface's seam without a seam edge".to_string()+ } else {+ format!(+ "a loop that jumps across its spline surface's {} range where the surface neither closes nor collapses to a point",+ if d == 0 { "u" } else { "v" }+ )+ }));}}}