Karl Von Richter
8a6332be83
A new face-based Extrude Join (and outward Press Pull) joins the picked face's body by default and stores that scope, so an edge-touching neighbour is no longer tried first or absorbed. Explicit targets and participants still win. Related to #226.
128 lines
6.6 KiB
Rust
128 lines
6.6 KiB
Rust
//! #226: a face's outward extrusion must not join an assembly neighbour it only touches.
|
|
#![allow(clippy::unwrap_used, clippy::panic)]
|
|
|
|
use crate::Session;
|
|
use serde_json::{Value, json};
|
|
use solidcraft_doc::{Document, FeatureKind};
|
|
use solidcraft_geom::Vec3;
|
|
|
|
fn run(s: &mut Session, command: &str, params: Value) -> Value {
|
|
s.execute(command, ¶ms).unwrap_or_else(|error| panic!("{command}: {error}"))
|
|
}
|
|
|
|
fn assembly(cap_first: bool) -> Session {
|
|
let mut s = Session::default();
|
|
let wall = json!({"length":40,"width":30,"height":20,"body_name":"Wall"});
|
|
let cap = json!({"corner":[0,0,20],"length":40,"width":30,"height":5,"body_name":"Cap"});
|
|
for params in if cap_first { [cap, wall] } else { [wall, cap] } {
|
|
run(&mut s, "solid.box", params);
|
|
}
|
|
s
|
|
}
|
|
|
|
fn check_wall(s: &Session, count: usize) {
|
|
assert!(s.model.results.iter().all(|result| result.error.is_none() && result.warning.is_none()), "{:?}", s.model.results);
|
|
let state = s.model.state();
|
|
assert_eq!(state.bodies.len(), count);
|
|
let wall = state.body("Wall").unwrap();
|
|
let measure = solidcraft_kernel::measure(&wall.body).unwrap();
|
|
assert!((measure.volume - 30_000.0).abs() < 1e-6, "{measure:?}");
|
|
assert!(measure.bbox.max.dist(Vec3::new(50.0, 30.0, 20.0)) < 1e-9);
|
|
assert!(wall.body.contains(Vec3::new(49.0, 15.0, 10.0)));
|
|
let cap = solidcraft_kernel::measure(&state.body("Cap").unwrap().body).unwrap();
|
|
assert!((cap.volume - 6000.0).abs() < 1e-6);
|
|
assert!(cap.bbox.max.dist(Vec3::new(40.0, 30.0, 25.0)) < 1e-9);
|
|
}
|
|
|
|
#[test]
|
|
fn face_join_and_press_pull_leave_the_edge_touching_cap_in_either_body_order() {
|
|
for cap_first in [true, false] {
|
|
for operation in ["join", "auto", "press_pull"] {
|
|
let mut s = assembly(cap_first);
|
|
let before = s.model.state();
|
|
let params = json!({"face":[40,15,10],"distance":10,"operation":operation});
|
|
let command = if operation == "press_pull" { "solid.press_pull" } else { "solid.extrude" };
|
|
let result = run(&mut s, command, params);
|
|
assert_eq!(result["changed_bodies"], json!(["Wall"]));
|
|
assert_eq!(result["removed_bodies"], json!([]));
|
|
assert!(s.model.state().body("Cap").unwrap().body.same(&before.body("Cap").unwrap().body));
|
|
check_wall(&s, 2);
|
|
let saved = s.doc.to_json();
|
|
run(&mut s, "edit.undo", json!({}));
|
|
assert!(s.model.state().body("Wall").unwrap().body.same(&before.body("Wall").unwrap().body));
|
|
run(&mut s, "edit.redo", json!({}));
|
|
assert_eq!(s.doc.to_json(), saved);
|
|
check_wall(&Session::new(Document::from_json(&saved).unwrap()), 2);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn face_join_respects_explicit_targets_and_participants() {
|
|
for key in ["targets", "participants"] {
|
|
for all in [false, true] {
|
|
let mut s = assembly(!all);
|
|
let mut params = json!({"face":[40,15,10],"distance":10,"operation":"join"});
|
|
// Joining the wall first permits the cap's full base face to join afterwards.
|
|
params[key] = if all { json!(["*"]) } else { json!(["Wall", "Cap"]) };
|
|
run(&mut s, "solid.extrude", params);
|
|
let state = s.model.state();
|
|
assert_eq!(state.bodies.len(), 1, "{key}");
|
|
assert!((solidcraft_kernel::measure(&state.body("Wall").unwrap().body).unwrap().volume - 36_000.0).abs() < 1e-6);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn face_join_maps_the_picked_instance_body_and_point_together() {
|
|
let mut s = Session::default();
|
|
let component = run(&mut s, "component.create", json!({"name":"Repeated"}))["component"].as_u64().unwrap();
|
|
run(&mut s, "solid.box", json!({"length":40,"width":30,"height":20,"body_name":"Wall"}));
|
|
run(&mut s, "component.activate", json!({"component":0}));
|
|
let occurrence = run(&mut s, "occurrence.copy", json!({"component":component,"translate":[100,0,0]}))["occurrence"].as_u64().unwrap();
|
|
run(&mut s, "component.activate", json!({"component":component,"occurrence":occurrence}));
|
|
let world = s.world_state();
|
|
let body = world.bodies.iter().find(|body| body.body.contains(Vec3::new(139.0, 15.0, 10.0))).unwrap().name.clone();
|
|
assert_ne!(body, "Wall", "exercise an instance body name");
|
|
let result = run(&mut s, "solid.extrude", json!({"face":[140,15,10],"face_body":body,"distance":10,"operation":"join"}));
|
|
let FeatureKind::Extrude { targets, .. } = &s.doc.feature(result["feature"].as_u64().unwrap()).unwrap().kind else { panic!("extrude") };
|
|
assert_eq!(targets, &["Wall"]);
|
|
let world = s.world_state();
|
|
assert_eq!(world.bodies.len(), 2);
|
|
for point in [Vec3::new(49.0, 15.0, 10.0), Vec3::new(149.0, 15.0, 10.0)] {
|
|
assert!(world.bodies.iter().any(|body| body.body.contains(point)), "{point:?}");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn face_join_of_a_step_import_keeps_all_32_neighbours_unchanged() {
|
|
let mut source = assembly(true);
|
|
for i in 0..31 {
|
|
run(&mut source, "solid.box", json!({"corner":[100+20*i,100,0],"length":5,"width":5,"height":5,"body_name":format!("Distant{i}")}));
|
|
}
|
|
let step = solidcraft_io::export(&source.model.state(), &[], solidcraft_io::Format::Step, "Original assembly").unwrap();
|
|
let imported = solidcraft_io::step_import_feature(&step, "original-assembly.step").unwrap();
|
|
let mut doc = Document::new("Imported assembly");
|
|
let feature = doc.add_feature(imported.kind, None).unwrap();
|
|
doc.feature_mut(feature).unwrap().body_names = imported.body_names;
|
|
let mut s = Session::new(doc);
|
|
assert_eq!(s.doc.features.len(), 1);
|
|
let before = s.model.state();
|
|
let result = run(&mut s, "solid.extrude", json!({"face":[40,15,10],"distance":"10 mm","direction":"positive","operation":"join"}));
|
|
assert_eq!(result["changed_bodies"], json!(["Wall"]));
|
|
check_wall(&s, 33);
|
|
let reopened = Session::new(Document::from_json(&s.doc.to_json()).unwrap());
|
|
check_wall(&reopened, 33);
|
|
for body in before.bodies.iter().filter(|body| body.name != "Wall") {
|
|
let after = s.model.state();
|
|
assert!(body.body.same(&after.body(&body.name).unwrap().body), "{}", body.name);
|
|
let cold = reopened.model.state();
|
|
let original = solidcraft_kernel::measure(&body.body).unwrap();
|
|
let restored = solidcraft_kernel::measure(&cold.body(&body.name).unwrap().body).unwrap();
|
|
assert!((original.volume - restored.volume).abs() < 1e-9, "{}", body.name);
|
|
assert!(original.bbox.min.dist(restored.bbox.min) < 1e-9 && original.bbox.max.dist(restored.bbox.max) < 1e-9);
|
|
}
|
|
let FeatureKind::Extrude { targets, .. } = &s.doc.feature(result["feature"].as_u64().unwrap()).unwrap().kind else { panic!("extrude") };
|
|
assert_eq!(targets, &["Wall"]);
|
|
}
|