Sketch Trim and Extend: a crossing at a curve's own end is that end, leaving no curve of no length (#9012)
* Sketch Trim: a cut at a curve's own end leaves no piece of no length A curve that ends where another one ends crosses it there only within the intersection's tolerance (1e-6), but bracket dropped cuts at the curve's ends only within 1e-9 of its parameter range. A line ending on an arc's end, trimmed from its other end, was cut a hair inside its own end and kept a piece about 1e-7 mm long (found by a local trim fuzzer: 78 such trims in 4000 sketches, and 8 breaks). bracket now also drops a cut within that tolerance of the curve's ends, as add_cut merges cuts that close together. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Sketch Extend: a touch at an arc's growing end is that end, not a stop An arc whose end is where a line ends that touches the arc's circle there found the touch a hair beyond the end (within the intersection's tolerance), stopped on it, and added an arc from that point to itself. A hit within that tolerance of the growing end (1e-6, as for the far end) is now the end. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -321,8 +321,14 @@ fn bracket(sk: &Sketch, ci: usize, tq: f64) -> (Vec<(f64, Vec2, usize)>, bool) {
|
||||
let (t0, t1) = sh.range();
|
||||
let full = sh.is_full();
|
||||
let span = t1 - t0;
|
||||
let mut cuts: Vec<(f64, Vec2, usize)> =
|
||||
cut_points(sk, ci).into_iter().filter(|(t, _, _)| full || (*t > t0 + 1e-9 * span && *t < t1 - 1e-9 * span)).collect();
|
||||
// A cut within rounding of the curve's own end is that end. A curve ending where another one
|
||||
// ends crosses it there only within the intersection's tolerance, and a cut a hair inside
|
||||
// left a piece of no length. Cuts closer than that to each other are already one (`add_cut`).
|
||||
let ends = if full { Vec::new() } else { vec![sh.point(t0), sh.point(t1)] };
|
||||
let mut cuts: Vec<(f64, Vec2, usize)> = cut_points(sk, ci)
|
||||
.into_iter()
|
||||
.filter(|(t, _, _)| full || (*t > t0 + 1e-9 * span && *t < t1 - 1e-9 * span && ends.iter().all(|e| e.dist(sh.point(*t)) >= TOL * 10.0)))
|
||||
.collect();
|
||||
cuts.sort_by(|a, b| a.0.total_cmp(&b.0));
|
||||
if full {
|
||||
if cuts.len() < 2 {
|
||||
@@ -861,9 +867,10 @@ fn arc_aim(sk: &Sketch, ci: usize, at: Vec2, cmd: &str) -> Result<Option<ArcAim>
|
||||
for piece in &pieces {
|
||||
for q in support::hits(&circle, piece, &mut budget)? {
|
||||
let travel = if at_b { (q - centre).angle() - end_angle } else { end_angle - (q - centre).angle() }.rem_euclid(TAU);
|
||||
// The growing end itself, or past the arc's far end (where the extension would
|
||||
// run over the arc).
|
||||
if travel <= angle_tol || travel > reach + far_tol {
|
||||
// The growing end itself (within the intersection's tolerance: a line ending there
|
||||
// that touches the circle is found a hair beyond it), or past the arc's far end
|
||||
// (where the extension would run over the arc).
|
||||
if travel <= far_tol || travel > reach + far_tol {
|
||||
continue;
|
||||
}
|
||||
keep_stop(&mut best, travel, q, oi, angle_tol);
|
||||
|
||||
@@ -171,6 +171,57 @@ fn trim_extend_break() {
|
||||
assert!(sketch(&s).curve_index(&lone).is_none());
|
||||
}
|
||||
|
||||
/// A line that ends where an arc ends crosses it there only within the intersection's
|
||||
/// tolerance: trimmed from its other end, it was cut a hair inside its own end and left a piece
|
||||
/// about 1e-7 mm long (found by a local trim fuzzer). Nothing else crosses it, so it trims away.
|
||||
#[test]
|
||||
fn trimming_a_line_that_ends_on_an_arc_leaves_no_piece_of_no_length() {
|
||||
let mut s = new_sketch();
|
||||
let l =
|
||||
ids(&run(&mut s, "sketch.line", json!({"points": [[30, 20], [-6.10565359059288, -8.884522872474289]], "infer": false}))["curves"])[0].clone();
|
||||
run(
|
||||
&mut s,
|
||||
"sketch.arc.three_point",
|
||||
json!({"start": [-8.972171771153333, -9.973571767012182], "end": format!("{l}.end"), "through": [-7.4533649085502365, -9.654220170934645]}),
|
||||
);
|
||||
run(&mut s, "sketch.trim", json!({"curve": l, "at": [30.001, 19.999]}));
|
||||
let sk = sketch(&s);
|
||||
for c in &sk.curves {
|
||||
if let Some((a, b)) = c.kind.ends().and_then(|(a, b)| sk.point(a).zip(sk.point(b))) {
|
||||
assert!(a.dist(b) > 1e-6, "{} is left {} mm long: {:?}", c.id, a.dist(b), c.kind);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// An arc rounded into a corner, whose end is also where a line ends that touches the arc's
|
||||
/// circle there: extended from that end, it stopped on the touch at its own end and added an arc
|
||||
/// from that point to itself (found by a local trim fuzzer). The touch is the growing end, not a
|
||||
/// stop.
|
||||
#[test]
|
||||
fn an_arc_extended_from_an_end_a_tangent_line_ends_on_adds_no_arc_of_no_length() {
|
||||
let mut s = new_sketch();
|
||||
for (id, p) in [
|
||||
("sketch.line", json!({"infer": false, "points": [[-20, -20], [-10, 20]]})),
|
||||
("sketch.arc.three_point", json!({"end": [0, 30], "start": [10, 20], "through": [-7, 7]})),
|
||||
("sketch.line", json!({"infer": false, "points": [[-10, -30], [10, 30]]})),
|
||||
("sketch.rectangle.two_point", json!({"p0": [-10, 30], "p1": [20, 0]})),
|
||||
("sketch.arc.three_point", json!({"end": [0, 10], "start": [20, -30], "through": [3, 27]})),
|
||||
("sketch.trim", json!({"at": [2.829281375022314, 26.51870311540471], "curve": "a2"})),
|
||||
("sketch.trim", json!({"at": [-9.999, 29.999], "curve": "l6"})),
|
||||
("sketch.fillet", json!({"point": "p1", "radius": 5})),
|
||||
] {
|
||||
run(&mut s, id, p);
|
||||
}
|
||||
let _ = s.execute("sketch.extend", &json!({"at": [-8.670612547178429, 1.6049962723352929], "curve": "a4"}));
|
||||
let sk = sketch(&s);
|
||||
for c in &sk.curves {
|
||||
if let CurveKind::Arc { a: p, b: q, .. } = c.kind {
|
||||
let (pa, pb) = (sk.point(p).unwrap(), sk.point(q).unwrap());
|
||||
assert!(p != q && pa.dist(pb) > 1e-6, "{} runs from {pa:?} to {pb:?}: {:?}", c.id, c.kind);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn trim_circle_makes_an_arc_and_a_profile() {
|
||||
let mut s = new_sketch();
|
||||
|
||||
Reference in New Issue
Block a user