Wave 167/509: kernel: boundary surfaces on the record (and 3 more)

4 commits, squashed; the originals stay reachable from tag archive/merge-main-develop.

- e00645ca5 jyviko: kernel: crate root follows the split, surfaces and SSI ports
- 252b2947a jyviko: kernel: mesh bodies built by Body::of_mesh; fuzz booleans have no fallback counts
- 0013249c4 jyviko: kernel: Patch of a body's edges is fill's patch with no crown
- 08f061b02 jyviko: kernel: boundary surfaces on the record

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ
This commit is contained in:
jyviko
2026-10-22 07:21:31 -04:00
parent 186b145be8
commit 585a6b4efe
9 changed files with 211 additions and 300 deletions
+191 -158
View File
@@ -11,19 +11,16 @@
//! The two-curve bridge with G0–G3 against a sketch's plane is [`crate::boundary`]; this is the
//! general case: three or four sides, interior curves, 3D curves and edges.
use std::collections::HashSet;
use mt::{BoundedCurve, Cut, InnerSpace, ParametricCurve, ParametricSurface, SearchNearestParameter};
use solidcraft_geom::brep::Brep;
use solidcraft_geom::brep::eval::{CurveEval, SurfaceEval};
use solidcraft_geom::bspline::{CurveN, NurbsSurface, SplineError};
use solidcraft_geom::network::{self, CrossFace, FaceFrame, NetCurve, NetworkCurve, PointCurve, Tolerances};
use solidcraft_geom::{Plane, Seg2, Vec3};
use truck_modeling as mt;
use crate::body::{Body, from_p3, p3};
use crate::body::Body;
use crate::bridge::Continuity;
use crate::plane_fit::EdgeSampler;
use crate::record::Rebuild;
use crate::{KernelError, Result, guard};
use crate::surfaces::{Chain, Parts, spline_curve, spline_surface, surface_body, uv_line};
use crate::{KernelError, Result};
/// How far apart curves of the two directions may pass and still cross (mm).
pub const CROSS_TOLERANCE: f64 = 0.01;
@@ -79,7 +76,7 @@ pub fn boundary_surface(u: &[BoundaryCurve], v: &[BoundaryCurve]) -> Result<Body
body.require_brep("boundary surface")?;
}
}
guard("boundary surface", || {
{
let mut corners: Vec<Vec3> = Vec::new();
let mut to_net = |c: &BoundaryCurve| -> Result<NetworkCurve<'static>> {
let (curve, face): (Box<dyn NetCurve>, Option<EdgeFaces>) = match &c.source {
@@ -101,12 +98,18 @@ pub fn boundary_surface(u: &[BoundaryCurve], v: &[BoundaryCurve]) -> Result<Body
}
// The chain's inner vertices: the face's sides are split there, so that a
// join shares the body's edges one for one.
corners.extend(chain.iter().skip(1).map(|e| from_p3(e.front().point())));
let r = body.record();
for &(e, forward) in chain.iter().skip(1) {
let start = r.edges.get(e).and_then(|x| r.vertices.get(x.vertices[if forward { 0 } else { 1 }] as usize));
if let Some(v) = start {
corners.push(Vec3::new(v.point[0], v.point[1], v.point[2]));
}
}
let face = match c.continuity {
Continuity::G0 => None,
_ => Some(EdgeFaces::new(&c.label, body, &chain)?),
};
(Box::new(EdgeChain::new(&c.label, &chain)?), face)
(Box::new(EdgeChain::new(&c.label, r, &chain)?), face)
}
};
if c.continuity != Continuity::G0 && face.is_none() {
@@ -122,20 +125,16 @@ pub fn boundary_surface(u: &[BoundaryCurve], v: &[BoundaryCurve]) -> Result<Body
SplineError::TooLarge(m) => KernelError::TooLarge(m),
SplineError::Invalid(m) => KernelError::Invalid(m),
})?;
let face = face_of(&surface, &corners)?;
let mut rec = Rebuild::default();
rec.made(&face, Vec::new());
crate::surfaces::body_of(vec![face], &[], &rec)
})
face_of(&surface, &corners)
}
}
/// `made` (a boundary surface) sewn into `target` along the edges they share: one body, a solid
/// when it closes the gap. Refused when they share no edge.
pub fn boundary_join(target: &Body, made: &Body) -> Result<Body> {
target.require_brep("join")?;
let edges = |b: &Body| b.solid.edge_iter().map(|e| e.id()).collect::<HashSet<_>>().len();
let joined = crate::surfaces::stitch(&[target, made], CROSS_TOLERANCE)?;
if edges(&joined) == edges(target) + edges(made) {
if joined.edge_count() == target.edge_count() + made.edge_count() {
return Err(KernelError::Invalid("the surface shares no edge with the body it joins".into()));
}
Ok(joined)
@@ -245,32 +244,42 @@ fn resample(pts: &[Vec3], max: usize) -> Vec<Vec3> {
.collect()
}
/// A chain of edges (each turned to run along it), by their lengths.
/// A chain of a body's edges (each walked the way the chain runs along it), by their lengths;
/// a point a fraction of the way along an edge is at that fraction of its parameter interval.
struct EdgeChain {
edges: Vec<EdgeSampler>,
edges: Vec<(CurveEval, [f64; 2])>,
starts: Vec<f64>,
total: f64,
}
/// The curves of `chain` (edges of `r`), each with its interval in the chain's direction.
fn chain_curves(label: &str, r: &Brep, chain: &Chain) -> Result<Vec<(CurveEval, [f64; 2])>> {
chain
.iter()
.map(|&(e, forward)| {
let edge = r.edges.get(e).ok_or_else(|| KernelError::Invalid(format!("{label}: an edge reference")))?;
let c = CurveEval::new(&edge.curve).map_err(|err| KernelError::Invalid(format!("{label}: {err}")))?;
let [t0, t1] = edge.interval;
Ok((c, if forward { [t0, t1] } else { [t1, t0] }))
})
.collect()
}
/// The point `f` (0…1) of the way along a directed interval of a curve.
fn along((c, [a, z]): &(CurveEval, [f64; 2]), f: f64) -> Option<Vec3> {
c.point(a + (z - a) * f.clamp(0.0, 1.0))
}
impl EdgeChain {
fn new(label: &str, chain: &[mt::Edge]) -> Result<EdgeChain> {
let mut edges = Vec::with_capacity(chain.len());
let mut starts = Vec::with_capacity(chain.len());
fn new(label: &str, r: &Brep, chain: &Chain) -> Result<EdgeChain> {
let edges = chain_curves(label, r, chain)?;
let mut starts = Vec::with_capacity(edges.len());
let mut total = 0.0;
for e in chain {
let mut s = EdgeSampler::new(e).ok_or_else(|| KernelError::Invalid(format!("{label}: an edge has no parameter range")))?;
let mut len = 0.0;
let mut last: Option<Vec3> = None;
for k in 0..=16 {
let p = s.at(k as f64 / 16.0).ok_or_else(|| KernelError::Invalid(format!("{label}: an edge can't be evaluated")))?;
if let Some(q) = last {
len += p.dist(q);
}
last = Some(p);
}
for e in &edges {
let pts = (0..=16).map(|k| along(e, k as f64 / 16.0)).collect::<Option<Vec<_>>>();
let pts = pts.ok_or_else(|| KernelError::Invalid(format!("{label}: an edge can't be evaluated")))?;
starts.push(total);
total += len;
edges.push(s);
total += pts.windows(2).map(|w| w[0].dist(w[1])).sum::<f64>();
}
if !(total > 0.0 && total.is_finite()) {
return Err(KernelError::Invalid(format!("{label} has no length")));
@@ -286,7 +295,7 @@ impl NetCurve for EdgeChain {
let start = *self.starts.get(k)?;
let end = self.starts.get(k + 1).copied().unwrap_or(self.total);
let local = if end > start { ((at - start) / (end - start)).clamp(0.0, 1.0) } else { 0.0 };
self.edges.get_mut(k)?.at(local)
along(self.edges.get(k)?, local)
}
}
@@ -302,29 +311,34 @@ pub(crate) struct EdgeFaces {
/// parameters found last (the next search starts there).
struct EdgeSide {
pts: Vec<Vec3>,
surface: mt::Surface,
surface: SurfaceEval,
along: bool,
hint: Option<(f64, f64)>,
hint: Option<[f64; 2]>,
}
impl EdgeFaces {
pub(crate) fn new(label: &str, body: &Body, chain: &[mt::Edge]) -> Result<EdgeFaces> {
pub(crate) fn new(label: &str, body: &Body, chain: &Chain) -> Result<EdgeFaces> {
let r = body.record();
let curves = chain_curves(label, r, chain)?;
let mut sides = Vec::with_capacity(chain.len());
for e in chain {
let mut faces = body.solid.face_iter().filter(|f| f.boundaries().iter().flatten().any(|x| x.id() == e.id()));
let (Some(face), None) = (faces.next(), faces.next()) else {
for (&(e, forward), curve) in chain.iter().zip(&curves) {
let edge = r.edges.get(e).ok_or_else(|| KernelError::Invalid(format!("{label}: an edge reference")))?;
let [u] = edge.uses.as_slice() else {
return Err(KernelError::Invalid(format!(
"{label}: G1 and G2 need an open edge of a surface (an edge with a face on one side only)"
)));
};
// How the face's own (absolute) boundary runs this edge.
let in_wire = face.absolute_boundaries().iter().flatten().find(|x| x.id() == e.id()).cloned();
let in_wire = in_wire.ok_or_else(|| KernelError::Failed("boundary surface: an edge's face".into()))?;
let along = in_wire.front().id() == e.front().id();
let mut sampler = EdgeSampler::new(e).ok_or_else(|| KernelError::Invalid(format!("{label}: an edge has no parameter range")))?;
let pts = (0..=16).map(|k| sampler.at(k as f64 / 16.0)).collect::<Option<Vec<_>>>();
// How the face's loop (counter-clockwise about its surface's natural normal) runs the edge.
let face = r.faces.get(u.face as usize).ok_or_else(|| KernelError::Failed("boundary surface: an edge's face".into()))?;
let in_loop = match face.loops.get(u.r#loop as usize) {
Some(solidcraft_geom::brep::Loop::Edges { edges }) => edges.get(u.position as usize).map(|x| x.forward),
_ => None,
};
let in_loop = in_loop.ok_or_else(|| KernelError::Failed("boundary surface: an edge's face".into()))?;
let pts = (0..=16).map(|k| along(curve, k as f64 / 16.0)).collect::<Option<Vec<_>>>();
let pts = pts.ok_or_else(|| KernelError::Invalid(format!("{label}: an edge can't be evaluated")))?;
sides.push(EdgeSide { pts, surface: face.surface(), along, hint: None });
let surface = SurfaceEval::new(&face.surface).map_err(|err| KernelError::Failed(format!("boundary surface: {err}")))?;
sides.push(EdgeSide { pts, surface, along: in_loop == forward, hint: None });
}
Ok(EdgeFaces { sides })
}
@@ -339,17 +353,12 @@ impl CrossFace for EdgeFaces {
let seg = side.pts.windows(2).min_by(|a, b| at.dist_to_segment(a[0], a[1]).total_cmp(&at.dist_to_segment(b[0], b[1])))?;
let chain_dir = seg[1] - seg[0];
let s = &side.surface;
let (u, v) = s.search_nearest_parameter(p3(at), side.hint, 100).or_else(|| s.search_nearest_parameter(p3(at), None, 100))?;
side.hint = Some((u, v));
let (su, sv) = (s.uder(u, v), s.vder(u, v));
let n = su.cross(sv);
if !(n.magnitude2() > 0.0) {
return None;
}
let n = n.normalize();
let normal = Vec3::new(n.x, n.y, n.z);
// The face's boundary runs counter-clockwise about its surface's normal, so the face lies
// to the left of it: outward is the boundary's direction × the normal.
let [u, v] = s.project(at, side.hint, f64::INFINITY).or_else(|| s.project(at, None, f64::INFINITY))?;
side.hint = Some([u, v]);
let (_, su, sv) = s.derivs(u, v)?;
let normal = su.cross(sv).normalized()?;
// The face's loop runs counter-clockwise about its surface's normal, so the face lies to
// the left of it: outward is the loop's direction × the normal.
let wire = if side.along { chain_dir } else { -chain_dir };
let outward = wire.cross(normal).normalized()?;
// The second fundamental form, in the basis of the tangent asked about and outward.
@@ -363,11 +372,10 @@ impl CrossFace for EdgeFaces {
// II(w, w) = L·α² + 2M·αβ + N·β² for w = α·S_u + β·S_v, with L, M, N the surface's
// second derivatives along its unit normal (do Carmo, §3-3): exact, rational surfaces
// included, and with nothing sampled beyond the edge, where the face's domain ends.
let nv = mt::Vector3::new(normal.x, normal.y, normal.z);
let (l, m, nn) = (s.uuder(u, v).dot(nv), s.uvder(u, v).dot(nv), s.vvder(u, v).dot(nv));
let (suu, suv, svv) = s.second(u, v)?;
let (l, m, nn) = (suu.dot(normal), suv.dot(normal), svv.dot(normal));
let ii = |w: Vec3| -> Option<f64> {
let wv = mt::Vector3::new(w.x, w.y, w.z);
let (p, q) = (wv.dot(su), wv.dot(sv));
let (p, q) = (w.dot(su), w.dot(sv));
let (alpha, beta) = ((p * g - q * f) / det, (q * e - p * f) / det);
let out = l * alpha * alpha + 2.0 * m * alpha * beta + nn * beta * beta;
out.is_finite().then_some(out)
@@ -380,98 +388,125 @@ impl CrossFace for EdgeFaces {
}
/// The face of a network surface: its four sides from the surface's boundary rows, each split
/// at the `corners` that lie on it (inner vertices of edge chains). Refused when a side shrinks to
/// a point.
fn face_of(s: &NurbsSurface, corners: &[Vec3]) -> Result<mt::Face> {
/// at the `corners` that lie on it (inner vertices of edge chains), the pieces edges on the side's
/// own curve over parts of its interval. A side collapsed to a point (a three-sided patch) is left
/// out: the two sides beside it meet at one vertex there. Refused when more than one side
/// shrinks to a point.
fn face_of(s: &NurbsSurface, corners: &[Vec3]) -> Result<Body> {
let fail = |m: &str| KernelError::Failed(format!("boundary surface: {m}"));
let [nu, nv] = s.count();
let [ku, kv] = s.knots();
let rows: Vec<Vec<mt::Point3>> = (0..nu).map(|i| (0..nv).map(|j| p3(s.point(i, j).xyz())).collect()).collect();
let (uk, vk) = (mt::KnotVec::from(ku.clone()), mt::KnotVec::from(kv.clone()));
let surface = mt::BSplineSurface::try_new((uk.clone(), vk.clone()), rows.clone()).map_err(|e| fail(&e.to_string()))?;
let row = |pts: Vec<mt::Point3>, k: &mt::KnotVec| mt::BSplineCurve::try_new(k.clone(), pts).map_err(|e| fail(&e.to_string()));
let (Some(first), Some(last)) = (rows.first(), rows.last()) else { return Err(fail("control net")) };
let bottom = row(rows.iter().filter_map(|r| r.first().copied()).collect(), &uk)?;
let top = row(rows.iter().filter_map(|r| r.last().copied()).collect(), &uk)?;
let left = row(first.clone(), &vk)?;
let right = row(last.clone(), &vk)?;
let corner = |c: &mt::BSplineCurve<mt::Point3>, end: bool| {
let (t0, t1) = c.range_tuple();
c.subs(if end { t1 } else { t0 })
if nu < 2 || nv < 2 {
return Err(fail("control net"));
}
let [ku, kv] = s.knots().clone();
let [[u0, u1], [v0, v1]] = s.domain();
let corner = |i: usize, j: usize| s.point(i, j).project().ok_or_else(|| fail("a corner has no position"));
let c = [corner(0, 0)?, corner(nu - 1, 0)?, corner(nu - 1, nv - 1)?, corner(0, nv - 1)?];
let size = c.iter().map(|p| p.dist(c[0])).fold(0.0, f64::max).max(1.0);
let row = |j: usize| (0..nu).map(|i| s.point(i, j)).collect::<Vec<_>>();
let column = |i: usize| (0..nv).map(|j| s.point(i, j)).collect::<Vec<_>>();
// Bottom (v0) and top (v1) along u, left (u0) and right (u1) along v, each from its first
// corner to its second; the loop runs bottom, right, top backwards, left backwards.
let sides = [
(row(0), ku.clone(), [0, 1], true, [None, Some(v0)]),
(column(nu - 1), kv.clone(), [1, 2], true, [Some(u1), None]),
(row(nv - 1), ku, [3, 2], false, [None, Some(v1)]),
(column(0), kv, [0, 3], false, [Some(u0), None]),
];
let collapsed: Vec<bool> = sides.iter().map(|(_, _, [a, z], ..)| c[*a].dist(c[*z]) <= size * 1e-9).collect();
if collapsed.iter().filter(|x| **x).count() > 1 {
return Err(KernelError::Invalid("not supported yet: a boundary surface with more than one side shrunk to a point".into()));
}
// Vertices: the corners, a collapsed side's two ends one vertex.
let mut vertex_of = [0usize, 1, 2, 3];
for (k, (_, _, [a, z], ..)) in sides.iter().enumerate() {
if collapsed.get(k).copied().unwrap_or(false) {
vertex_of[*z] = vertex_of[*a];
}
}
let tolerance = (size * 1e-6).max(1e-5);
let mut parts = Parts { tolerance, ..Parts::default() };
parts.vertices = c.iter().map(|p| solidcraft_geom::brep::Vertex { point: [p.x, p.y, p.z], tolerance }).collect();
let mut uses = Vec::new();
for (k, (ctrl, knots, [a, z], forward, fixed)) in sides.into_iter().enumerate() {
if collapsed.get(k).copied().unwrap_or(false) {
continue;
}
let (curve, [t0, t1]) = spline_curve(&ctrl, knots)?;
let eval = CurveEval::new(&curve).map_err(|e| fail(&e.to_string()))?;
let cuts = cuts_on(&eval, [t0, t1], corners);
let mut breaks = vec![t0];
breaks.extend(cuts.iter().map(|(t, _)| *t));
breaks.push(t1);
let mut ends = vec![vertex_of[a]];
for (_, p) in &cuts {
ends.push(parts.vertices.len());
parts.vertices.push(solidcraft_geom::brep::Vertex { point: [p.x, p.y, p.z], tolerance });
}
ends.push(vertex_of[z]);
let uv = |t: f64| [fixed[0].unwrap_or(t), fixed[1].unwrap_or(t)];
let mut pieces = Vec::with_capacity(breaks.len());
for (w, e) in breaks.windows(2).zip(ends.windows(2)) {
let interval = [w[0], w[1]];
let edge = index(parts.edges.len())?;
let vertices = [index(e[0])?, index(e[1])?];
parts.edges.push(solidcraft_geom::brep::Edge { curve: curve.clone(), interval, vertices, tolerance, uses: Vec::new() });
pieces.push(solidcraft_geom::brep::OrientedEdge { edge, forward, pcurve: uv_line(uv(w[0]), uv(w[1]), interval) });
}
if !forward {
pieces.reverse();
}
uses.extend(pieces);
}
let face = solidcraft_geom::brep::Face {
surface: spline_surface(s),
domain: s.domain(),
loops: vec![solidcraft_geom::brep::Loop::Edges { edges: uses }],
};
let (c00, c10, c11, c01) = (corner(&bottom, false), corner(&bottom, true), corner(&top, true), corner(&top, false));
let size = [c00, c10, c11, c01].iter().map(|p| from_p3(*p).dist(from_p3(c00))).fold(0.0, f64::max).max(1.0);
// A side collapsed to a point (a three-sided patch) is left out of the loop: the two sides
// beside it meet at one vertex there.
let sides = [(c00, c10), (c10, c11), (c01, c11), (c00, c01)];
let collapsed: Vec<bool> = sides.iter().map(|(a, b)| from_p3(*a).dist(from_p3(*b)) <= size * 1e-9).collect();
match collapsed.iter().filter(|c| **c).count() {
0 | 1 => {}
_ => return Err(KernelError::Invalid("not supported yet: a boundary surface with more than one side shrunk to a point".into())),
}
let mut verts: Vec<mt::Vertex> = Vec::with_capacity(4);
for c in [c00, c10, c11, c01] {
let same = verts.iter().find(|v| from_p3(v.point()).dist(from_p3(c)) <= size * 1e-9).cloned();
verts.push(same.unwrap_or_else(|| mt::Vertex::new(c)));
}
let (Some(v00), Some(v10), Some(v11), Some(v01)) = (verts.first(), verts.get(1), verts.get(2), verts.get(3)) else {
return Err(fail("corners"));
};
let is = |k: usize| collapsed.get(k).copied().unwrap_or(false);
let mut wire: Vec<mt::Edge> = Vec::new();
if !is(0) {
wire.extend(side_edges(bottom, v00, v10, corners));
}
if !is(1) {
wire.extend(side_edges(right, v10, v11, corners));
}
if !is(2) {
wire.extend(side_edges(top, v01, v11, corners).into_iter().rev().map(|e| e.inverse()));
}
if !is(3) {
wire.extend(side_edges(left, v00, v01, corners).into_iter().rev().map(|e| e.inverse()));
}
// u along the bottom, v up the left: counter-clockwise in (u, v).
mt::Face::try_new(vec![wire.into()], mt::Surface::BSplineSurface(surface)).map_err(|e| fail(&e.to_string()))
parts.faces.push((face, true));
let body = surface_body(&parts.canonical()?.brep)?;
crate::surfaces::all_new(body, &[])
}
/// The edges of one side from `a` to `b`, split at the points of `corners` that lie on it
/// (within [`CROSS_TOLERANCE`]) strictly between its ends.
fn side_edges(mut curve: mt::BSplineCurve<mt::Point3>, a: &mt::Vertex, b: &mt::Vertex, corners: &[Vec3]) -> Vec<mt::Edge> {
let (t0, t1) = curve.range_tuple();
/// The points of `corners` on a side's curve (within [`CROSS_TOLERANCE`]) strictly between its
/// ends, with their parameters, in order: each found from its nearest of 256 samples by
/// golden-section search.
fn cuts_on(c: &CurveEval, [t0, t1]: [f64; 2], corners: &[Vec3]) -> Vec<(f64, Vec3)> {
const SAMPLES: usize = 256;
let margin = (t1 - t0) * 1e-6;
let mut cuts: Vec<f64> = corners
let mut cuts: Vec<(f64, Vec3)> = corners
.iter()
.filter_map(|c| {
let t = curve.search_nearest_parameter(p3(*c), None, 100)?;
(t > t0 + margin && t < t1 - margin && from_p3(curve.subs(t)).dist(*c) <= CROSS_TOLERANCE).then_some(t)
.filter_map(|p| {
let d = |t: f64| c.point(t).map_or(f64::INFINITY, |q| q.dist(*p));
let at = |i: usize| t0 + (t1 - t0) * i as f64 / SAMPLES as f64;
let i = (0..=SAMPLES).min_by(|a, b| d(at(*a)).total_cmp(&d(at(*b))))?;
let (mut lo, mut hi) = (at(i.saturating_sub(1)), at((i + 1).min(SAMPLES)));
let g = 0.5 * (5f64.sqrt() - 1.0);
for _ in 0..80 {
let (x, y) = (hi - g * (hi - lo), lo + g * (hi - lo));
if d(x) < d(y) {
hi = y;
} else {
lo = x;
}
}
let t = 0.5 * (lo + hi);
(t > t0 + margin && t < t1 - margin && d(t) <= CROSS_TOLERANCE).then(|| (t, c.point(t).unwrap_or(*p)))
})
.collect();
cuts.sort_by(f64::total_cmp);
cuts.dedup_by(|x, y| (*x - *y).abs() <= margin);
let mut edges = Vec::with_capacity(cuts.len() + 1);
let mut from = a.clone();
// Cut from the far end back, so the earlier parameters stay on the part kept.
let mut tails = Vec::with_capacity(cuts.len());
for &t in cuts.iter().rev() {
tails.push(curve.cut(t));
}
let mut pieces = vec![curve];
pieces.extend(tails.into_iter().rev());
let count = pieces.len();
for (k, piece) in pieces.into_iter().enumerate() {
let to = if k + 1 == count { b.clone() } else { mt::Vertex::new(piece.subs(piece.range_tuple().1)) };
edges.push(mt::Edge::new(&from, &to, mt::Curve::BSplineCurve(piece)));
from = to;
}
edges
cuts.sort_by(|a, b| a.0.total_cmp(&b.0));
cuts.dedup_by(|x, y| (x.0 - y.0).abs() <= margin);
cuts
}
fn index(i: usize) -> Result<u32> {
u32::try_from(i).map_err(|_| KernelError::TooLarge("boundary surface: too many edges".into()))
}
#[cfg(test)]
mod tests {
use super::*;
use crate::patch_region;
use mt::ParametricSurface3D;
use solidcraft_geom::{Loop2, Region2, Vec2};
fn sketch(label: &str, plane: Plane, segs: Vec<Seg2>) -> BoundaryCurve<'static> {
@@ -482,8 +517,8 @@ mod tests {
BoundaryCurve { label: label.into(), source: CurveSource::Points(vec![a, b]), continuity: Continuity::G0 }
}
fn face_surface(b: &Body) -> mt::Surface {
b.solid.face_iter().next().unwrap().surface()
fn face_surface(b: &Body) -> SurfaceEval {
SurfaceEval::new(&b.record().faces[0].surface).unwrap()
}
/// The flat sheet y ∈ [−10, 0], x ∈ [0, 10] in z = 0, its edge along y = 0 open.
@@ -506,7 +541,7 @@ mod tests {
let s = face_surface(&body);
for i in 0..=10 {
for j in 0..=10 {
let q = from_p3(s.subs(i as f64 / 10.0, j as f64 / 10.0));
let q = s.point([i as f64 / 10.0, j as f64 / 10.0]).unwrap();
assert!((q.z - q.x * q.y / 10.0).abs() < 1e-9, "{q:?}");
}
}
@@ -530,7 +565,7 @@ mod tests {
let s = face_surface(&body);
for i in 0..=8 {
for j in 0..=8 {
assert!((s.subs(i as f64 / 8.0, j as f64 / 8.0).z - 3.0).abs() < 1e-9);
assert!((s.point([i as f64 / 8.0, j as f64 / 8.0]).unwrap().z - 3.0).abs() < 1e-9);
}
}
}
@@ -580,8 +615,7 @@ mod tests {
let apex = BoundaryCurve { label: "centre".into(), source: CurveSource::Point(Vec3::ZERO), continuity: Continuity::G0 };
let body = boundary_surface(&[sketch("arc", pl, vec![arc]), apex], &[sketch("x", pl, vec![x]), sketch("y", pl, vec![y])]).unwrap();
assert!(body.is_surface() && body.face_count() == 1);
let edges: std::collections::HashSet<_> = body.solid.edge_iter().map(|e| e.id()).collect();
assert_eq!(edges.len(), 3, "the collapsed side is no edge");
assert_eq!(body.edge_count(), 3, "the collapsed side is no edge");
let want = PI * r * r / 4.0;
let near = |a: f64| (a - want).abs() < 0.2;
let faces = body.faces(0.01).unwrap();
@@ -600,11 +634,11 @@ mod tests {
}
/// The angle between the two faces' normals across the edge at `p`.
fn normal_angle(a: &mt::Surface, b: &mt::Surface, p: Vec3) -> f64 {
let n = |s: &mt::Surface| {
let (u, v) = s.search_nearest_parameter(p3(p), None, 100).unwrap();
let n = s.normal(u, v);
Vec3::new(n.x, n.y, n.z)
fn normal_angle(a: &SurfaceEval, b: &SurfaceEval, p: Vec3) -> f64 {
let n = |s: &SurfaceEval| {
let [u, v] = s.project(p, None, f64::INFINITY).unwrap();
let (_, su, sv) = s.derivs(u, v).unwrap();
su.cross(sv).normalized().unwrap()
};
n(a).dot(n(b)).abs().clamp(0.0, 1.0).acos().to_degrees()
}
@@ -650,11 +684,10 @@ mod tests {
/// Normal curvature of `s` at the point nearest `p` in the direction `w` (projected into the
/// tangent plane), signed against the unit normal `n`.
fn normal_curvature(s: &mt::Surface, p: Vec3, w: Vec3, n: Vec3) -> f64 {
let (u, v) = s.search_nearest_parameter(p3(p), None, 100).unwrap();
let v3 = |x: mt::Vector3| Vec3::new(x.x, x.y, x.z);
let (su, sv) = (v3(s.uder(u, v)), v3(s.vder(u, v)));
let (suu, suv, svv) = (v3(s.uuder(u, v)), v3(s.uvder(u, v)), v3(s.vvder(u, v)));
fn normal_curvature(s: &SurfaceEval, p: Vec3, w: Vec3, n: Vec3) -> f64 {
let [u, v] = s.project(p, None, f64::INFINITY).unwrap();
let (_, su, sv) = s.derivs(u, v).unwrap();
let (suu, suv, svv) = s.second(u, v).unwrap();
let (e, f, g) = (su.dot(su), su.dot(sv), sv.dot(sv));
let (l, m, nn) = (suu.dot(n), suv.dot(n), svv.dot(n));
let (p1, q1) = (w.dot(su), w.dot(sv));
+1 -9
View File
@@ -99,8 +99,6 @@ pub struct BoolCase {
/// "ok", or the kind of failure: "error", "invalid", "identity".
pub outcome: String,
pub detail: String,
pub boolean_fallbacks: std::collections::BTreeMap<crate::BooleanStrategy, usize>,
pub boolean_reports_truncated: bool,
}
fn vol(b: &Option<Body>) -> crate::Result<f64> {
@@ -126,8 +124,6 @@ pub fn boolean_case(seed: u64) -> BoolCase {
b: b.clone(),
outcome: "ok".into(),
detail: String::new(),
boolean_fallbacks: Default::default(),
boolean_reports_truncated: false,
};
let fail = |c: &mut BoolCase, kind: &str, d: String| {
c.outcome = kind.into();
@@ -139,11 +135,7 @@ pub fn boolean_case(seed: u64) -> BoolCase {
};
let mut res = Vec::new();
for op in [BoolOp::Union, BoolOp::Intersect, BoolOp::Cut] {
let (result, diagnostics) = crate::capture_boolean_diagnostics(|| boolean(&ba, &bb, op));
case.boolean_reports_truncated |= diagnostics.truncated;
for event in diagnostics.events {
*case.boolean_fallbacks.entry(event.strategy).or_default() += 1;
}
let result = boolean(&ba, &bb, op);
match result {
Ok(x) => {
if let Some(body) = &x {
+4 -3
View File
@@ -30,7 +30,8 @@ mod build;
mod chamfer_sides_curved_tests;
mod clearance;
mod continuity;
mod coplanar;
#[cfg(test)]
mod coplanar_tests;
mod corner_g2;
mod delete_face;
mod distance;
@@ -96,7 +97,6 @@ mod par;
pub use par::{for_each_on_threads, map_on_threads, map_with_local_pools};
#[cfg(test)]
mod pinch_tests;
mod planar_faces;
#[cfg(test)]
mod planar_faces_tests;
mod plane_fit;
@@ -109,7 +109,8 @@ mod prism_measure;
pub mod profile;
pub mod provenance;
mod record;
mod seam_faces;
#[cfg(test)]
mod seam_faces_tests;
mod sew;
mod smlib_boolean;
mod smlib_sweeps;
+7 -37
View File
@@ -2,7 +2,6 @@
//! export; B-rep features refuse them.
use std::collections::HashMap;
use std::sync::Arc;
use solidcraft_geom::{Mesh, Vec3};
@@ -112,24 +111,7 @@ pub fn mesh_body(positions: &[Vec3], triangles: &[[u32; 3]]) -> Result<Body> {
t.swap(1, 2);
}
}
Ok(Body {
solid: Arc::new(crate::body::Solid::new_unchecked(Vec::new())),
size: out.span(),
boundary_tol: None,
volume: Some(std::sync::Arc::new(std::sync::Mutex::new(None))),
coarse_missing: None,
mesh: Some(Arc::new(out)),
color: None,
paint: None,
splits: None,
face_sources: None,
history: None,
display_of: None,
meshes: None,
phased: false,
tolerances: None,
regularization_protected: false,
})
Ok(Body::of_mesh(out))
}
/// Wind every connected piece one way: a triangle that runs a side in the same direction as
@@ -213,23 +195,11 @@ impl Body {
t.swap(1, 2);
}
}
Some(Body {
solid: self.solid.clone(),
size: out.span(),
boundary_tol: None,
volume: Some(std::sync::Arc::new(std::sync::Mutex::new(None))),
coarse_missing: None,
mesh: Some(Arc::new(out)),
color: self.color,
paint: self.paint.clone(),
splits: self.splits.clone(),
face_sources: None,
history: None,
display_of: None,
meshes: None,
phased: false,
tolerances: None,
regularization_protected: self.regularization_protected,
})
let mut placed = Body::of_mesh(out);
placed.color = self.color;
placed.paint = self.paint.clone();
placed.splits = self.splits.clone();
placed.regularization_protected = self.regularization_protected;
Some(placed)
}
}
-1
View File
@@ -3,7 +3,6 @@
use crate::{Body, KernelError, Result, guard};
use serde::{Deserialize, Serialize};
use serde_json::{Map, Number, Value};
use std::sync::Arc;
mod binary;
mod metadata;
+2 -2
View File
@@ -161,7 +161,7 @@ fn faces_under(b: &Body, at: &[Vec3]) -> Result<Vec<usize>> {
.triangles
.iter()
.zip(&mesh.tri_face)
.filter_map(|(t, f)| mesh.tri(t).map(|[x, y, z]| (crate::boolean_guard::point_triangle_dist(*p, x, y, z), *f as usize)))
.filter_map(|(t, f)| mesh.tri(t).map(|[x, y, z]| (solidcraft_geom::compare::closest_on_triangle(*p, x, y, z).dist(*p), *f as usize)))
.min_by(|x, y| x.0.total_cmp(&y.0));
match near {
Some((d, f)) if d < reach => {
@@ -214,7 +214,7 @@ fn with_offsets(result: &Body, input: &Body, mut h: History, distance: f64) -> O
let tris = at(&made, i);
let p = tris.iter().max_by(|x, y| area(x).total_cmp(&area(y))).map(|[a, b, c]| (*a + *b + *c) * (1.0 / 3.0))?;
let under = at(&source, face);
let d = under.iter().map(|[a, b, c]| crate::boolean_guard::point_triangle_dist(p, *a, *b, *c)).fold(f64::INFINITY, f64::min);
let d = under.iter().map(|[a, b, c]| solidcraft_geom::compare::closest_on_triangle(p, *a, *b, *c).dist(p)).fold(f64::INFINITY, f64::min);
if !d.is_finite() {
return None;
}
+1 -1
View File
@@ -245,7 +245,7 @@ pub fn offset_faces(b: &Body, at: &[Vec3], distance: f64) -> Result<Body> {
.triangles
.iter()
.zip(&mesh.tri_face)
.filter_map(|(t, f)| mesh.tri(t).map(|[x, y, z]| (crate::boolean_guard::point_triangle_dist(*p, x, y, z), *f as usize)))
.filter_map(|(t, f)| mesh.tri(t).map(|[x, y, z]| (solidcraft_geom::compare::closest_on_triangle(*p, x, y, z).dist(*p), *f as usize)))
.min_by(|a, c| a.0.total_cmp(&c.0));
match near {
Some((d, f)) if d < size * 1e-3 + 1e-6 => {
+4 -88
View File
@@ -516,99 +516,15 @@ pub(crate) fn edge_near(body: &Body, p: Vec3) -> Option<usize> {
pub(crate) type Chain = Vec<(usize, bool)>;
/// A surface filling a closed loop of a body's edges (each picked by a point on it): one face on
/// the body's own edges, planar when every edge's curve lies in one plane by its own definition
/// (its control points, or its circle's frame), else a B-spline patch ([`crate::fill`]; loops that
/// do not bound one are refused). Its history is over `[body]`: the face is new, its edges the
/// body's own.
/// the body's own edges, the loop's plane when it is certainly planar, else a B-spline patch
/// ([`crate::fill`], with no crown; loops that do not bound one are refused). Its history is over
/// `[body]`: the face is new, its edges the body's own.
pub fn patch_edges(body: &Body, at: &[Vec3]) -> Result<Body> {
body.require_brep("patch")?;
if at.is_empty() || at.len() > 10_000 {
return Err(invalid("pick the edges of a closed loop"));
}
let r = body.record();
let chain = picked_loop(body, at)?;
let Some(plane) = chain_plane(&r, &chain, crate::fill::planarity_tolerance(body))? else {
return crate::fill::fill_loop(body, &chain);
};
let surface = crate::freeform::plane_surface(&plane);
let mut parts = Parts { tolerance: r.tolerance, vertices: r.vertices.clone(), ..Parts::default() };
parts.edges = r.edges.iter().map(|e| b::Edge { uses: Vec::new(), ..e.clone() }).collect();
let mut uses = Vec::with_capacity(chain.len());
for &(e, forward) in &chain {
let edge = r.edges.get(e).ok_or_else(|| invalid("an edge reference"))?;
uses.push(b::pcurve::EdgeUse {
edge: index(e)?,
curve: &edge.curve,
interval: edge.interval,
forward,
tolerance: edge.tolerance,
given: None,
});
}
let pcurves = b::pcurve::pcurves(&surface, &[uses], r.tolerance).map_err(|e| failed(format!("patch: {e}")))?;
let edges = chain
.iter()
.zip(pcurves.into_iter().flatten())
.map(|(&(e, forward), pcurve)| Ok(b::OrientedEdge { edge: index(e)?, forward, pcurve }))
.collect::<Result<Vec<_>>>()?;
let loops = vec![b::Loop::Edges { edges }];
let domain = uv_box(&loops).ok_or_else(|| invalid("the loop encloses no area"))?;
parts.faces.push((b::Face { surface, domain, loops }, true));
let c = parts.canonical()?;
let h = record_history(&c.brep, 1, vec![record::generated(Vec::new())], |e, _, _| {
c.edges.get(e).map(|&edge| EdgeOrigin::Edge { operand: 0, edge }).into_iter().collect()
});
let (result, same) = record_body(&c.brep)?;
with_history(result, same, h, &record::counts(&[body]))
}
/// The plane every curve of `chain` lies in by its definition, within `tol` (lines and splines by
/// their control points, circles and ellipses by their frames), its axes turned so that the chain
/// runs counter-clockwise about its normal; `None` when there is none.
fn chain_plane(r: &Brep, chain: &Chain, tol: f64) -> Result<Option<Plane>> {
let edge = |e: usize| r.edges.get(e).ok_or_else(|| invalid("an edge reference"));
let mut points: Vec<Vec3> = Vec::new();
let mut axes: Vec<(Vec3, Vec3)> = Vec::new();
for &(e, _) in chain {
match &edge(e)?.curve {
b::Curve::Line { start, end } => points.extend([v3(*start), v3(*end)]),
b::Curve::Polyline { points: p } | b::Curve::Spline { points: p, .. } => points.extend(p.iter().map(|q| v3(*q))),
b::Curve::RationalSpline { homogeneous, .. } => {
points.extend(homogeneous.iter().map(|h| Vec3::new(h[0] / h[3], h[1] / h[3], h[2] / h[3])))
}
b::Curve::Circle { frame, .. } | b::Curve::Ellipse { frame, .. } => {
points.push(v3(frame.origin));
axes.push((v3(frame.origin), v3(frame.x_axis).cross(v3(frame.y_axis))));
}
b::Curve::SurfaceIntersection { .. } => return Ok(None),
}
}
let Some(&p0) = points.first() else { return Ok(None) };
// The normal: a circle's axis, else the widest cross product of the points about the first.
let normal = axes.first().map(|(_, n)| *n).or_else(|| {
let far = points.iter().copied().max_by(|a, c| a.dist(p0).total_cmp(&c.dist(p0)))?;
points.iter().map(|q| (far - p0).cross(*q - p0)).max_by(|a, c| a.len().total_cmp(&c.len()))
});
let Some(n) = normal.and_then(|n| n.normalized()) else { return Ok(None) };
let on = |q: Vec3| (q - p0).dot(n).abs() <= tol;
if !points.iter().all(|q| on(*q)) || axes.iter().any(|(c, a)| !on(*c) || a.cross(n).len() > 1e-9 * a.len().max(1.0)) {
return Ok(None);
}
// Which way round the chain runs about `n`: the turn of points along it.
let mut ring: Vec<Vec3> = Vec::new();
for &(e, forward) in chain {
let x = edge(e)?;
let c = CurveEval::new(&x.curve).map_err(|err| failed(format!("patch: {err}")))?;
let [t0, t1] = x.interval;
for k in 0..16 {
let f = k as f64 / 16.0;
ring.push(c.point(if forward { t0 + (t1 - t0) * f } else { t1 - (t1 - t0) * f }).ok_or_else(|| failed("patch: an edge has no point"))?);
}
}
let turn: f64 = ring.iter().zip(ring.iter().cycle().skip(1)).map(|(a, c)| (*a - p0).cross(*c - p0).dot(n)).sum();
let n = if turn < 0.0 { n * -1.0 } else { n };
let x = (if n.x.abs() < 0.9 { Vec3::X } else { Vec3::Y }).cross(n).normalized().ok_or_else(|| failed("patch plane"))?;
Ok(Plane::new(p0, x, n.cross(x)))
crate::fill::patch_loop(body, at, 0.0)
}
/// The edges of `body` picked by points on them, chained into one closed loop (each turned to run
+1 -1
View File
@@ -292,7 +292,7 @@ pub fn cylinder_face_at(b: &Body, p: Vec3) -> Option<CylinderFace> {
let mut near: HashMap<u32, f64> = HashMap::new();
for (t, f) in mesh.triangles.iter().zip(&mesh.tri_face) {
let Some([a, bb, c]) = mesh.tri(t) else { continue };
let d = crate::boolean_guard::point_triangle_dist(p, a, bb, c);
let d = solidcraft_geom::compare::closest_on_triangle(p, a, bb, c).dist(p);
near.entry(*f).and_modify(|x| *x = x.min(d)).or_insert(d);
}
let nearest = near.values().copied().fold(f64::INFINITY, f64::min);