Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

fix(examples): cut both mounting holes in the bracket (#1515)

Victor Santos Oliveira6f93e7a851bb
diff --git a/apps/solidcraft-cli/tests/bracket_example.rs b/apps/solidcraft-cli/tests/bracket_example.rs
new file mode 100644
index 0000000000..8056a87868
--- /dev/null
+++ b/apps/solidcraft-cli/tests/bracket_example.rs
@@ -0,0 +1,62 @@
+//! The bracket example must cut two through holes, rather than successfully cutting empty
+//! space beside the body. Check the shipped script and rebuild its saved design from scratch.
+
+use std::f64::consts::PI;
+
+use serde_json::Value;
+use solidcraft_engine::geom::Vec3;
+use solidcraft_engine::{Session, io, kernel};
+
+fn assert_two_through_holes(session: &Session, stage: &str) {
+ let errors: Vec<_> = session.model.results.iter().filter_map(|r| r.error.as_ref().map(|e| (&r.name, e))).collect();
+ assert!(errors.is_empty(), "{stage}: every example feature evaluates: {errors:?}");
+
+ let cut = session.doc.features.last().expect("the example ends with the hole cut");
+ let before = session.model.state_before(cut.id);
+ let after = session.model.state();
+ assert_eq!(before.bodies.len(), 1, "{stage}: one bracket before cutting the holes");
+ assert_eq!(after.bodies.len(), 1, "{stage}: the holes leave one bracket");
+ let uncut = &before.body("Bracket").expect("the uncut bracket").body;
+ let bracket = &after.body("Bracket").expect("the finished bracket").body;
+
+ // Measure the actual state before the final cut so the existing edge fillet cancels out.
+ // Both holes have diameter 8 mm and pass through the 6 mm base. Kernel measurements are
+ // tessellated, so the relative tolerance applies to the removed material, not the body.
+ let removed = kernel::measure(uncut).unwrap().volume - kernel::measure(bracket).unwrap().volume;
+ let expected = 2.0 * PI * 4.0_f64.powi(2) * 6.0;
+ assert!((removed - expected).abs() < expected * 1e-3, "{stage}: the two holes remove {removed} mm³, expected {expected} mm³");
+
+ let before_mesh = uncut.tessellate(0.01).unwrap();
+ let after_mesh = bracket.tessellate(0.01).unwrap();
+ let down = Vec3::new(0.0, 0.0, -1.0);
+ for y in [-15.0, -45.0] {
+ let center = Vec3::new(25.0, y, 1.0);
+ assert_eq!(before_mesh.ray_crossings(center, down), 2, "{stage}: hole at y={y} starts over the solid base");
+ // Rays through each opening must miss the entire bracket, including its top and
+ // bottom caps. Points away from the centre guard against a narrow slit or shifted cut.
+ for (dx, dy) in [(0.0, 0.0), (3.0, 0.0), (-3.0, 0.0), (0.0, 3.0), (0.0, -3.0)] {
+ let ray = center + Vec3::new(dx, dy, 0.0);
+ assert_eq!(after_mesh.ray_crossings(ray, down), 0, "{stage}: the hole at y={y} is open through both caps at ({dx}, {dy})");
+ }
+ // Material just outside each radius remains, so neither opening is an edge notch.
+ for (dx, dy) in [(5.0, 0.0), (-5.0, 0.0), (0.0, 5.0), (0.0, -5.0)] {
+ let ray = center + Vec3::new(dx, dy, 0.0);
+ assert_eq!(after_mesh.ray_crossings(ray, down), 2, "{stage}: material remains around the hole at y={y}, offset ({dx}, {dy})");
+ }
+ }
+}
+
+#[test]
+fn bracket_example_cuts_two_through_holes_and_reopens() {
+ let script: Value = serde_json::from_str(include_str!("../../../examples/bracket.json")).unwrap();
+ let mut session = Session::default();
+ session.run_script(&script).unwrap();
+ assert_two_through_holes(&session, "script");
+
+ // No geometry cache is supplied: reopening the container re-evaluates the saved timeline.
+ let saved = io::write_design_container(&session.doc).unwrap();
+ let document = io::read_design(&saved).unwrap();
+ assert_eq!(document.features, session.doc.features, "saving preserves the example's feature parameters");
+ let reopened = Session::new(document);
+ assert_two_through_holes(&reopened, "reopened");
+}
diff --git a/examples/bracket.json b/examples/bracket.json
index 752df039ae..413346d3b2 100644
--- a/examples/bracket.json
+++ b/examples/bracket.json
@@ -7,8 +7,8 @@
{"command": "solid.extrude", "params": {"distance": "width", "direction": "negative", "body_name": "Bracket"}},
{"command": "solid.fillet", "params": {"edges": [[40, -30, -6]], "radius": 2}},
{"command": "sketch.create", "params": {"plane": "XY", "name": "Holes"}},
- {"command": "sketch.circle.center", "params": {"center": [25, 15], "diameter": 8}},
- {"command": "sketch.circle.center", "params": {"center": [25, 45], "diameter": 8}},
+ {"command": "sketch.circle.center", "params": {"center": [25, -15], "diameter": 8}},
+ {"command": "sketch.circle.center", "params": {"center": [25, -45], "diameter": 8}},
{"command": "sketch.finish", "params": {}},
- {"command": "solid.extrude", "params": {"distance": "thickness", "operation": "cut"}}
+ {"command": "solid.extrude", "params": {"distance": "thickness", "direction": "negative", "operation": "cut"}}
]}
diff --git a/tests/action_matrix/baseline.json b/tests/action_matrix/baseline.json
index 3baf01a743..15b924f143 100644
--- a/tests/action_matrix/baseline.json
+++ b/tests/action_matrix/baseline.json
@@ -2688,6 +2688,10 @@
"Bracket/F2:side:a|F2:side:b": "edge.axis edge.chamfer edge.chamfer+edit edge.fillet edge.normal_plane edge.project",
"Bracket/F2:side:a|F2:side:f": "edge.axis edge.chamfer edge.fillet edge.fillet+edit edge.normal_plane edge.normal_plane+edit edge.project",
"Bracket/F2:side:a|F2:start": "edge.axis edge.axis+edit edge.chamfer edge.fillet edge.normal_plane edge.project",
+ "Bracket/F2:side:a|F5:side:c1#1": "edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
+ "Bracket/F2:side:a|F5:side:c1#2": "edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
+ "Bracket/F2:side:a|F5:side:c2#1": "edge.chamfer edge.fillet edge.normal_plane edge.project",
+ "Bracket/F2:side:a|F5:side:c2#2": "edge.chamfer edge.fillet edge.normal_plane edge.project",
"Bracket/F2:side:b": "face.angle_plane !face.draft_neutral face.extrude face.hole face.hole+edit face.midplane face.offset_plane face.press_pull face.shell face.sketch face.sketch+edit",
"Bracket/F2:side:b|F2:start": "edge.axis edge.chamfer edge.fillet edge.fillet+edit edge.normal_plane edge.project",
"Bracket/F2:side:b|F3:blend:F2:side:b|F2:side:c": "edge.axis edge.normal_plane edge.project",
@@ -2695,6 +2699,10 @@
"Bracket/F2:side:c|F2:side:d": "edge.axis edge.chamfer edge.chamfer+edit edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
"Bracket/F2:side:c|F2:start": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.project edge.project+edit",
"Bracket/F2:side:c|F3:blend:F2:side:b|F2:side:c": "edge.axis edge.normal_plane edge.project",
+ "Bracket/F2:side:c|F5:side:c1#1": "edge.chamfer edge.fillet edge.fillet+edit edge.normal_plane edge.normal_plane+edit edge.project",
+ "Bracket/F2:side:c|F5:side:c1#2": "edge.chamfer edge.fillet edge.fillet+edit edge.normal_plane edge.normal_plane+edit edge.project",
+ "Bracket/F2:side:c|F5:side:c2#1": "edge.chamfer edge.fillet edge.normal_plane edge.project edge.project+edit",
+ "Bracket/F2:side:c|F5:side:c2#2": "edge.chamfer edge.fillet edge.normal_plane edge.project edge.project+edit",
"Bracket/F2:side:d": "face.angle_plane !face.draft_neutral face.extrude face.hole face.hole+edit face.midplane face.midplane+edit face.offset_plane face.press_pull face.shell face.sketch",
"Bracket/F2:side:d|F2:side:e": "edge.axis edge.chamfer edge.fillet edge.normal_plane edge.normal_plane+edit edge.project",
"Bracket/F2:side:d|F2:start": "edge.axis edge.chamfer edge.fillet edge.fillet+edit edge.normal_plane edge.project",
@@ -2706,6 +2714,10 @@
"Bracket/F2:start": "face.angle_plane !face.draft_neutral face.extrude face.hole face.offset_plane face.press_pull face.shell face.sketch",
"Bracket/F2:start|F3:blend:F2:side:b|F2:side:c": "edge.chamfer edge.fillet edge.normal_plane edge.project",
"Bracket/F3:blend:F2:side:b|F2:side:c": "curved.axis curved.tangent_plane",
+ "Bracket/F5:side:c1#1": "curved.axis curved.tangent_plane",
+ "Bracket/F5:side:c1#2": "curved.axis curved.tangent_plane",
+ "Bracket/F5:side:c2#1": "curved.axis curved.tangent_plane",
+ "Bracket/F5:side:c2#2": "curved.axis curved.tangent_plane",
"Bracket/body": "body.copy body.mirror body.move body.pattern",
"Bracket/v[F2:bottom & F2:side:a & F2:side:b]": "vertex.plane_three_points vertex.point vertex.point+edit",
"Bracket/v[F2:bottom & F2:side:a & F2:side:f]": "vertex.plane_three_points vertex.point",
@@ -2716,9 +2728,17 @@
"Bracket/v[F2:bottom & F2:side:e & F2:side:f]": "vertex.plane_three_points vertex.point",
"Bracket/v[F2:side:a & F2:side:b & F2:start]": "vertex.plane_three_points vertex.point",
"Bracket/v[F2:side:a & F2:side:f & F2:start]": "vertex.plane_three_points vertex.plane_three_points+edit vertex.point",
+ "Bracket/v[F2:side:a & F5:side:c1#1 & F5:side:c1#2]": "vertex.point",
+ "Bracket/v[F2:side:a & F5:side:c1#1 & F5:side:c1#2] (2)": "vertex.point",
+ "Bracket/v[F2:side:a & F5:side:c2#1 & F5:side:c2#2]": "vertex.point",
+ "Bracket/v[F2:side:a & F5:side:c2#1 & F5:side:c2#2] (2)": "vertex.point",
"Bracket/v[F2:side:b & F2:start & F3:blend:F2:side:b|F2:side:c]": "vertex.plane_three_points vertex.point",
"Bracket/v[F2:side:c & F2:side:d & F2:start]": "vertex.plane_three_points vertex.point",
"Bracket/v[F2:side:c & F2:start & F3:blend:F2:side:b|F2:side:c]": "vertex.plane_three_points vertex.point",
+ "Bracket/v[F2:side:c & F5:side:c1#1 & F5:side:c1#2]": "vertex.point",
+ "Bracket/v[F2:side:c & F5:side:c1#1 & F5:side:c1#2] (2)": "vertex.point",
+ "Bracket/v[F2:side:c & F5:side:c2#1 & F5:side:c2#2]": "vertex.point",
+ "Bracket/v[F2:side:c & F5:side:c2#1 & F5:side:c2#2] (2)": "vertex.point",
"Bracket/v[F2:side:d & F2:side:e & F2:start]": "vertex.plane_three_points vertex.plane_three_points+edit vertex.point",
"Bracket/v[F2:side:e & F2:side:f & F2:start]": "vertex.plane_three_points vertex.point",
"design": "load"