diff --git a/crates/engine/src/cmd/sketch.rs b/crates/engine/src/cmd/sketch.rs index 63f827732..d8d3f247e 100644 --- a/crates/engine/src/cmd/sketch.rs +++ b/crates/engine/src/cmd/sketch.rs @@ -2513,9 +2513,11 @@ fn move_point(s: &mut Session, p: &Value) -> Result { let cmd = "sketch.move_point"; let to = req_vec2(cmd, p, "to")?; let id = target_sketch(s, p, cmd)?; + let state = s.model.result(id).map(|r| r.state.clone()); + let last = state.as_ref().and_then(|state| state.sketch(id)); let (_, rep) = edit_solved(s, id, false, Analysis::Freedom, |sk, _| { let q = point_ref(sk, p.get("point"), cmd, "point")?; - Ok(((), drag_entity(sk, Ent::Point(q), &[], to, to, false).1.solve_again())) + Ok(((), drag_entity(sk, Ent::Point(q), &[], to, to, false, last).1.solve_again())) })?; Ok(json!({"sketch": rep.as_ref().map(report_json)})) } @@ -2538,7 +2540,8 @@ fn drag_frame(s: &mut Session, p: &Value, live: bool) -> Result<(Value, Option Result<(Value, Option Result<(Value, Option (Dragged, Left) { +/// +/// `solved`: the sketch as last evaluated. When it is unchanged and solved, a grabbed entity it +/// determined is not dragged. +pub(super) fn drag_entity( + sk: &mut Sketch, + e: Ent, + with: &[Ent], + from: Vec2, + to: Vec2, + live: bool, + solved: Option<&solidcraft_doc::SolvedSketch>, +) -> (Dragged, Left) { + // An unchanged, solved entity with no freedom cannot follow a drag. Holding it at a + // different position only makes its constraints conflict, and a large pattern would spend + // minutes trying dense solves before returning to the same geometry (#2006). + if solved.is_some_and(|ss| { + ss.report.ok() + && ss.sketch == *sk + && match e { + Ent::Point(q) => ss.report.point_determined.get(q), + Ent::Curve(c) => ss.report.curve_determined.get(c), + } + .copied() + .unwrap_or(false) + }) { + return (Dragged::default(), Left::Solved); + } let Some((path, hold, n, short)) = prepare(sk, e, with, from, to) else { return (Dragged::default(), Left::Unsolved); }; diff --git a/crates/engine/src/cmd/sketch_drag_live_tests.rs b/crates/engine/src/cmd/sketch_drag_live_tests.rs index 1cd021c6c..d55ea6fde 100644 --- a/crates/engine/src/cmd/sketch_drag_live_tests.rs +++ b/crates/engine/src/cmd/sketch_drag_live_tests.rs @@ -7,6 +7,52 @@ use solidcraft_geom::Vec3; use super::solve_counts; use crate::Session; +#[test] +fn determined_pattern_geometry_does_not_attempt_conflicting_held_solves() { + let mut s = Session::default(); + run(&mut s, "sketch.create", json!({"plane": "XY"})); + run(&mut s, "sketch.rectangle.two_point", json!({"p0": [5, 5], "p1": [6.5, 6.5]})); + run(&mut s, "sketch.dimension", json!({"entities": ["l1"], "value": 1.5})); + run(&mut s, "sketch.dimension", json!({"entities": ["l2"], "value": 1.5})); + run(&mut s, "sketch.constraint.fix", json!({"entities": ["l1.start"]})); + let pattern = run( + &mut s, + "sketch.pattern.rectangular", + json!({"entities": ["l1", "l2", "l3", "l4"], "count": 3, "count2": 3, "spacing": 2.2, "spacing2": -2.2}), + ); + let line = pattern["curves"][0].as_str().expect("a patterned line"); + let endpoint = format!("{line}.start"); + let before = sketch_of(&s); + assert!(!before.curve_locked(before.curve_index(line).expect("patterned line index"))); + for entity in [line, endpoint.as_str()] { + for live in [true, false] { + reset(&mut s); + let result = run(&mut s, "sketch.drag", json!({"entity": entity, "from": [5, 5], "to": [9, 12], "live": live})); + assert_eq!(result["reached"], json!(0.0)); + assert_eq!(result["at"], json!([5.0, 5.0])); + assert_eq!(result["sketch"]["solved"], json!(true)); + let full = usize::from(!live); + assert_eq!(solve_counts::take(), (full, full), "no held solve for determined geometry"); + assert_eq!(sketch_of(&s), before); + } + } + reset(&mut s); + run(&mut s, "sketch.move_point", json!({"point": endpoint, "to": [9, 12]})); + assert_eq!(solve_counts::take(), (1, 1), "move_point also skips held solves"); + assert_eq!(sketch_of(&s), before); + + // A cached determined report must not suppress an outstanding dimension edit. + let dimension = before + .constraints + .iter() + .find(|c| matches!(c.kind, solidcraft_sketch::ConstraintKind::Length { l: 0, .. })) + .and_then(|c| c.param.as_ref()) + .expect("the first line's dimension"); + s.doc_mut().params.iter_mut().find(|p| &p.name == dimension).expect("dimension parameter").expr = "3".into(); + run(&mut s, "sketch.drag", json!({"entity": line, "from": [5, 5], "to": [9, 12], "live": true})); + assert!((pt(&s, "l1.start").dist(pt(&s, "l1.end")) - 3.0).abs() < 1e-6); +} + fn run(s: &mut Session, id: &str, p: Value) -> Value { match s.execute(id, &p) { Ok(v) => v,