SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Sketch Fillet: a radius of half a side rounds both its corners (#2500) (#8238)
semmelrinded95b8208b36a
diff --git a/crates/engine/src/cmd/sketch_modify.rs b/crates/engine/src/cmd/sketch_modify.rsindex 5c37aa04f1..99f75564e3 100644--- a/crates/engine/src/cmd/sketch_modify.rs+++ b/crates/engine/src/cmd/sketch_modify.rs@@ -1737,19 +1737,20 @@ fn fillet(s: &mut Session, p: &Value) -> Result<Value> {return Err(bad(cmd, "radius must be positive"));}let pname = doc.new_model_param(&r_expr, "mm");- let (mut arcs, mut cons, mut kept) = (Vec::new(), Vec::new(), Vec::new());+ // The arcs by id: a fillet that takes a whole line removes it, which renumbers the curves.+ let (mut arcs, mut cons, mut kept): (Vec<String>, _, _) = (Vec::new(), Vec::new(), Vec::new());for q in &corners {let (arc, mut c, k) = fillet_corner(sk, q, r, cmd)?;kept.push(k);// One radius for them all: the first carries the dimension, the rest are equal to it.- match arcs.first() {+ match arcs.first().and_then(|first| sk.curve_index(first)) {None => c.push(sk.add_constraint(ConstraintKind::Radius { c: arc, value: r }, Some(pname.clone()))?),- Some(first) => c.push(add_c(sk, ConstraintKind::Equal { a: *first, b: arc })?),+ Some(first) => c.push(add_c(sk, ConstraintKind::Equal { a: first, b: arc })?),}cons.extend(c);- arcs.push(arc);+ arcs.push(sk.curves.get(arc).map(|c| c.id.clone()).unwrap_or_default());}- Ok((ids_of(sk, &arcs), cons, pname, kept_json(kept)))+ Ok((arcs, cons, pname, kept_json(kept)))})?;let (vc, moved) = out.3;Ok(json!({"curves": out.0, "constraints": out.1, "param": out.2, "virtual_corners": vc, "moved_to_virtual_corner": moved, "sketch": info}))@@ -1788,12 +1789,21 @@ fn fillet_corner(sk: &mut Sketch, p: &Value, r: f64, cmd: &str) -> Result<(usizereturn Err(bad(cmd, "the lines are parallel"));}let d = r / half.tan();- if d >= pa.dist(pc) - 1e-9 || d >= pb.dist(pc) - 1e-9 {+ let (len_a, len_b) = (pa.dist(pc), pb.dist(pc));+ // A radius that needs all of a line (the second corner of a side filleted with half its+ // length, #2500): the line goes, and the arc meets what was at its far end.+ let tol = 1e-7 * (1.0 + len_a.max(len_b));+ if d > len_a + tol || d > len_b + tol {return Err(bad(cmd, format!("the radius is too large for that corner (it needs {d:.3} mm of each line)")));}+ let (spent_a, spent_b) = (d >= len_a - tol, d >= len_b - tol);+ // A spent line is cut just short of its far end, and the stub is removed below.+ let short = |len: f64| len - (len * 1e-6).max(1e-6);+ let far_ids = [fa, fb].map(|i| sk.points.get(i).map(|p| p.id.clone()).unwrap_or_default());let bis = (u + v).normalized().ok_or_else(|| bad(cmd, "the lines are parallel"))?;let center = pc + bis * (r / half.sin());- let (ta, tb, _, kept) = cut_corner(sk, la, lb, c, fa, fb, d, d, cmd)?;+ let (da, db) = (if spent_a { short(len_a) } else { d }, if spent_b { short(len_b) } else { d });+ let (ta, tb, _, kept) = cut_corner(sk, la, lb, c, fa, fb, da, db, cmd)?;let (qa, qb) = (sk.point(ta).unwrap_or_default(), sk.point(tb).unwrap_or_default());let ccw = (qa - center).cross(qb - center) > 0.0;let arc = if ccw {@@ -1801,7 +1811,35 @@ fn fillet_corner(sk: &mut Sketch, p: &Value, r: f64, cmd: &str) -> Result<(usize} else {sk.add_arc(center, qb, qa, [None, Some(tb), Some(ta)], None)?};- let cons = vec![add_c(sk, ConstraintKind::Tangent { a: la, b: arc })?, add_c(sk, ConstraintKind::Tangent { a: lb, b: arc })?];+ if !spent_a && !spent_b {+ let cons = vec![add_c(sk, ConstraintKind::Tangent { a: la, b: arc })?, add_c(sk, ConstraintKind::Tangent { a: lb, b: arc })?];+ return Ok((arc, cons, kept));+ }+ let id = |sk: &Sketch, i: usize| sk.curves.get(i).map(|c| c.id.clone()).unwrap_or_default();+ let arc_id = id(sk, arc);+ let mut cons = Vec::new();+ let mut stubs = Vec::new();+ for ((line, t, spent), far_id) in [(la, ta, spent_a), (lb, tb, spent_b)].into_iter().zip(&far_ids) {+ if !spent {+ cons.push(add_c(sk, ConstraintKind::Tangent { a: line, b: arc })?);+ continue;+ }+ let Some(far) = sk.point_index(far_id) else { return Err(bad(cmd, "the line's far end is gone")) };+ // The arc ends where the line did, tangent to the curve that goes on from there.+ if let Some(cu) = sk.curves.get_mut(arc) {+ cu.kind.map_points(&|i| if i == t { far } else { i });+ }+ let next = (0..sk.curves.len()).find(|&i| {+ i != line && i != arc && sk.curves.get(i).is_some_and(|cu| !cu.construction && cu.kind.ends().is_some_and(|(a, b)| a == far || b == far))+ });+ if let Some(n) = next {+ cons.push(add_c(sk, ConstraintKind::Tangent { a: n, b: arc })?);+ }+ stubs.push(id(sk, line));+ }+ let stubs: Vec<usize> = stubs.iter().filter_map(|s| sk.curve_index(s)).collect();+ sk.remove_curves(&stubs);+ let arc = sk.curve_index(&arc_id).ok_or_else(|| bad(cmd, "the fillet arc is gone"))?;Ok((arc, cons, kept))}diff --git a/crates/engine/src/cmd/sketch_modify_tests.rs b/crates/engine/src/cmd/sketch_modify_tests.rsindex 526a70a801..3709924504 100644--- a/crates/engine/src/cmd/sketch_modify_tests.rs+++ b/crates/engine/src/cmd/sketch_modify_tests.rs@@ -708,6 +708,45 @@ fn fillet_and_chamfers() {assert!(s.execute("sketch.fillet", &json!({"a": l[0], "b": l[2], "radius": 1})).is_err(), "no shared corner");}+/// #2500, #5951, #7805: the second fillet of a side with a radius of half its length takes all+/// that is left of the line, so the line goes and the two arcs meet: a 20 × 10 rectangle with+/// r = 5 becomes a slot, a 10 × 10 square a circle.+#[test]+fn fillets_of_half_a_side_meet_and_the_side_goes() {+ for (w, h, area) in [(20.0, 10.0, 10.0 * 10.0 + std::f64::consts::PI * 25.0), (10.0, 10.0, std::f64::consts::PI * 25.0)] {+ let mut s = new_sketch();+ let l = ids(&run(&mut s, "sketch.rectangle.two_point", json!({"p0": [0, 0], "p1": [w, h]}))["curves"]);+ let mut last = Value::Null;+ for k in 0..4 {+ last = run(&mut s, "sketch.fillet", json!({"a": l[k], "b": l[(k + 1) % 4], "radius": 5}));+ }+ assert_eq!(last["sketch"]["solved"], true, "{last}");+ let sk = sketch(&s);+ let lines = sk.curves.iter().filter(|c| !c.construction && matches!(c.kind, CurveKind::Line { .. })).count();+ let arcs = sk.curves.iter().filter(|c| matches!(c.kind, CurveKind::Arc { .. })).count();+ assert_eq!((lines, arcs), (if w > h { 2 } else { 0 }, 4), "{w} x {h}");+ let a = profiles(&s);+ assert_eq!(a.len(), 1, "{a:?}");+ assert!(close(a[0], area), "{w} x {h}: {a:?}");+ }+ // All four corners in one call: the arcs keep one radius dimension and equal constraints+ // although the short sides go in between.+ let mut s = new_sketch();+ run(&mut s, "sketch.rectangle.two_point", json!({"p0": [0, 0], "p1": [20, 10]}));+ let f = run(&mut s, "sketch.fillet", json!({"points": ["l1.start", "l1.end", "l2.end", "l3.end"], "radius": 5}));+ assert_eq!(ids(&f["curves"]).len(), 4, "{f}");+ assert_eq!(f["sketch"]["solved"], true, "{f}");+ let a = profiles(&s);+ assert!(a.len() == 1 && close(a[0], 100.0 + std::f64::consts::PI * 25.0), "{a:?}");+ let equal = sketch(&s).constraints.iter().filter(|c| matches!(c.kind, ConstraintKind::Equal { .. })).count();+ assert!(equal >= 3, "the arcs stay equal to the first: {equal}");+ // A radius past the line's length is still refused.+ let mut s = new_sketch();+ let l = ids(&run(&mut s, "sketch.rectangle.two_point", json!({"p0": [0, 0], "p1": [20, 10]}))["curves"]);+ run(&mut s, "sketch.fillet", json!({"a": l[0], "b": l[1], "radius": 5}));+ assert!(s.execute("sketch.fillet", &json!({"a": l[1], "b": l[2], "radius": 5.1})).is_err());+}+#[test]fn offset_chain_mirror_patterns_move_scale() {let mut s = new_sketch();