bherbruckandClaude Opus 5.5
296683229d
* WIP deep rename (not for push) * WIP2 * WIP3 * WIP4 wxs fix * rustfmt * Rename the remaining identifiers in merged crash-report code Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RjGw4gA5ZvKrU8MQP6sBgT --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
190 lines
10 KiB
Rust
190 lines
10 KiB
Rust
//! Real 3D drawing and triad input in a rotated second component occurrence.
|
|
|
|
use serde_json::json;
|
|
use solidcraft_engine::geom::Vec3;
|
|
|
|
#[test]
|
|
fn bridge_line_snaps_to_points_on_two_visible_sketch_planes() {
|
|
let mut h = crate::scenario::Harness::new();
|
|
for (name, offset, point) in [("Lower", 10, [10, 20]), ("Upper", 40, [30, 35])] {
|
|
h.app.run("sketch.create", json!({"plane":{"origin":[0,0,offset],"x_dir":[1,0,0],"y_dir":[0,1,0]},"name":name})).unwrap();
|
|
h.app.run("sketch.point", json!({"point":point})).unwrap();
|
|
h.app.run("sketch.finish", json!({})).unwrap();
|
|
}
|
|
let bridge = h.app.run("sketch.create", json!({"plane":"XY","name":"Bridge"})).unwrap()["sketch"].as_u64().unwrap();
|
|
h.app.run("sketch.options", json!({"sketch_3d":true})).unwrap();
|
|
h.app.ui.show_origin = false;
|
|
h.call("ui.view", json!({"view":"home"}));
|
|
h.call("ui.view", json!({"view":"fit"}));
|
|
h.frames(3);
|
|
h.app.start("sketch.line");
|
|
h.frames(3);
|
|
// Idle selection offers other sketches' points for Project preselection; a sketch tool's
|
|
// ordinary pick stays local, and only the 3D bridge snap (`pick_3d`) reaches across.
|
|
let [x, y] = h.at(&json!({"world":[10,20,10]})).unwrap();
|
|
let proj = crate::viewport::projection(&h.app, h.app.viewport.rect.unwrap());
|
|
assert!(
|
|
crate::viewport::pick(&h.app, &proj, egui::pos2(x as f32, y as f32))
|
|
.iter()
|
|
.all(|hit| { !matches!(hit, crate::viewport::Hit::SketchPoint { sketch, .. } if *sketch != bridge) }),
|
|
"a sketch tool's ordinary pick must keep its local sketch-point scope"
|
|
);
|
|
for p in [[10, 20, 10], [30, 35, 40]] {
|
|
let [x, y] = h.at(&json!({"world":p})).unwrap();
|
|
let proj = crate::viewport::projection(&h.app, h.app.viewport.rect.unwrap());
|
|
let picked = crate::sketch3d::point_at(&h.app, &proj, egui::pos2(x as f32, y as f32)).unwrap().0;
|
|
assert!(picked.dist(Vec3::new(p[0] as f64, p[1] as f64, p[2] as f64)) < 1e-6, "{picked:?}");
|
|
h.step(&json!({"click":{"world":p}})).unwrap();
|
|
}
|
|
h.step(&json!({"key":"Escape"})).unwrap();
|
|
h.step(&json!({"key":"Escape"})).unwrap();
|
|
let state = h.app.session.world_state();
|
|
let wire = state.sketch(bridge).unwrap().sketch.wires.first().unwrap();
|
|
assert!(wire.fit[0].dist(Vec3::new(10.0, 20.0, 10.0)) < 1e-6);
|
|
assert!(wire.fit[1].dist(Vec3::new(30.0, 35.0, 40.0)) < 1e-6);
|
|
h.app.run("edit.undo", json!({})).unwrap();
|
|
assert!(h.app.session.world_state().sketch(bridge).unwrap().sketch.wires.is_empty());
|
|
h.app.run("edit.redo", json!({})).unwrap();
|
|
assert_eq!(h.app.session.world_state().sketch(bridge).unwrap().sketch.wires[0].fit, wire.fit);
|
|
}
|
|
|
|
/// Another sketch's point and an active sketch on the same XY plane, so both lie under one cursor.
|
|
fn coplanar_foreign_point() -> (crate::scenario::Harness, u64, u64) {
|
|
let mut h = crate::scenario::Harness::new();
|
|
let other = h.app.run("sketch.create", json!({"plane":"XY","name":"Other"})).unwrap()["sketch"].as_u64().unwrap();
|
|
h.app.run("sketch.point", json!({"point":[10,20]})).unwrap();
|
|
h.app.run("sketch.finish", json!({})).unwrap();
|
|
let active = h.app.run("sketch.create", json!({"plane":"XY","name":"Active"})).unwrap()["sketch"].as_u64().unwrap();
|
|
h.app.ui.show_origin = false;
|
|
h.call("ui.view", json!({"view":"home"}));
|
|
h.call("ui.view", json!({"view":"fit"}));
|
|
h.frames(3);
|
|
(h, other, active)
|
|
}
|
|
|
|
#[test]
|
|
fn sketch_tools_never_pick_another_sketchs_point() {
|
|
// Both in plain 2D sketching and while 3D drawing is on (the bridge snap's mode), the
|
|
// sketch-tool pick path must not return a foreign point as a local point plus id.
|
|
for sketch_3d in [false, true] {
|
|
let (mut h, other, active) = coplanar_foreign_point();
|
|
h.app.run("sketch.options", json!({"sketch_3d":sketch_3d})).unwrap();
|
|
h.app.start("sketch.line");
|
|
h.frames(3);
|
|
assert_eq!(crate::sketch3d::drawing(&h.app), sketch_3d);
|
|
let [x, y] = h.at(&json!({"world":[10,20,0]})).unwrap();
|
|
let pos = egui::pos2(x as f32, y as f32);
|
|
let proj = crate::viewport::projection(&h.app, h.app.viewport.rect.unwrap());
|
|
let hits = crate::viewport::pick(&h.app, &proj, pos);
|
|
assert!(
|
|
!hits.iter().any(|hit| matches!(hit, crate::viewport::Hit::SketchPoint { sketch, .. } if *sketch == other)),
|
|
"sketch_3d={sketch_3d}: pick leaked a point of sketch {other}: {hits:?}"
|
|
);
|
|
let (at, id) = crate::viewport::sketch_point_at(&h.app, &proj, pos).unwrap();
|
|
assert!(id.is_none(), "sketch_3d={sketch_3d}: snapped to foreign point id {id:?}");
|
|
assert!(at.dist(solidcraft_engine::geom::Vec2::new(10.0, 20.0)) < 0.5, "{at:?}");
|
|
if !sketch_3d {
|
|
let before = h.app.session.world_state().sketch(other).unwrap().sketch.clone();
|
|
// A real 2D line click there creates nothing tied to the other sketch's point.
|
|
h.step(&json!({"click":{"world":[10,20,0]}})).unwrap();
|
|
h.step(&json!({"click":{"world":[40,5,0]}})).unwrap();
|
|
h.step(&json!({"key":"Escape"})).unwrap();
|
|
let state = h.app.session.world_state();
|
|
let own = &state.sketch(active).unwrap().sketch;
|
|
assert!(!own.curves.is_empty(), "line was drawn");
|
|
assert_eq!(state.sketch(other).unwrap().sketch, before, "other sketch untouched");
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn bridge_snap_still_sees_other_sketch_points() {
|
|
let (mut h, other, _) = coplanar_foreign_point();
|
|
h.app.run("sketch.options", json!({"sketch_3d":true})).unwrap();
|
|
h.app.start("sketch.line");
|
|
h.frames(3);
|
|
let [x, y] = h.at(&json!({"world":[10,20,0]})).unwrap();
|
|
let pos = egui::pos2(x as f32, y as f32);
|
|
let proj = crate::viewport::projection(&h.app, h.app.viewport.rect.unwrap());
|
|
assert!(
|
|
crate::viewport::pick_3d(&h.app, &proj, pos)
|
|
.iter()
|
|
.any(|hit| matches!(hit, crate::viewport::Hit::SketchPoint { sketch, .. } if *sketch == other)),
|
|
"the 3D bridge pick offers the other sketch's point"
|
|
);
|
|
let (snapped, kind) = crate::sketch3d::point_at(&h.app, &proj, pos).unwrap();
|
|
assert_eq!(kind, "Pt");
|
|
assert!(snapped.dist(Vec3::new(10.0, 20.0, 0.0)) < 1e-6, "{snapped:?}");
|
|
// Hover highlights the snap target the click will use.
|
|
h.step(&json!({"move":{"world":[10,20,0]}})).unwrap();
|
|
h.frames(2);
|
|
assert!(
|
|
matches!(&h.app.viewport.hover, Some(crate::viewport::Hit::SketchPoint { sketch, .. }) if *sketch == other),
|
|
"{:?}",
|
|
h.app.viewport.hover
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn second_occurrence_drawn_wire_fit_picks_and_world_triad_drag_stay_aligned() {
|
|
let mut h = crate::scenario::Harness::new();
|
|
let component = h.app.run("component.create", json!({"name":"Part"})).unwrap()["component"].as_u64().unwrap();
|
|
let first = h.app.session.doc.occurrence_of(component).unwrap().id;
|
|
let second = h.app.run("occurrence.copy", json!({"component":component})).unwrap()["occurrence"].as_u64().unwrap();
|
|
h.app.run("occurrence.move", json!({"occurrence":second,"translate":[20,30,40],"axis":[0,0,1],"angle":"90 deg","capture":true})).unwrap();
|
|
h.app.run("component.activate", json!({"component":component,"occurrence":second})).unwrap();
|
|
h.app.run("solid.box", json!({"corner":[17,32,45],"length":2,"width":2,"height":10,"body_name":"SnapVertices"})).unwrap();
|
|
h.app.run("browser.visibility", json!({"paths":[[first]],"visible":false})).unwrap();
|
|
let sketch = h.app.run("sketch.create", json!({"plane":"XY","name":"Wire"})).unwrap()["sketch"].as_u64().unwrap();
|
|
h.app.ui.show_origin = false;
|
|
h.settle();
|
|
h.step(&json!({"widget":"3D Sketch"})).unwrap();
|
|
assert!(
|
|
crate::sketch3d::active(&h.app),
|
|
"palette click must enable 3D: raw={:?}, world={:?}, status={:?}, active={:?}",
|
|
h.app.session.model.state().sketch(sketch).unwrap().sketch.view,
|
|
h.app.session.world_state().sketch(sketch).unwrap().sketch.view,
|
|
h.app.status,
|
|
h.app.session.active_sketch
|
|
);
|
|
h.call("ui.view", json!({"view":"home"}));
|
|
h.call("ui.view", json!({"view":"fit"}));
|
|
h.app.start("sketch.line");
|
|
h.frames(2);
|
|
for world in [Vec3::new(17.0, 32.0, 45.0), Vec3::new(17.0, 32.0, 55.0)] {
|
|
let [x, y] = h.at(&json!({"world":[world.x,world.y,world.z]})).unwrap();
|
|
let proj = crate::viewport::projection(&h.app, h.app.viewport.rect.unwrap());
|
|
let picked = crate::sketch3d::point_at(&h.app, &proj, egui::pos2(x as f32, y as f32));
|
|
assert!(picked.is_some_and(|(p, _)| p.dist(world) < 1e-5), "world={world:?}, picked={picked:?}, status={:?}", h.app.status);
|
|
}
|
|
h.step(&json!({"click":{"world":[17,32,45]}})).unwrap();
|
|
h.step(&json!({"click":{"world":[17,32,55]}})).unwrap();
|
|
h.step(&json!({"key":"Escape"})).unwrap();
|
|
h.step(&json!({"key":"Escape"})).unwrap();
|
|
assert!(h.app.tool.is_none());
|
|
let raw = h.app.session.model.state();
|
|
let wire = raw.sketch(sketch).unwrap().sketch.wires.first().expect("actual off-plane clicks create a wire");
|
|
assert!(wire.fit[0].dist(Vec3::new(2.0, 3.0, 5.0)) < 1e-6, "{:?}", wire.fit);
|
|
assert!(wire.fit[1].dist(Vec3::new(2.0, 3.0, 15.0)) < 1e-6, "{:?}", wire.fit);
|
|
let world = h.app.session.world_state();
|
|
let shown = &world.sketch(sketch).unwrap().sketch.wires[0];
|
|
assert!(shown.fit[0].dist(Vec3::new(17.0, 32.0, 45.0)) < 1e-6, "{:?}", shown.fit);
|
|
assert!(shown.fit[1].dist(Vec3::new(17.0, 32.0, 55.0)) < 1e-6, "{:?}", shown.fit);
|
|
h.step(&json!({"click":{"world":[17,32,45]}})).unwrap();
|
|
let [x0, y0] = h.at(&json!({"handle":"triad_x"})).unwrap();
|
|
let before = h.at(&json!({"world":[17,32,45]})).unwrap();
|
|
let after = h.at(&json!({"world":[21,32,45]})).unwrap();
|
|
let history = h.app.session.undo.len();
|
|
h.call("ui.drag", json!({"x0":x0,"y0":y0,"x1":x0+after[0]-before[0],"y1":y0+after[1]-before[1],"steps":8}));
|
|
let moved = h.app.session.model.state();
|
|
let fit = &moved.sketch(sketch).unwrap().sketch.wires[0].fit;
|
|
assert!(fit[0].dist(Vec3::new(2.0, -1.0, 5.0)) < 1e-5, "{fit:?}");
|
|
assert!(fit[1].dist(Vec3::new(2.0, 3.0, 15.0)) < 1e-6);
|
|
let placed = h.app.session.world_state();
|
|
assert!(placed.sketch(sketch).unwrap().sketch.wires[0].fit[0].dist(Vec3::new(21.0, 32.0, 45.0)) < 1e-5);
|
|
assert_eq!(h.app.session.undo.len(), history + 1);
|
|
h.app.run("edit.undo", json!({})).unwrap();
|
|
let restored = h.app.session.model.state();
|
|
assert!(restored.sketch(sketch).unwrap().sketch.wires[0].fit[0].dist(Vec3::new(2.0, 3.0, 5.0)) < 1e-6);
|
|
}
|