Koschtetnix authored and GitHub committed
1 parent
180e62c981
commit
487aa64e10
21 files changed
+1624
-78
No files matched your search
@@ -584,3 +584,227 @@ fn closed_sweep_redefines_to_a_half_turn_torus_cut() {
|
||||
assert_eq!(mesh.contains(point), material, "material at {point:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn many_extrusion_profiles_preserve_material_and_body_identity() {
|
||||
for operation in ["join", "cut", "new"] {
|
||||
let mut s = Session::default();
|
||||
s.execute("solid.box", &json!({"length": 40, "width": 30, "height": 20, "body_name": "Stock"})).unwrap();
|
||||
s.execute("sketch.create", &json!({"plane": {"origin": [0, 0, 20], "x_dir": [1, 0, 0], "y_dir": [0, 1, 0]}})).unwrap();
|
||||
for i in 0..6 {
|
||||
for j in 0..4 {
|
||||
let (x, y) = (2 + i * 6, 2 + j * 7);
|
||||
s.execute("sketch.rectangle.two_point", &json!({"p0": [x, y], "p1": [x + 4, y + 4]})).unwrap();
|
||||
}
|
||||
}
|
||||
s.execute("sketch.finish", &json!({})).unwrap();
|
||||
let distance = if operation == "cut" { -5 } else { 5 };
|
||||
let before = s.revision;
|
||||
s.execute("solid.extrude", &json!({"distance": distance, "operation": operation})).unwrap();
|
||||
let state = s.model.state();
|
||||
assert_eq!(state.bodies.len(), if operation == "new" { 25 } else { 1 });
|
||||
let expected = 24_000.0
|
||||
+ match operation {
|
||||
"join" => 1920.0,
|
||||
"cut" => -1920.0,
|
||||
_ => 0.0,
|
||||
};
|
||||
assert!((volume(&s, "Stock") - expected).abs() < 1e-6);
|
||||
let stock = state.body("Stock").unwrap();
|
||||
for (point, present) in [([3.0, 3.0, 22.0], operation == "join"), ([3.0, 3.0, 18.0], operation != "cut"), ([7.0, 3.0, 18.0], true)] {
|
||||
assert_eq!(stock.mesh().contains(solidcraft_geom::Vec3::from(point)), present, "{operation}: {point:?}");
|
||||
}
|
||||
assert!(stock.body.validity().is_empty());
|
||||
assert!(s.revision > before);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert!((volume(&s, "Stock") - 24_000.0).abs() < 1e-6);
|
||||
s.execute("edit.redo", &json!({})).unwrap();
|
||||
assert!((volume(&s, "Stock") - expected).abs() < 1e-6);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn many_circular_extrusion_profiles_cut_a_curved_target() {
|
||||
let mut s = Session::default();
|
||||
s.execute("solid.cylinder", &json!({"radius": 20, "height": 20, "body_name": "Stock"})).unwrap();
|
||||
s.execute("sketch.create", &json!({"plane": {"origin": [0, 0, -1], "x_dir": [1, 0, 0], "y_dir": [0, 1, 0]}})).unwrap();
|
||||
for x in [-9, -3, 3, 9] {
|
||||
for y in [-9, -3, 3, 9] {
|
||||
s.execute("sketch.circle.center", &json!({"center": [x, y], "radius": 1})).unwrap();
|
||||
}
|
||||
}
|
||||
s.execute("sketch.finish", &json!({})).unwrap();
|
||||
s.execute("solid.extrude", &json!({"distance": 22, "operation": "cut", "targets": ["Stock"]})).unwrap();
|
||||
// The rebuilt caps mesh more finely than the original cylinder. Compare with the
|
||||
// analytic material volume, rather than subtracting two differently faceted meshes.
|
||||
let expected = (400.0 - 16.0) * std::f64::consts::PI * 20.0;
|
||||
let actual = volume(&s, "Stock");
|
||||
assert!((actual - expected).abs() < expected * 1e-5, "{actual} vs {expected}");
|
||||
let state = s.model.state();
|
||||
assert_eq!(state.bodies.len(), 1);
|
||||
let stock = state.body("Stock").unwrap();
|
||||
assert!(stock.body.validity().is_empty());
|
||||
let mesh = stock.mesh();
|
||||
assert!(mesh.contains(solidcraft_geom::Vec3::new(0.0, 0.0, 10.0)));
|
||||
for x in [-9.0, -3.0, 3.0, 9.0] {
|
||||
for y in [-9.0, -3.0, 3.0, 9.0] {
|
||||
assert!(!mesh.contains(solidcraft_geom::Vec3::new(x, y, 10.0)), "hole at {x}, {y}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn coplanar_body_faces_extrude_together_and_replay_their_links() {
|
||||
let mut s = Session::default();
|
||||
s.execute("solid.box", &json!({"length":64,"width":64,"height":20,"body_name":"Plate"})).unwrap();
|
||||
s.execute("sketch.create", &json!({"plane":{"origin":[0,0,20],"x_dir":[1,0,0],"y_dir":[0,1,0]}})).unwrap();
|
||||
let mut faces = Vec::new();
|
||||
for i in 0..8 {
|
||||
for j in 0..8 {
|
||||
let (x, y) = (2 + i * 7, 2 + j * 7);
|
||||
s.execute("sketch.rectangle.two_point", &json!({"p0":[x,y],"p1":[x+4,y+4]})).unwrap();
|
||||
faces.push(json!([x + 2, y + 2, 26]));
|
||||
}
|
||||
}
|
||||
s.execute("sketch.finish", &json!({})).unwrap();
|
||||
s.execute("solid.extrude", &json!({"distance":6,"operation":"join"})).unwrap();
|
||||
let (features, undo) = (s.doc.features.len(), s.undo.len());
|
||||
s.execute("solid.extrude", &json!({"faces":faces,"distance":-7,"operation":"cut"})).unwrap();
|
||||
assert_eq!(s.doc.features.len(), features + 2, "one linked sketch and one extrusion");
|
||||
assert_eq!(s.undo.len(), undo + 1);
|
||||
let actual = volume(&s, "Plate");
|
||||
let state = s.model.state();
|
||||
let sketch = state.sketch(4).unwrap();
|
||||
assert!((actual - 80_896.0).abs() < 1e-5, "volume {actual}; plane {:?}; profiles {}", sketch.plane, sketch.profiles.len());
|
||||
assert_eq!(s.model.state().bodies.len(), 1);
|
||||
let document = serde_json::from_value(serde_json::to_value(s.doc.as_ref()).unwrap()).unwrap();
|
||||
let mut reopened = Session { doc: std::sync::Arc::new(document), ..Session::default() };
|
||||
reopened.refresh();
|
||||
assert!((volume(&reopened, "Plate") - 80_896.0).abs() < 1e-5);
|
||||
s.execute("edit.undo", &json!({})).unwrap();
|
||||
assert_eq!(s.doc.features.len(), features);
|
||||
s.execute("edit.redo", &json!({})).unwrap();
|
||||
assert!((volume(&s, "Plate") - 80_896.0).abs() < 1e-5);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unsupported_face_groups_are_atomic() {
|
||||
let mut s = Session::default();
|
||||
s.execute("solid.box", &json!({"length":10,"width":10,"height":10})).unwrap();
|
||||
let before = serde_json::to_value(s.doc.as_ref()).unwrap();
|
||||
let (revision, undo) = (s.revision, s.undo.len());
|
||||
for faces in [
|
||||
json!([]),
|
||||
json!([[5, 5, 10], [5, 5, 0]]),
|
||||
json!([[5, 5, 10], [5, 0, 5]]),
|
||||
json!([[5, 5, 10], [1000, 1000, 1000]]),
|
||||
json!(vec![[5, 5, 10]; 1025]),
|
||||
] {
|
||||
assert!(s.execute("solid.extrude", &json!({"faces":faces,"distance":5,"operation":"join"})).is_err());
|
||||
assert_eq!(serde_json::to_value(s.doc.as_ref()).unwrap(), before);
|
||||
assert_eq!((s.revision, s.undo.len()), (revision, undo));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn imported_rotated_face_extrusions_preserve_other_operations_and_bodies() {
|
||||
use solidcraft_geom::Vec3;
|
||||
let mut source = Session::default();
|
||||
source.execute("solid.box", &json!({"corner":[-16,-16,-3],"length":32,"width":32,"height":1,"body_name":"Other"})).unwrap();
|
||||
source.execute("solid.cylinder", &json!({"radius":14,"height":8,"body_name":"Stock"})).unwrap();
|
||||
let mut outlines = Vec::new();
|
||||
let mut centers = Vec::new();
|
||||
for i in 0..12 {
|
||||
let angle = i as f64 * std::f64::consts::TAU / 12.;
|
||||
let (c, s) = (angle.cos(), angle.sin());
|
||||
let outline: Vec<_> =
|
||||
[(-2., -2.), (2., -2.), (2., 2.), (-2., 2.)].into_iter().map(|(x, y)| [10.7 * c + x * c - y * s, 10.7 * s + x * s + y * c]).collect();
|
||||
outlines.push(outline);
|
||||
centers.push([10.7 * c, 10.7 * s, 12.]);
|
||||
}
|
||||
let draw = |session: &mut Session, height: f64| {
|
||||
session.execute("sketch.create", &json!({"plane":{"origin":[0,0,height],"x_dir":[1,0,0],"y_dir":[0,1,0]}})).unwrap();
|
||||
for outline in &outlines {
|
||||
session.execute("sketch.line", &json!({"points":outline,"closed":true,"infer":false})).unwrap();
|
||||
}
|
||||
session.execute("sketch.finish", &json!({})).unwrap();
|
||||
};
|
||||
draw(&mut source, 8.);
|
||||
source.execute("solid.extrude", &json!({"distance":4,"operation":"join"})).unwrap();
|
||||
// An original public-safe STEP example, with rotated full-face seams and a
|
||||
// curved target. No vendor/user design is part of this regression.
|
||||
let path = std::env::temp_dir().join(format!("solidcraft-face-extrusion-{}.step", std::process::id()));
|
||||
source.execute("file.export", &json!({"path":path.to_string_lossy()})).unwrap();
|
||||
let mut imported = Session::default();
|
||||
imported.execute("doc.open", &json!({"path":path.to_string_lossy()})).unwrap();
|
||||
std::fs::remove_file(path).unwrap();
|
||||
let original = imported.model.state();
|
||||
let other = original.body("Other").unwrap().body.clone();
|
||||
for (operation, distance) in [("join", 2.), ("cut", -1.), ("new", 2.), ("intersect", -1.)] {
|
||||
let mut grouped = imported.scratch();
|
||||
grouped.execute("solid.extrude", &json!({"faces":centers,"distance":distance,"operation":operation})).unwrap();
|
||||
let mut reference = imported.scratch();
|
||||
draw(&mut reference, 12.);
|
||||
if matches!(operation, "join" | "cut") {
|
||||
// Individual tools retain the original Boolean and participant path.
|
||||
for index in 0..12 {
|
||||
reference
|
||||
.execute("solid.extrude", &json!({"sketch":"Sketch1","profiles":[index],"distance":distance,"operation":operation}))
|
||||
.unwrap();
|
||||
}
|
||||
} else {
|
||||
reference.execute("solid.extrude", &json!({"distance":distance,"operation":operation})).unwrap();
|
||||
}
|
||||
let actual = grouped.model.state();
|
||||
let expected = reference.model.state();
|
||||
assert_eq!(actual.bodies.len(), expected.bodies.len(), "{operation}");
|
||||
for body in &actual.bodies {
|
||||
let reference = expected.body(&body.name).unwrap();
|
||||
// Fixed fine chord tolerance: cap subdivision can change the default
|
||||
// adaptive mesh's cylinder faceting without changing its analytic surface.
|
||||
let (a, b) = (body.body.tessellate(1e-5).unwrap().measure().volume, reference.body.tessellate(1e-5).unwrap().measure().volume);
|
||||
assert!((a - b).abs() < b.max(1.) * 1e-6, "{operation}: {} {a} vs {b}", body.name);
|
||||
assert!(body.body.validity().is_empty(), "{operation}: {}", body.name);
|
||||
let (a, b) = (body.mesh(), reference.mesh());
|
||||
for center in ¢ers {
|
||||
for z in [7., 11.5, 13.] {
|
||||
let point = Vec3::new(center[0], center[1], z);
|
||||
assert_eq!(a.contains(point), b.contains(point), "{operation}: {} {point:?}", body.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
if operation != "intersect" {
|
||||
let unchanged = &actual.body("Other").unwrap().body;
|
||||
assert_eq!(unchanged.face_count(), other.face_count());
|
||||
assert_eq!(unchanged.color(), other.color());
|
||||
assert_eq!(unchanged.tessellate(0.01).unwrap().positions, other.tessellate(0.01).unwrap().positions, "unaffected imported body");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn multi_target_join_keeps_nearby_bodies_and_original_absorption_order() {
|
||||
for (second_x, expected_count) in [(10.0015, 2), (9., 1)] {
|
||||
let mut session = Session::default();
|
||||
session.execute("solid.box", &json!({"length":10,"width":10,"height":10,"body_name":"Stock"})).unwrap();
|
||||
session.execute("solid.box", &json!({"corner":[second_x,8,10],"length":1,"width":1,"height":2,"body_name":"Other"})).unwrap();
|
||||
session.execute("sketch.create", &json!({"plane":{"origin":[0,0,10],"x_dir":[1,0,0],"y_dir":[0,1,0]}})).unwrap();
|
||||
for origin in [[0., 0.], [8., 8.]] {
|
||||
session.execute("sketch.rectangle.two_point", &json!({"p0":origin,"p1":[origin[0]+2.,origin[1]+2.]})).unwrap();
|
||||
}
|
||||
session.execute("sketch.finish", &json!({})).unwrap();
|
||||
let mut reference = session.scratch();
|
||||
for index in 0..2 {
|
||||
reference.execute("solid.extrude", &json!({"sketch":"Sketch1","profiles":[index],"distance":2,"operation":"join"})).unwrap();
|
||||
}
|
||||
session.execute("solid.extrude", &json!({"distance":2,"operation":"join"})).unwrap();
|
||||
assert_eq!(session.model.state().bodies.len(), expected_count);
|
||||
assert_eq!(
|
||||
session.model.state().bodies.iter().map(|body| body.name.clone()).collect::<Vec<_>>(),
|
||||
reference.model.state().bodies.iter().map(|body| body.name.clone()).collect::<Vec<_>>()
|
||||
);
|
||||
for body in &session.model.state().bodies {
|
||||
assert!((volume(&session, &body.name) - volume(&reference, &body.name)).abs() < 1e-6);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user