From 32ca22cf6dcd6df7249f885ae459ef1517bd6c99 Mon Sep 17 00:00:00 2001 From: jyviko <2501648+jyviko@users.noreply.github.com> Date: Thu, 29 Oct 2026 02:36:54 -0400 Subject: [PATCH] Wave 323/509: Blend tests: a vertical round run on up a top round's end arc (ladder 07-fillets/018) is SMLib's to end, and builds (and 3 more) 4 commits, squashed; the originals stay reachable from tag archive/merge-main-develop. - 60f33f6fc jyviko: Feature walks: Repair Part has its fixture, its gap an input and its body renamed with the rest - 075f307bf jyviko: UI tests: a shown dimension that breaks a later feature does it with a shell left no room - 242bbc89f jyviko: Fillet rig: the known-failing list follows the SMLib 7e917f0 pin - 8515dc1a3 jyviko: Blend tests: a vertical round run on up a top round's end arc (ladder 07-fillets/018) is SMLib's to end, and builds Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ --- crates/doc/src/feature_walk_tests/fixtures.rs | 1 + .../src/feature_walk_tests/golden_exprs.txt | 4 ++++ .../feature_walk_tests/golden_geometry.txt | 1 + .../src/feature_walk_tests/golden_refs.txt | 2 ++ crates/kernel/src/blend_smlib.rs | 19 ++++++++++++++++--- .../ui-egui/src/dimension_create_ui_tests.rs | 16 +++++++++------- tests/kernel-cases/fillets/KNOWN_FAILING | 13 ++----------- 7 files changed, 35 insertions(+), 21 deletions(-) diff --git a/crates/doc/src/feature_walk_tests/fixtures.rs b/crates/doc/src/feature_walk_tests/fixtures.rs index 3d52ce028..2469c78f7 100644 --- a/crates/doc/src/feature_walk_tests/fixtures.rs +++ b/crates/doc/src/feature_walk_tests/fixtures.rs @@ -231,6 +231,7 @@ pub(super) fn fixtures() -> Vec<(&'static str, Value)> { ("import", json!({"type": "import", "file": "a.step", "step": ""})), ("mesh_convert", json!({"type": "mesh_convert", "body": "B", "tolerance": "mesh_convert.tolerance"})), ("mesh_import", json!({"type": "mesh_import", "file": "a.stl", "meshes": []})), + ("repair", json!({"type": "repair", "body": "B", "gap": "repair.gap", "patch_holes": true})), ] } diff --git a/crates/doc/src/feature_walk_tests/golden_exprs.txt b/crates/doc/src/feature_walk_tests/golden_exprs.txt index 43da6a37f..5ec3fb98d 100644 --- a/crates/doc/src/feature_walk_tests/golden_exprs.txt +++ b/crates/doc/src/feature_walk_tests/golden_exprs.txt @@ -428,3 +428,7 @@ mesh_convert Tolerance = mesh_convert.tolerance (Length) expressions: mesh_convert.tolerance mesh_import +repair + inputs: + Gap = repair.gap (Length) + expressions: repair.gap diff --git a/crates/doc/src/feature_walk_tests/golden_geometry.txt b/crates/doc/src/feature_walk_tests/golden_geometry.txt index 30add0647..6a04464bb 100644 --- a/crates/doc/src/feature_walk_tests/golden_geometry.txt +++ b/crates/doc/src/feature_walk_tests/golden_geometry.txt @@ -207,3 +207,4 @@ move import mesh_convert mesh_import +repair diff --git a/crates/doc/src/feature_walk_tests/golden_refs.txt b/crates/doc/src/feature_walk_tests/golden_refs.txt index 48bc04e7f..f24d1e402 100644 --- a/crates/doc/src/feature_walk_tests/golden_refs.txt +++ b/crates/doc/src/feature_walk_tests/golden_refs.txt @@ -238,3 +238,5 @@ import mesh_convert remap_bodies: body mesh_import +repair + remap_bodies: body diff --git a/crates/kernel/src/blend_smlib.rs b/crates/kernel/src/blend_smlib.rs index 0dfb74066..f7747e37f 100644 --- a/crates/kernel/src/blend_smlib.rs +++ b/crates/kernel/src/blend_smlib.rs @@ -608,9 +608,11 @@ mod tests { assert!(imp::blend(&b, "fillet", Kind::Round, &[], &[]).is_err()); } - /// A smooth edge (a round's seam with the face it runs into) has nothing to round, and an - /// edge that runs on tangentially into one left out has no end SMLib can blend: both are - /// refused before SMLib, saying so. Rounded with its tangent chain the edge builds. + /// A smooth edge (a round's seam with the face it runs into) has nothing to round: refused + /// before SMLib, saying so. An edge that runs on tangentially into one left out is SMLib's to + /// end: where it cannot (the end face's top edge into the round's end arc) the refusal says + /// why, and rounded with its tangent chain the edge builds; where it can (a vertical edge run + /// on up a top round's end arc into the corner, ladder 07-fillets/018) it builds. #[test] fn smooth_edges_and_unfinished_tangent_chains_are_refused_saying_why() { let b = cube(); @@ -626,5 +628,16 @@ mod tests { assert!(chain.len() > 1, "{chain:?}"); let whole = fillet(&rounded, &chain, 1.0).unwrap(); assert!(volume(&whole) < volume(&rounded)); + + // r5 and r3 on two top edges at a corner, then r2 on the vertical edge under them: it + // runs on up the r5 round's end arc, and SMLib ends it there + let b = box_solid(Vec3::new(0.0, 0.0, 0.0), Vec3::new(60.0, 40.0, 20.0)).unwrap(); + let b = fillet(&b, &[Vec3::new(30.0, 40.0, 20.0)], 5.0).unwrap(); + let b = fillet(&b, &[Vec3::new(60.0, 20.0, 20.0)], 3.0).unwrap(); + let vertical = Vec3::new(60.0, 40.0, 8.0); + let chain = crate::tangent_chain(&b, &[vertical]).unwrap(); + assert!(chain.len() > 1, "{chain:?}"); + let run_on = fillet(&b, &[vertical], 2.0).unwrap(); + assert!(volume(&run_on) < volume(&b)); } } diff --git a/crates/ui-egui/src/dimension_create_ui_tests.rs b/crates/ui-egui/src/dimension_create_ui_tests.rs index ad5d749db..79819bd3c 100644 --- a/crates/ui-egui/src/dimension_create_ui_tests.rs +++ b/crates/ui-egui/src/dimension_create_ui_tests.rs @@ -1248,15 +1248,17 @@ fn a_driven_shown_dimension_is_read_only() { assert_eq!(h.app.session.doc.to_json(), doc); } -/// The value applies like any other change: the fillet it breaks reports its error on the -/// timeline, and Undo brings back the value and the fillet. +/// The value applies like any other change: the shell it breaks reports its error on the +/// timeline, and Undo brings back the value and the shell. The plate's 10 width taken to 3 leaves +/// no room inside two 2 thick walls. (A round wider than its face no longer breaks: a convex +/// round runs over the face's far edge, cut as if the face went on.) #[test] fn a_shown_dimension_that_breaks_a_later_feature_reports_it_and_undoes() { let (mut h, _) = shown_dimensions(); - h.app.run("solid.fillet", json!({"edges":[[10,10,5]],"radius":4,"name":"Round"})).unwrap(); + h.app.run("solid.shell", json!({"faces":[[10,1,5]],"thickness":2,"name":"Hollow"})).unwrap(); h.settle(); - let round = h.app.session.doc.features.iter().find(|f| f.name == "Round").unwrap().id; - let failed = |h: &Harness| h.app.session.model.result(round).is_some_and(|r| r.error.is_some()); + let hollow = h.app.session.doc.features.iter().find(|f| f.name == "Hollow").unwrap().id; + let failed = |h: &Harness| h.app.session.model.result(hollow).is_some_and(|r| r.error.is_some()); assert!(!failed(&h)); let before = h.app.session.doc.to_json(); let at = model_text(&h, "d2"); @@ -1265,10 +1267,10 @@ fn a_shown_dimension_that_breaks_a_later_feature_reports_it_and_undoes() { h.step(&json!({"key":"Enter"})).unwrap(); h.settle(); assert_eq!(h.app.session.doc.param("d2").unwrap().expr, "3"); - assert!(failed(&h), "the fillet no longer fits and says so"); + assert!(failed(&h), "the shell no longer has room and says so"); assert_eq!(h.app.session.active_sketch, None); h.app.run("edit.undo", json!({})).unwrap(); h.settle(); assert_eq!(h.app.session.doc.to_json(), before); - assert!(!failed(&h), "undo brings the fillet back"); + assert!(!failed(&h), "undo brings the shell back"); } diff --git a/tests/kernel-cases/fillets/KNOWN_FAILING b/tests/kernel-cases/fillets/KNOWN_FAILING index d951af422..17646555d 100644 --- a/tests/kernel-cases/fillets/KNOWN_FAILING +++ b/tests/kernel-cases/fillets/KNOWN_FAILING @@ -1,21 +1,12 @@ # The fillet cases that fail today, one a line: ` `. Sorted. The fillet # rig gate (.github/workflows/fillet-rig.yml) fails on a case that fails and is not listed here, # and on a listed case that passes: a fix removes its line in the same pull request. -# Baseline: develop 30dc4c860 (SMLib 5afca53), aarch64 Linux, 2026-10-28: 71 of 89 pass. -1207-fillet-bar-top-edge-after-boss-arc-round-no-tangent-chain SMLib status 1001 instead of the "continues tangentially" refusal (refused before SMLib on branch fillet-remaining-cases) +# Baseline: develop 229739a70 (SMLib 7e917f0), aarch64 Linux, 2026-10-29. 1207-fillet-bar-top-edge-after-boss-arc-round-r0-5 SMLib's check refuses the round: internal coincident control points in a B-spline curve (an internal pole) -1207-fillet-bar-top-edge-and-boss-arc-together continuity g0: the corner patch meets the bar's round with a 15.6° crease -1207-fillet-bar-top-edge-and-boss-arc-together-curvature-corners continuity g0: the corner patch meets the bar's round with a 15.6° crease (as the rolling corner) -1207-fillet-bar-top-edge-and-boss-arc-together-r1 continuity g0: the corner patch meets the bar's round with a 13.1° crease -1207-fillet-bar-top-edge-and-boss-arc-together-reduce-fit continuity g0: the corner patch meets the bar's round with a 15.6° crease (as the exact fit) -1207-fillet-bar-top-edge-and-boss-arc-together-taper-fit continuity g0: the corner patch meets the bar's round with a 15.6° crease (as the exact fit) -1207-fillet-box-end-edge-into-unblended-round-refused SMLib status 1001 instead of the "continues tangentially" refusal (refused before SMLib on branch fillet-remaining-cases) -1390-chamfer-hole-rim-touching-bottom SMLib status 1001 instead of naming the unsupported corner (SMLIB_ERR_CORNER_UNSUPPORTED on branch fillet-open-cases) +1557-fillet-vertical-corners-after-bottom-rounds SMLib status 1001 since bodies are read back from their records (#8625): the bottom rounds come back as SmCylinder where SMLib's blend made SmCone(0), and the corner-ball trace starts 2.78e-4 off 4782-fillet-bar-edge-wider-than-both-faces SMLib status 1001: a convex round past both its faces is not yet built by subtraction 4782-fillet-two-end-verticals-past-a-full-round SMLib's result is not a closed solid, where a refusal naming 7.5 mm (fillet_max for the exact fit) is right -4782-fillet-two-end-verticals-past-a-full-round-reduce-fit SMLib's result is not a closed solid at r10, so the reduce fit never searches down 5158-fillet-round-just-past-a-10mm-face SMLib status 1001: a convex round 0.01 past its face is not yet built by subtraction (10.0001-10.04 open) -896-fillet-smooth-seam-refused SMLib SM_ERR_INVALID_INPUT instead of the "is smooth" refusal (refused before SMLib on branch fillet-remaining-cases) 9-fillet-corner-curvature-with-reduce-fit not supported yet: solid.fillet builds corner g2 with the exact fit only 9-fillet-corner-curvature-with-taper-fit not supported yet: solid.fillet builds corner g2 with the exact fit only 9-fillet-corner-r1-curvature-default-setback continuity g1: the g2 corner patch seams G1 at the corner point, not G2