bherbruck
c1d819f235
Record ownership transfers in the timeline so earlier Join/Cut membership, world placement, machining data and styles survive component moves, edits, independent copying, undo and reopening. Preserve pending positions in history snapshots and keep constructor transfers ordered during feature redefinition. Retain shallow sheet pockets and exact planar intersection islands through unfold/refold, with depth-aware flat previews and DXF export. Store explicit 3D wire coordinate spaces and migrate known legacy provenance without moving saved points or analytic fits. Infer unique eligible cylindrical Emboss targets, align Revolve manipulators with actual extent geometry, and discard obsolete preview errors after input correction. Certify constructed and immutable imported face styles using exact source metadata while preserving legacy face names. Upgrade designs to format10 with bounded validation and geometry-preserving legacy migration.
313 lines
18 KiB
Rust
313 lines
18 KiB
Rust
use crate::Session;
|
|
use serde_json::{Value, json};
|
|
use solvecraft_geom::Vec3;
|
|
use solvecraft_sketch::WireSpace;
|
|
|
|
fn run(s: &mut Session, cmd: &str, params: Value) -> Value {
|
|
s.execute(cmd, ¶ms).unwrap_or_else(|e| panic!("{cmd}: {e}"))
|
|
}
|
|
|
|
fn near(actual: Vec3, expected: Vec3) {
|
|
assert!(actual.dist(expected) < 1e-7, "{actual:?} != {expected:?}");
|
|
}
|
|
|
|
fn second_frame() -> (Session, u64, u64, u64) {
|
|
let mut s = Session::default();
|
|
let c = run(&mut s, "component.create", json!({"name":"Wire owner"}));
|
|
let component = c["component"].as_u64().unwrap();
|
|
let first = c["occurrence"].as_u64().unwrap();
|
|
let second = run(&mut s, "occurrence.copy", json!({"occurrence":first}))["occurrence"].as_u64().unwrap();
|
|
// One rigid transform: (x,y,z) -> (20-y,30+x,40+z), independent of implementation math.
|
|
run(&mut s, "occurrence.move", json!({"occurrence":second,"axis":[0,0,1],"angle":"90 deg","translate":[20,30,40]}));
|
|
run(&mut s, "component.activate", json!({"component":component,"occurrence":second,"path":[second]}));
|
|
run(&mut s, "sketch.create", json!({"plane":"XY","name":"Space path"}));
|
|
run(&mut s, "sketch.options", json!({"sketch_3d":true}));
|
|
(s, component, first, second)
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_second_occurrence_world_inputs_move_and_reopen() {
|
|
let (mut s, component, first, second) = second_frame();
|
|
let sketch = s.active_sketch.unwrap();
|
|
let r = run(&mut s, "sketch.line3d", json!({"points":[[17,32,45],[17,32,55],[14,32,55]]}));
|
|
let a = r["curves"][0].as_str().unwrap().to_string();
|
|
let b = r["curves"][1].as_str().unwrap().to_string();
|
|
let spline = run(&mut s, "sketch.spline3d", json!({"points":[[14,32,55],[12,34,56],[10,35,58]]}))["curves"][0].as_str().unwrap().to_string();
|
|
let point = run(&mut s, "sketch.point3d", json!({"point":[17,32,45]}))["point"].as_str().unwrap().to_string();
|
|
let sk = s.doc.sketch(sketch).unwrap();
|
|
for w in &sk.wires {
|
|
assert_eq!(w.space, WireSpace::Component);
|
|
}
|
|
near(sk.wires[sk.wire_index(&a).unwrap()].fit[0], Vec3::new(2.0, 3.0, 5.0));
|
|
near(sk.wires[sk.wire_index(&point).unwrap()].fit[0], Vec3::new(2.0, 3.0, 5.0));
|
|
let world = s.world_state();
|
|
let ws = &world.sketch(sketch).unwrap().sketch;
|
|
let sw = &ws.wires[ws.wire_index(&spline).unwrap()];
|
|
near(sw.fit[0], Vec3::new(14.0, 32.0, 55.0));
|
|
near(sw.pts[0], sw.fit[0]);
|
|
near(*sw.pts.last().unwrap(), Vec3::new(10.0, 35.0, 58.0));
|
|
let before = s.doc.to_json();
|
|
let moved = run(&mut s, "sketch.move3d", json!({"wire":a,"index":1,"by":[1,0,0]}));
|
|
assert_eq!(moved["moved"], 2);
|
|
let sk = s.doc.sketch(sketch).unwrap();
|
|
near(sk.wires[sk.wire_index(&a).unwrap()].fit[1], Vec3::new(2.0, 2.0, 15.0));
|
|
near(sk.wires[sk.wire_index(&b).unwrap()].fit[0], Vec3::new(2.0, 2.0, 15.0));
|
|
run(&mut s, "edit.undo", json!({}));
|
|
assert_eq!(s.doc.to_json(), before);
|
|
run(&mut s, "edit.redo", json!({}));
|
|
run(&mut s, "sketch.move3d", json!({"wire":point,"to":[18,33,46]}));
|
|
near(s.doc.sketch(sketch).unwrap().wires.iter().find(|w| w.id == point).unwrap().fit[0], Vec3::new(3.0, 2.0, 6.0));
|
|
let restored = solvecraft_doc::format::read(&s.doc.to_json()).unwrap();
|
|
assert_eq!(restored.sketch(sketch).unwrap().wires, s.doc.sketch(sketch).unwrap().wires);
|
|
// Same definition at the first placement has the local geometry; selected second is exact.
|
|
run(&mut s, "component.activate", json!({"component":component,"occurrence":first,"path":[first]}));
|
|
near(s.world_state().sketch(sketch).unwrap().sketch.wires.iter().find(|w| w.id == point).unwrap().fit[0], Vec3::new(3.0, 2.0, 6.0));
|
|
run(&mut s, "component.activate", json!({"component":component,"occurrence":second,"path":[second]}));
|
|
near(s.world_state().sketch(sketch).unwrap().sketch.wires.iter().find(|w| w.id == point).unwrap().fit[0], Vec3::new(18.0, 33.0, 46.0));
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_pending_moves_other_owner_and_legacy_world_do_not_join() {
|
|
let (mut s, _, _, second) = second_frame();
|
|
let sketch = s.active_sketch.unwrap();
|
|
let legacy = s.doc_mut().sketch_mut(sketch).unwrap().add_drawn_wire(&[Vec3::new(2.0, 3.0, 5.0)]).unwrap();
|
|
let local = run(&mut s, "sketch.point3d", json!({"point":[17,32,45]}))["point"].as_str().unwrap().to_string();
|
|
assert_eq!(run(&mut s, "sketch.move3d", json!({"wire":local,"by":[1,0,0]}))["moved"], 1);
|
|
near(s.doc.sketch(sketch).unwrap().wires.iter().find(|w| w.id == legacy).unwrap().fit[0], Vec3::new(2.0, 3.0, 5.0));
|
|
run(&mut s, "occurrence.move", json!({"occurrence":second,"translate":[5,0,0],"capture":false}));
|
|
let point = run(&mut s, "sketch.point3d", json!({"point":[22,32,45]}))["point"].as_str().unwrap().to_string();
|
|
near(s.doc.sketch(sketch).unwrap().wires.iter().find(|w| w.id == point).unwrap().fit[0], Vec3::new(2.0, 3.0, 5.0));
|
|
near(s.world_state().sketch(sketch).unwrap().sketch.wires.iter().find(|w| w.id == legacy).unwrap().fit[0], Vec3::new(2.0, 3.0, 5.0));
|
|
near(s.world_state().sketch(sketch).unwrap().sketch.wires.iter().find(|w| w.id == point).unwrap().fit[0], Vec3::new(22.0, 32.0, 45.0));
|
|
run(&mut s, "component.capture_position", json!({}));
|
|
near(s.world_state().sketch(sketch).unwrap().sketch.wires.iter().find(|w| w.id == point).unwrap().fit[0], Vec3::new(22.0, 32.0, 45.0));
|
|
// Explicit target in root must not inherit the unrelated active component frame.
|
|
run(&mut s, "sketch.finish", json!({}));
|
|
run(&mut s, "component.activate", json!({"component":0}));
|
|
let root = run(&mut s, "sketch.create", json!({"plane":"XY","name":"Root path"}))["sketch"].as_u64().unwrap();
|
|
run(&mut s, "sketch.options", json!({"sketch_3d":true}));
|
|
let unrelated = run(&mut s, "component.create", json!({"name":"Unrelated"}))["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":unrelated,"translate":[100,200,300]}));
|
|
run(&mut s, "sketch.point3d", json!({"sketch":root,"point":[9,8,7]}));
|
|
near(s.doc.sketch(root).unwrap().wires[0].fit[0], Vec3::new(9.0, 8.0, 7.0));
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_hostile_inputs_rollback_full_session() {
|
|
let (mut s, _, _, second) = second_frame();
|
|
let id = run(&mut s, "sketch.point3d", json!({"point":[17,32,45]}))["point"].as_str().unwrap().to_string();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":second,"translate":[1,0,0],"capture":false}));
|
|
run(&mut s, "select.set", json!({"items":[{"type":"occurrence","path":[second]}]}));
|
|
let doc = s.doc.to_json();
|
|
let pending = s.pending_moves.clone();
|
|
let selection = s.selection.clone();
|
|
let history = (s.undo.len(), s.redo.len());
|
|
for (cmd, p) in [
|
|
("sketch.move3d", json!({"wire":id,"index":u64::MAX,"to":[0,0,0]})),
|
|
("sketch.move3d", json!({"wire":id,"index":-1,"to":[0,0,0]})),
|
|
("sketch.move3d", json!({"wire":id,"index":"0","to":[0,0,0]})),
|
|
("sketch.move3d", json!({"wire":id,"to":[null,0,0],"by":[1,0,0]})),
|
|
("sketch.point3d", json!({"point":[1e100,0,0]})),
|
|
("sketch.line3d", json!({"points":[[17,32,45],[17,32,45]]})),
|
|
("sketch.spline3d", json!({"points":vec![[0,0,0];501]})),
|
|
] {
|
|
assert!(s.execute(cmd, &p).is_err(), "{cmd}: {p}");
|
|
assert_eq!(s.doc.to_json(), doc);
|
|
assert_eq!(s.pending_moves, pending);
|
|
assert_eq!(s.selection, selection);
|
|
assert_eq!((s.undo.len(), s.redo.len()), history);
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_include_other_component_refresh_break_lost_and_reopen() {
|
|
let mut s = Session::default();
|
|
run(&mut s, "solid.box", json!({"length":10,"width":10,"height":10}));
|
|
let component = run(&mut s, "component.create", json!({"name":"Receiver"}));
|
|
let occurrence = component["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":occurrence,"translate":[20,0,0]}));
|
|
run(&mut s, "sketch.create", json!({"plane":"XY","name":"Include target"}));
|
|
let sketch = s.active_sketch.unwrap();
|
|
run(&mut s, "sketch.include_3d", json!({"refs":[{"edge":[10,10,5],"body":"Body1"}]}));
|
|
let initial = s.doc.sketch(sketch).unwrap().wires[0].clone();
|
|
assert_eq!(initial.space, WireSpace::Component);
|
|
assert!(initial.pts.iter().all(|p| (p.x + 10.0).abs() < 1e-7 && (p.y - 10.0).abs() < 1e-7));
|
|
let link = initial.link.clone().unwrap();
|
|
// A real sketch edit exercises engine refresh, not only document evaluation.
|
|
run(&mut s, "sketch.line", json!({"points":[[0,0],[1,0]]}));
|
|
let sk = s.doc.sketch(sketch).unwrap();
|
|
assert_eq!(sk.wires[0], initial);
|
|
assert!(!sk.link(&link).unwrap().lost);
|
|
let world = s.world_state();
|
|
assert!(world.sketch(sketch).unwrap().sketch.wires[0].pts.iter().all(|p| (p.x - 10.0).abs() < 1e-7));
|
|
let before = s.doc.to_json();
|
|
run(&mut s, "sketch.break_link", json!({"link":link}));
|
|
assert_eq!(s.doc.sketch(sketch).unwrap().wires[0].space, WireSpace::Component);
|
|
assert!(s.doc.sketch(sketch).unwrap().wires[0].link.is_none());
|
|
let restored = solvecraft_doc::format::read(&s.doc.to_json()).unwrap();
|
|
assert_eq!(restored.sketch(sketch).unwrap().wires[0], s.doc.sketch(sketch).unwrap().wires[0]);
|
|
run(&mut s, "edit.undo", json!({}));
|
|
assert_eq!(s.doc.to_json(), before);
|
|
// Lost references retain the last coordinates and explicit marker, with no guessing.
|
|
let sk = s.doc_mut().sketch_mut(sketch).unwrap();
|
|
sk.links.iter_mut().find(|l| l.id == link).unwrap().source = solvecraft_sketch::LinkSource::Edge { body: "Missing".into(), at: Vec3::ZERO };
|
|
run(&mut s, "sketch.line", json!({"points":[[2,0],[3,0]]}));
|
|
let sk = s.doc.sketch(sketch).unwrap();
|
|
assert!(sk.link(&link).unwrap().lost);
|
|
assert_eq!(sk.wires[0], initial);
|
|
let restored = solvecraft_doc::format::read(&s.doc.to_json()).unwrap();
|
|
assert_eq!(restored.sketch(sketch).unwrap().wires[0], initial);
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_pipe_component_and_world_paths_have_analytic_volume_and_position() {
|
|
for space in [WireSpace::Component, WireSpace::World] {
|
|
let (mut s, _, first, second) = second_frame();
|
|
if space == WireSpace::World {
|
|
// A single placed owner lets an immutable world path stay physically fixed;
|
|
// replicated solids still follow their occurrence placements by design.
|
|
run(&mut s, "selection.delete", json!({"items":[{"type":"occurrence","path":[first]}]}));
|
|
}
|
|
let sketch = s.active_sketch.unwrap();
|
|
let wire = if space == WireSpace::Component {
|
|
run(&mut s, "sketch.line3d", json!({"points":[[17,32,45],[17,32,55]]}))["curves"][0].as_str().unwrap().to_string()
|
|
} else {
|
|
s.doc_mut().sketch_mut(sketch).unwrap().add_drawn_wire(&[Vec3::new(17.0, 32.0, 45.0), Vec3::new(17.0, 32.0, 55.0)]).unwrap()
|
|
};
|
|
run(&mut s, "sketch.finish", json!({}));
|
|
run(&mut s, "solid.pipe", json!({"path_sketch":sketch,"path":[wire],"diameter":4}));
|
|
let world = s.world_state();
|
|
let body = world.bodies.last().unwrap();
|
|
// Property measurement uses fine adaptive tessellation; the viewport mesh alone
|
|
// undershoots a small circular profile by about 0.64% at its display chord tolerance.
|
|
let measure = solvecraft_kernel::measure(&body.body).unwrap();
|
|
assert!((measure.volume - 40.0 * std::f64::consts::PI).abs() < 0.05, "{}", measure.volume);
|
|
let bounds = body.mesh().bounds();
|
|
near((bounds.min + bounds.max) / 2.0, Vec3::new(17.0, 32.0, 50.0));
|
|
run(&mut s, "occurrence.move", json!({"occurrence":second,"translate":[5,0,0]}));
|
|
let world = s.world_state();
|
|
let body = world.bodies.last().unwrap();
|
|
let bounds = body.mesh().bounds();
|
|
near((bounds.min + bounds.max) / 2.0, Vec3::new(if space == WireSpace::Component { 22.0 } else { 17.0 }, 32.0, 50.0));
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_nonactive_repeated_owner_refuses_ambiguous_world_input() {
|
|
let (mut s, _, _, _) = second_frame();
|
|
let target = s.active_sketch.unwrap();
|
|
run(&mut s, "component.activate", json!({"component":0}));
|
|
let before = s.doc.to_json();
|
|
let error = s.execute("sketch.point3d", &json!({"sketch":target,"point":[0,0,5]})).unwrap_err();
|
|
assert!(error.to_string().contains("activate the desired sketch owner occurrence"));
|
|
assert_eq!(s.doc.to_json(), before);
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_wide_owner_graph_has_bounded_indexed_traversal() {
|
|
let mut s = Session::default();
|
|
run(&mut s, "component.create", json!({"name":"Target"}));
|
|
let target = run(&mut s, "sketch.create", json!({"plane":"XY"}))["sketch"].as_u64().unwrap();
|
|
run(&mut s, "component.activate", json!({"component":0}));
|
|
// A legal wide assembly used to force one whole occurrence scan for each leaf.
|
|
let doc = s.doc_mut();
|
|
for i in 0..9998u64 {
|
|
doc.components.push(solvecraft_doc::Component { id: 10_000 + i, name: format!("Sibling{i}"), parent: 0 });
|
|
doc.occurrences.push(solvecraft_doc::Occurrence {
|
|
id: 100_000 + i,
|
|
component: 10_000 + i,
|
|
parent: 0,
|
|
name: format!("Sibling{i}"),
|
|
transform: solvecraft_doc::IDENTITY,
|
|
grounded: false,
|
|
});
|
|
}
|
|
assert_eq!(super::inverse_owner_frame(&s, &json!({"sketch":target}), "sketch.point3d").unwrap(), solvecraft_doc::IDENTITY);
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_cross_owner_sweep_follows_world_path_edit_undo_and_reopen() {
|
|
let mut s = Session::default();
|
|
let path_sketch = run(&mut s, "sketch.create", json!({"plane":"XY","name":"Root path"}))["sketch"].as_u64().unwrap();
|
|
run(&mut s, "sketch.options", json!({"sketch_3d":true}));
|
|
let wire = run(&mut s, "sketch.line3d", json!({"points":[[17,32,45],[17,32,55]]}))["curves"][0].as_str().unwrap().to_string();
|
|
run(&mut s, "sketch.finish", json!({}));
|
|
let owner = run(&mut s, "component.create", json!({"name":"Sweep owner"}))["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":owner,"axis":[0,0,1],"angle":"90 deg","translate":[20,30,40]}));
|
|
let profile = run(&mut s, "sketch.create", json!({"plane":"XY","offset":5,"name":"Profile"}))["sketch"].as_u64().unwrap();
|
|
run(&mut s, "sketch.circle.center", json!({"center":[2,3],"radius":2}));
|
|
run(&mut s, "sketch.finish", json!({}));
|
|
run(&mut s, "solid.sweep", json!({"sketch":profile,"path_sketch":path_sketch,"path":[wire],"operation":"new"}));
|
|
let check = |s: &Session, length: f64| {
|
|
let world = s.world_state();
|
|
let body = world.bodies.last().unwrap();
|
|
let measure = solvecraft_kernel::measure(&body.body).unwrap();
|
|
assert!((measure.volume - 4.0 * std::f64::consts::PI * length).abs() < 0.05, "{}", measure.volume);
|
|
near(measure.centroid, Vec3::new(17.0, 32.0, 45.0 + length / 2.0));
|
|
};
|
|
check(&s, 10.0);
|
|
let saved = s.doc.to_json();
|
|
run(&mut s, "sketch.edit", json!({"sketch":path_sketch}));
|
|
run(&mut s, "sketch.move3d", json!({"sketch":path_sketch,"wire":wire,"index":1,"by":[0,0,10]}));
|
|
check(&s, 20.0);
|
|
run(&mut s, "edit.undo", json!({}));
|
|
assert_eq!(s.doc.to_json(), saved);
|
|
check(&s, 10.0);
|
|
let mut reopened = Session { doc: solvecraft_doc::format::read(&saved).unwrap().into(), ..Default::default() };
|
|
reopened.refresh();
|
|
check(&reopened, 10.0);
|
|
}
|
|
|
|
#[test]
|
|
fn wire_frame_three_owner_sweep_profile_move_invalidates_warm_cache() {
|
|
let mut s = Session::default();
|
|
let profile_owner = run(&mut s, "component.create", json!({"name":"Profile owner","parent":0}));
|
|
let profile_occurrence = profile_owner["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":profile_occurrence,"translate":[4,7,5]}));
|
|
let profile = run(&mut s, "sketch.create", json!({"plane":"XY","name":"Foreign profile"}))["sketch"].as_u64().unwrap();
|
|
run(&mut s, "sketch.circle.center", json!({"center":[0,0],"radius":2}));
|
|
run(&mut s, "sketch.finish", json!({}));
|
|
|
|
let path_owner = run(&mut s, "component.create", json!({"name":"Path owner","parent":0}));
|
|
let path_occurrence = path_owner["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":path_occurrence,"translate":[-12,9,-3]}));
|
|
let path_sketch = run(&mut s, "sketch.create", json!({"plane":"XY","name":"Foreign path"}))["sketch"].as_u64().unwrap();
|
|
run(&mut s, "sketch.options", json!({"sketch_3d":true}));
|
|
let wire = run(&mut s, "sketch.line3d", json!({"points":[[4,7,5],[4,7,15]]}))["curves"][0].as_str().unwrap().to_string();
|
|
run(&mut s, "sketch.finish", json!({}));
|
|
|
|
let consumer = run(&mut s, "component.create", json!({"name":"Sweep consumer","parent":0}));
|
|
let consumer_occurrence = consumer["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "occurrence.move", json!({"occurrence":consumer_occurrence,"axis":[0,0,1],"angle":"90 deg","translate":[100,-30,20]}));
|
|
run(&mut s, "solid.sweep", json!({"sketch":profile,"path_sketch":path_sketch,"path":[wire],"operation":"new"}));
|
|
let measure = |session: &Session, x: f64| {
|
|
let state = session.world_state();
|
|
let body = state.bodies.last().unwrap();
|
|
assert_eq!(body.component, consumer["component"].as_u64().unwrap());
|
|
let result = solvecraft_kernel::measure(&body.body).unwrap();
|
|
assert!((result.volume - 40.0 * std::f64::consts::PI).abs() < 0.05, "{}", result.volume);
|
|
near(result.centroid, Vec3::new(x, 7.0, 10.0));
|
|
result
|
|
};
|
|
measure(&s, 4.0);
|
|
// A repeated refresh warms the exact same evaluator cache before changing only
|
|
// the foreign profile placement, whose frame must be part of Sweep's digest.
|
|
s.refresh();
|
|
measure(&s, 4.0);
|
|
let saved = s.doc.to_json();
|
|
let fixed_path = s.doc.component_transform(path_owner["component"].as_u64().unwrap());
|
|
let fixed_consumer = s.doc.component_transform(consumer["component"].as_u64().unwrap());
|
|
run(&mut s, "occurrence.move", json!({"occurrence":profile_occurrence,"translate":[3,0,0]}));
|
|
assert_eq!(s.doc.component_transform(path_owner["component"].as_u64().unwrap()), fixed_path);
|
|
assert_eq!(s.doc.component_transform(consumer["component"].as_u64().unwrap()), fixed_consumer);
|
|
let warm = measure(&s, 7.0);
|
|
let mut cold = Session { doc: solvecraft_doc::format::read(&s.doc.to_json()).unwrap().into(), ..Default::default() };
|
|
cold.refresh();
|
|
let reopened = measure(&cold, 7.0);
|
|
near(warm.centroid, reopened.centroid);
|
|
assert!((warm.volume - reopened.volume).abs() < 1e-8);
|
|
run(&mut s, "edit.undo", json!({}));
|
|
assert_eq!(s.doc.to_json(), saved);
|
|
measure(&s, 4.0);
|
|
}
|