Files
solidcraft/crates/engine/src/cmd/joint_edge_tests.rs
T
NOWN-DEVandClaude Opus 5.5 a5b6408587 fix: an edge joint origin on a body placed by an offset lands on that edge (#6374)
An edge joint origin looked its edge and face up in the body's own coordinates with the pick in the component's,
and returned the frame in body coordinates. On a body placed by an offset (an imported part's bodies are) a pick on
the edge where it is shown found no edge ("joint origin: no edge there"), or the origin sat away from its edge by
the offset. Edge origins now take the picks into the body's coordinates through the inverse of its offset and place
the frame back by it, as named faces and round origins already do. A body without an offset is unchanged.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-25 02:29:08 +00:00

145 lines
6.8 KiB
Rust
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
//! Joint origins on an edge of a face (its middle, or a corner) follow the face as it changes size.
use serde_json::json;
use solidcraft_geom::Vec3;
use super::tests::{place, run};
use crate::Session;
/// A 2 mm panel `W` x 300 (W = 400) in component Panel, and a 20 x 10 x 6 bracket in component
/// Bracket, off to the side.
fn panel() -> Session {
let mut s = Session::default();
run(&mut s, "parameters.add", json!({"name": "W", "expression": "400 mm"}));
run(&mut s, "component.create", json!({"name": "Panel"}));
run(&mut s, "solid.box", json!({"length": "W", "width": 300, "height": 2, "corner": [0, 0, 0]}));
run(&mut s, "component.activate", json!({"component": "root"}));
run(&mut s, "component.create", json!({"name": "Bracket"}));
run(&mut s, "solid.box", json!({"length": 20, "width": 10, "height": 6, "corner": [0, 500, 0]}));
s
}
/// The middle of the bracket's bottom face, where it is now.
fn bracket(s: &Session) -> Vec3 {
place(s, "Bracket", Vec3::new(10.0, 505.0, 0.0))
}
fn near(a: Vec3, b: Vec3) -> bool {
a.dist(b) < 1e-6
}
#[test]
fn a_part_set_in_from_a_corner_stays_there_as_the_panel_grows() {
let mut s = panel();
// The front right corner of the top face; the bracket 40 mm in along both edges.
run(
&mut s,
"joint.create",
json!({"type": "planar", "a": {"occurrence": "Panel", "edge": [200, 0, 2], "corner": [400, 0, 2]},
"b": {"occurrence": "Bracket", "face": [10, 505, 0]}, "values": [40, 40, 0], "name": "Corner"}),
);
for w in [400.0, 600.0, 250.0, 1000.0] {
run(&mut s, "parameters.change", json!({"name": "W", "expression": format!("{w} mm")}));
assert!(near(bracket(&s), Vec3::new(w - 40.0, 40.0, 2.0)), "W {w}: {:?}", bracket(&s));
assert_eq!(run(&mut s, "joint.solve", json!({}))["errors"], json!([]));
}
let snap = s.doc.assembly.joints.first().map(|j| j.a.snap.clone());
assert!(
matches!(&snap, Some(solidcraft_doc::joints::Snap::Edge { edge: Some(_), face: Some(_), corner: Some(_), .. })),
"the edge, the face and the corner's other edge are kept by name: {snap:?}"
);
}
#[test]
fn a_part_at_an_edges_middle_follows_it_and_the_face_can_be_chosen() {
let mut s = panel();
// The right edge of the top face: its middle is (W, 150, 2), y points into the face (−X).
run(
&mut s,
"joint.create",
json!({"type": "planar", "a": {"occurrence": "Panel", "edge": [400, 100, 2]},
"b": {"occurrence": "Bracket", "face": [10, 505, 0]}, "values": [0, 40, 0], "name": "Mid"}),
);
for w in [400.0, 700.0, 320.0] {
run(&mut s, "parameters.change", json!({"name": "W", "expression": format!("{w} mm")}));
assert!(near(bracket(&s), Vec3::new(w - 40.0, 150.0, 2.0)), "W {w}: {:?}", bracket(&s));
}
// The same edge on the end face: z points out of the end (+X), y into it (down).
run(&mut s, "joint.delete", json!({"joint": "Mid"}));
run(
&mut s,
"joint.create",
json!({"type": "rigid", "a": {"occurrence": "Panel", "edge": [320, 100, 2], "on": [320, 150, 1]},
"b": {"occurrence": "Bracket", "face": [10, 505, 0]}, "name": "End"}),
);
assert!(near(bracket(&s), Vec3::new(320.0, 150.0, 2.0)), "{:?}", bracket(&s));
// The bracket's bottom faces the end face: its top (6 mm up its own z) is out along +X.
assert!(
near(place(&s, "Bracket", Vec3::new(10.0, 505.0, 6.0)), Vec3::new(326.0, 150.0, 2.0)),
"{:?}",
place(&s, "Bracket", Vec3::new(10.0, 505.0, 6.0))
);
}
#[test]
fn edge_origins_refuse_bad_picks_and_report_a_lost_edge() {
let mut s = panel();
let bad = |s: &mut Session, a: serde_json::Value| {
s.execute("joint.create", &json!({"type": "rigid", "a": a, "b": {"occurrence": "Bracket", "face": [10, 505, 0]}})).unwrap_err().to_string()
};
// Not on an edge; a face the edge doesn't bound.
assert!(bad(&mut s, json!({"occurrence": "Panel", "edge": [200, 150, 2]})).contains("no edge there"));
assert!(bad(&mut s, json!({"occurrence": "Panel", "edge": [200, 0, 2], "on": [200, 150, 0]})).contains("doesn't bound"));
// A design whose edge name no longer finds anything: the joint is left out with the reason.
run(
&mut s,
"joint.create",
json!({"type": "rigid", "a": {"occurrence": "Panel", "edge": [200, 0, 2]}, "b": {"occurrence": "Bracket", "face": [10, 505, 0]}, "name": "J"}),
);
let mut doc = (*s.doc).clone();
if let Some(j) = doc.assembly.joints.first_mut()
&& let solidcraft_doc::joints::Snap::Edge { edge, .. } = &mut j.a.snap
{
*edge = Some("F999:nothing|F998:nowhere".into());
}
*s.doc_mut() = doc;
let r = run(&mut s, "joint.solve", json!({}));
assert!(r["errors"][0]["why"].as_str().is_some_and(|w| w.contains("no longer exists")), "{r}");
}
#[test]
fn an_edge_origin_on_a_body_placed_by_an_offset_lands_on_that_edge() {
// A 40 x 30 x 5 plate made at the origin, then placed by an offset (turned a quarter about x,
// moved), as an imported part's body is: its geometry stays where it was made and the offset
// places it. Edge origins picked where the plate is shown sit on its edges there.
let mut s = Session::default();
run(&mut s, "solid.box", json!({"length": 40, "width": 30, "height": 5, "corner": [0, 0, 0], "body_name": "Plate"}));
let offset = solidcraft_doc::rigid(Vec3::new(7.0, 0.0, 3.0), Vec3::ZERO, Vec3::X, std::f64::consts::FRAC_PI_2);
s.doc_mut().body_offsets.insert("Plate".into(), offset);
s.refresh();
let at = |p: Vec3| solidcraft_doc::apply_point(&offset, p);
let up = solidcraft_doc::apply_vector(&offset, Vec3::Z);
let st = s.model.state();
let resolve = |snap: solidcraft_doc::joints::Snap| {
let o = solidcraft_doc::joints::JointOrigin { occurrence: 0, snap };
let m = solidcraft_doc::joints::resolve_origin(&s.doc, &st, &o).unwrap_or_else(|e| panic!("{e}"));
(Vec3::new(m[3][0], m[3][1], m[3][2]), Vec3::new(m[2][0], m[2][1], m[2][2]))
};
// The middle of the top face's front edge, and the corner at the plate's own origin.
let middle = solidcraft_doc::joints::edge_snap(&s.doc, &st, 0, at(Vec3::new(20.0, 0.0, 5.0)), Some(at(Vec3::new(20.0, 10.0, 5.0))), None)
.unwrap_or_else(|e| panic!("{e}"));
let (o, z) = resolve(middle);
assert!(near(o, at(Vec3::new(20.0, 0.0, 5.0))) && near(z, up), "{o:?} {z:?}");
let corner = solidcraft_doc::joints::edge_snap(
&s.doc,
&st,
0,
at(Vec3::new(20.0, 0.0, 5.0)),
Some(at(Vec3::new(20.0, 10.0, 5.0))),
Some(at(Vec3::new(1.0, 0.0, 5.0))),
)
.unwrap_or_else(|e| panic!("{e}"));
let (o, z) = resolve(corner);
assert!(near(o, at(Vec3::new(0.0, 0.0, 5.0))) && near(z, up), "{o:?} {z:?}");
}