Planar source matching looks only at planes with the same normal (#917)
Body::with_planar_sources compared every planar face of a result with every unsourced planar face of its inputs, so a boolean on an import with a few thousand facets ran out of its comparison budget before it started. The lists are now sorted by normal x and each face only compares with entries inside a narrow normal window found by binary search; the exact same_support test and the work budget are unchanged. Adds an engine test joining a pin onto a 4000-sided imported prism.
This commit is contained in:
1 parent
2eb292dd4a
commit
7da7bbb335
2 files changed
+58
-10
No files matched your search
@@ -959,6 +959,36 @@ fn step_open_then_model_on_it() {
|
|||||||
assert!(rel(volume(&mut s2), before) < 1e-6);
|
assert!(rel(volume(&mut s2), before) < 1e-6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A join onto an imported body of thousands of planar faces (a converted mesh, say): each face of
|
||||||
|
/// the result was compared with every planar face of the inputs whose source is unknown, and the
|
||||||
|
/// join was refused past the comparison budget.
|
||||||
|
#[test]
|
||||||
|
fn join_onto_a_finely_faceted_import() {
|
||||||
|
let dir = std::env::temp_dir().join(format!("solidcraft-step-faceted-{}", std::process::id()));
|
||||||
|
std::fs::create_dir_all(&dir).unwrap();
|
||||||
|
let n = 4000;
|
||||||
|
let mut pts: Vec<[f64; 2]> =
|
||||||
|
(0..n).map(|i| std::f64::consts::TAU * f64::from(i) / f64::from(n)).map(|a| [20.0 * a.cos(), 20.0 * a.sin()]).collect();
|
||||||
|
pts.push(pts[0]);
|
||||||
|
let mut s = Session::default();
|
||||||
|
run(&mut s, "sketch.create", json!({"plane": "XY", "name": "P"}));
|
||||||
|
run(&mut s, "sketch.line", json!({"points": pts}));
|
||||||
|
run(&mut s, "sketch.finish", json!({}));
|
||||||
|
run(&mut s, "solid.extrude", json!({"sketch": "P", "distance": 10}));
|
||||||
|
let p = dir.join("Faceted.step");
|
||||||
|
run(&mut s, "file.export", json!({"path": p.to_string_lossy()}));
|
||||||
|
let prism = volume(&mut s);
|
||||||
|
|
||||||
|
let mut d = Session::default();
|
||||||
|
run(&mut d, "file.insert_step", json!({"path": p.to_string_lossy()}));
|
||||||
|
run(&mut d, "sketch.create", json!({"plane": "XY", "name": "Pin"}));
|
||||||
|
run(&mut d, "sketch.rectangle.two_point", json!({"p0": [-5, -5], "p1": [5, 5]}));
|
||||||
|
run(&mut d, "sketch.finish", json!({}));
|
||||||
|
run(&mut d, "solid.extrude", json!({"sketch": "Pin", "distance": 25, "operation": "join"}));
|
||||||
|
assert_eq!(d.model.state().bodies.len(), 1);
|
||||||
|
assert!(rel(volume(&mut d), prism + 10.0 * 10.0 * 15.0) < 1e-6, "{}", volume(&mut d));
|
||||||
|
}
|
||||||
|
|
||||||
/// Shell an imported body; insert STEP into an existing design; extension case; bad files.
|
/// Shell an imported body; insert STEP into an existing design; extension case; bad files.
|
||||||
#[test]
|
#[test]
|
||||||
fn step_insert_shell_and_errors() {
|
fn step_insert_shell_and_errors() {
|
||||||
|
|||||||
@@ -18,6 +18,18 @@ pub(super) fn actual_plane(face: &mt::Face) -> Option<Plane> {
|
|||||||
Plane::new(from_p3(p.origin()), u, v)
|
Plane::new(from_p3(p.origin()), u, v)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// How far apart the normals' x components of two planes `same_support` accepts can be, with
|
||||||
|
/// room to spare: their unit normals are within about 1e-12 of each other.
|
||||||
|
const NORMAL_WINDOW: f64 = 1e-9;
|
||||||
|
|
||||||
|
/// The entries of `sorted` (ordered by their plane's normal x) whose normal x is within
|
||||||
|
/// [`NORMAL_WINDOW`] of `nx`: the only ones `same_support` can accept for a plane with that normal.
|
||||||
|
fn normal_window<T>(sorted: &[T], plane: impl Fn(&T) -> &Plane, nx: f64) -> &[T] {
|
||||||
|
let first = sorted.partition_point(|t| plane(t).normal().x < nx - NORMAL_WINDOW);
|
||||||
|
let last = sorted.partition_point(|t| plane(t).normal().x <= nx + NORMAL_WINDOW);
|
||||||
|
sorted.get(first..last.max(first)).unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
pub(super) fn same_support(a: &Plane, b: &Plane) -> bool {
|
pub(super) fn same_support(a: &Plane, b: &Plane) -> bool {
|
||||||
let error = 4096. * f64::EPSILON * (1. + a.origin.len() + b.origin.len());
|
let error = 4096. * f64::EPSILON * (1. + a.origin.len() + b.origin.len());
|
||||||
a.normal().cross(b.normal()).len() <= 4096. * f64::EPSILON
|
a.normal().cross(b.normal()).len() <= 4096. * f64::EPSILON
|
||||||
@@ -162,7 +174,13 @@ impl Body {
|
|||||||
}
|
}
|
||||||
let opening_tolerance = if shell.is_some() { inputs.iter().map(|input| input.size()).fold(0., f64::max) * 1e-4 + 1e-6 } else { 0. };
|
let opening_tolerance = if shell.is_some() { inputs.iter().map(|input| input.size()).fold(0., f64::max) * 1e-4 + 1e-6 } else { 0. };
|
||||||
let mapped = guard("exact planar support lineage", || {
|
let mapped = guard("exact planar support lineage", || {
|
||||||
let competing: Vec<_> = blocker.into_iter().flat_map(|b| b.solid.face_iter()).filter_map(actual_plane).collect();
|
let mut competing = Vec::new();
|
||||||
|
for plane in blocker.into_iter().flat_map(|b| b.solid.face_iter()).filter_map(actual_plane) {
|
||||||
|
// A tool face blocks a face on its plane facing either way.
|
||||||
|
let opposing = Plane::new(plane.origin, plane.x, -plane.y).ok_or_else(|| KernelError::Invalid("invalid opposing plane".into()))?;
|
||||||
|
competing.extend([plane, opposing]);
|
||||||
|
}
|
||||||
|
competing.sort_by(|a, b| a.normal().x.total_cmp(&b.normal().x));
|
||||||
let mut candidates = Vec::new();
|
let mut candidates = Vec::new();
|
||||||
let mut unknown_supports = Vec::new();
|
let mut unknown_supports = Vec::new();
|
||||||
let faces = inputs.iter().flat_map(|input| {
|
let faces = inputs.iter().flat_map(|input| {
|
||||||
@@ -198,6 +216,10 @@ impl Body {
|
|||||||
candidates.push((inner, source, true, cost));
|
candidates.push((inner, source, true, cost));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Planes that match must have (nearly) the same unit normal (`same_support`), so the
|
||||||
|
// lists are sorted by the normal's x and each face looks only at its window of them.
|
||||||
|
unknown_supports.sort_by(|a, b| a.normal().x.total_cmp(&b.normal().x));
|
||||||
|
candidates.sort_by(|a, b| a.0.normal().x.total_cmp(&b.0.normal().x));
|
||||||
let mut work = 2_000_000usize;
|
let mut work = 2_000_000usize;
|
||||||
let mut metadata = 2_000_000usize;
|
let mut metadata = 2_000_000usize;
|
||||||
let mut identity_bytes = 16_000_000usize;
|
let mut identity_bytes = 16_000_000usize;
|
||||||
@@ -206,21 +228,17 @@ impl Body {
|
|||||||
let mut found = None;
|
let mut found = None;
|
||||||
if let Some(actual) = actual_plane(face) {
|
if let Some(actual) = actual_plane(face) {
|
||||||
let mut blocked = false;
|
let mut blocked = false;
|
||||||
for plane in &unknown_supports {
|
let nx = actual.normal().x;
|
||||||
|
for plane in normal_window(&unknown_supports, |p| p, nx) {
|
||||||
work = work.checked_sub(1).ok_or_else(|| KernelError::Invalid("unknown planar source comparison budget exceeded".into()))?;
|
work = work.checked_sub(1).ok_or_else(|| KernelError::Invalid("unknown planar source comparison budget exceeded".into()))?;
|
||||||
if same_support(plane, &actual) {
|
if same_support(plane, &actual) {
|
||||||
blocked = true;
|
blocked = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for plane in &competing {
|
for plane in normal_window(&competing, |p| p, nx) {
|
||||||
work = work.checked_sub(1).ok_or_else(|| KernelError::Invalid("planar tool comparison budget exceeded".into()))?;
|
work = work.checked_sub(1).ok_or_else(|| KernelError::Invalid("planar tool comparison budget exceeded".into()))?;
|
||||||
if same_support(plane, &actual)
|
if same_support(plane, &actual) {
|
||||||
|| same_support(
|
|
||||||
&Plane::new(plane.origin, plane.x, -plane.y).ok_or_else(|| KernelError::Invalid("invalid opposing plane".into()))?,
|
|
||||||
&actual,
|
|
||||||
)
|
|
||||||
{
|
|
||||||
blocked = true;
|
blocked = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -243,7 +261,7 @@ impl Body {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let mut chosen: Option<(Plane, &FaceSource, bool, usize)> = None;
|
let mut chosen: Option<(Plane, &FaceSource, bool, usize)> = None;
|
||||||
for (plane, source, inner, cost) in &candidates {
|
for (plane, source, inner, cost) in normal_window(&candidates, |c| &c.0, nx) {
|
||||||
work = work.checked_sub(1).ok_or_else(|| KernelError::Invalid("planar source comparison budget exceeded".into()))?;
|
work = work.checked_sub(1).ok_or_else(|| KernelError::Invalid("planar source comparison budget exceeded".into()))?;
|
||||||
if same_support(plane, &actual) {
|
if same_support(plane, &actual) {
|
||||||
if let Some((previous_plane, previous_source, previous_inner, _)) = chosen {
|
if let Some((previous_plane, previous_source, previous_inner, _)) = chosen {
|
||||||
|
|||||||
Reference in new issue
Block a user