From f3f87521536b92a9bebc71859c0ceae83d1e7b02 Mon Sep 17 00:00:00 2001 From: jyviko <2501648+jyviko@users.noreply.github.com> Date: Mon, 2 Nov 2026 20:18:03 -0500 Subject: [PATCH] Move the solidcore pin to 8ddce9016; its new fixes on, fillet_keep_features released solidcore main at 8ddce9016 adds cone_unbounded_parameterized_as_nurb, ellipse_open_arc_keeps_end_angle (solidcore#2422), fillet_round_as_definition, fillet_round_on_round_as_definition, fillet_overflow_crease_along_edge, plane_first_torus_section_exact, keep_exact_pcurves and shell_one_construction (solidcore#2367), and drops fillet_extended_rail_end_at_side_edge_crossing. Every one is on. fillet_keep_features is no longer held back: solidcore#2374 fixes the round beside a boss it refused (solidcore#2370). Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/smlib/src/core.rs | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4ce06692..3c56a490c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4054,7 +4054,7 @@ dependencies = [ [[package]] name = "solidcore" version = "1.0.1" -source = "git+https://github.com/tangency-labs/solidcore?rev=97ed188db41d15238d81542a0b86bf7504cbc40f#97ed188db41d15238d81542a0b86bf7504cbc40f" +source = "git+https://github.com/tangency-labs/solidcore?rev=8ddce901671f1cebd9214a31d21895d725e886c8#8ddce901671f1cebd9214a31d21895d725e886c8" dependencies = [ "thiserror 2.0.21", ] diff --git a/Cargo.toml b/Cargo.toml index 1d21fe9c0..ba1c4ab17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ solidcraft-3dx-client = { path = "crates/threedx-client" } # move the rev on its own commit. For a # local checkout, add `[patch."https://github.com/tangency-labs/solidcore"] solidcore = { path = # "../solidcore/crates/solidcore" }` to a `.cargo/config.toml` outside the repository. -solidcore = { git = "https://github.com/tangency-labs/solidcore", rev = "97ed188db41d15238d81542a0b86bf7504cbc40f" } +solidcore = { git = "https://github.com/tangency-labs/solidcore", rev = "8ddce901671f1cebd9214a31d21895d725e886c8" } # test tooling: a dev-dependency only (xtask/src/layers.rs) solidcraft-testkit = { path = "crates/testkit" } diff --git a/crates/smlib/src/core.rs b/crates/smlib/src/core.rs index 8abde02de..ed0988fed 100644 --- a/crates/smlib/src/core.rs +++ b/crates/smlib/src/core.rs @@ -364,7 +364,6 @@ pub(crate) fn fixes() -> UpstreamFixes { f.cone_create_canonical_preserves_inside_out_and_checks_height = true; f.point_class_gap_3d_propagates_no_drop_error = true; f.fillet_surface_plane_curve_on_plane_equation = true; - f.fillet_extended_rail_end_at_side_edge_crossing = true; f.fillet_gn_section_generator = true; f.face_trim_curves_kept_where_exact = true; f.swap_uv_keeps_analytic_definition = true; @@ -375,13 +374,20 @@ pub(crate) fn fixes() -> UpstreamFixes { f.fillet_overflow_trim_at_creases = true; f.fillet_section_end_trim_at_creases = true; f.fillet_refuse_mixed_corner_crossing_rails = true; - // Held back: see `HELD_BACK`. - f.fillet_keep_features = false; + f.fillet_keep_features = true; f.fillet_blend_corner = true; f.fillet_exact_arc_sections = true; f.fillet_exact_arc_spans = true; // Held back: see `HELD_BACK`. f.fillet_refuse_rounds_breaking_through = false; + f.cone_unbounded_parameterized_as_nurb = true; + f.ellipse_open_arc_keeps_end_angle = true; + f.fillet_round_as_definition = true; + f.fillet_round_on_round_as_definition = true; + f.fillet_overflow_crease_along_edge = true; + f.plane_first_torus_section_exact = true; + f.keep_exact_pcurves = true; + f.shell_one_construction = true; f } @@ -399,13 +405,8 @@ pub(crate) fn fixes() -> UpstreamFixes { /// 324-fillet-over-hole-cut-by-overlong-cylinder, 324-fillet-over-hole-overlap, /// 5158-fillet-adjacent-plate-edges-as-thick-as-plate and the sloped and equal-slope basin rims of /// #1080 and #5835. A fix under the same flag is in progress on solidcore. -/// -/// `fillet_keep_features` (WR-703, solidcore#2287): sound geometry refused. A 30 x 20 x 8 block -/// with an r 6 boss joined on its top, its front top edge rounded r 3 (a band clear of the boss), -/// is refused with SM_ERR_INVALID_INPUT; off it builds 6099.225530 mm³, its closed form, as the -/// C++ fork does (solidcore#2370; ui-egui's `opening_a_large_design_never_stalls_the_window`). #[cfg(test)] -const HELD_BACK: &[&str] = &["fillet_keep_features", "fillet_refuse_rounds_breaking_through"]; +const HELD_BACK: &[&str] = &["fillet_refuse_rounds_breaking_through"]; fn fresh() -> Kernel { let mut k = Kernel::new(&KernelOptions::default());