SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Wave 2/509: kernel: fitted pcurves on curved surfaces, unwrapped and closed per wire (and 3 more)
jyviko3faf15f08c26
diff --git a/crates/kernel/src/native.rs b/crates/kernel/src/native.rsindex 95da32a1ce..e54f8f5b9a 100644--- a/crates/kernel/src/native.rs+++ b/crates/kernel/src/native.rs@@ -359,15 +359,38 @@ mod tests {/// lifts to one point). Returns the wires whose closure is a whole number of periods (a loop/// round a pole or the surface), as (face, wire).fn check_pcurves(body: &Body, tol: f64) -> Vec<(usize, usize)> {+ check_faces(&body.solid.face_iter().cloned().collect::<Vec<_>>(), tol)+ }+ fn check_faces(faces: &[truck_modeling::Face], tol: f64) -> Vec<(usize, usize)> {use truck_modeling::{BoundedCurve, MetricSpace, ParametricCurve, ParametricSurface};let mut winding = Vec::new();- for (f, face) in body.solid.face_iter().enumerate() {+ for (f, face) in faces.iter().enumerate() {let surface = face.surface();let all = pcurve::pcurves(face, tol).unwrap_or_else(|e| panic!("face {f}: {e}"));let wires = face.boundaries();assert_eq!(all.len(), wires.len());let lift = |uv: [f64; 2]| surface.subs(uv[0], uv[1]);+ let mut areas = Vec::new();for (w, (pcs, wire)) in all.iter().zip(&wires).enumerate() {+ let ring: Vec<[f64; 2]> = pcs+ .iter()+ .zip(wire.edge_iter())+ .flat_map(|(pc, e)| {+ let [a, b] = pc.interval().unwrap();+ (0..16)+ .map(move |k| if e.orientation() { a + (b - a) * k as f64 / 16. } else { b - (b - a) * k as f64 / 16. })+ .map(|t| pcurve::eval(pc, t).unwrap())+ })+ .collect();+ areas.push(+ (0..ring.len())+ .map(|i| {+ let (p, q) = (ring[i], ring[(i + 1) % ring.len()]);+ p[0] * q[1] - q[0] * p[1]+ })+ .sum::<f64>()+ * 0.5,+ );assert_eq!(pcs.len(), wire.len());let mut ends = Vec::new();for (i, (pc, edge)) in pcs.iter().zip(wire.edge_iter()).enumerate() {@@ -425,6 +448,14 @@ mod tests {winding.push((f, w));}}+ // The outer loop (the most area) turns counter-clockwise in (u, v) for a face along+ // its surface's normal, clockwise against it; holes the other way.+ if !winding.iter().any(|(wf, _)| *wf == f) {+ let outer = (0..areas.len()).max_by(|a, b| areas[*a].abs().total_cmp(&areas[*b].abs())).unwrap();+ for (w, area) in areas.iter().enumerate() {+ assert_eq!(*area > 0., (w == outer) == face.orientation(), "face {f} wire {w}: turns the wrong way ({area})");+ }+ }}winding}@@ -453,4 +484,253 @@ mod tests {assert!(pcurve::pcurves(face, 1e-9).unwrap().iter().flatten().all(|c| matches!(c, solidcraft_geom::brep::Curve2::RationalSpline { .. })));}}++ /// The kernel's own curved bodies: the cylinder (in halves), patch sphere, torus, a cone+ /// (apex), a revolved ball, a tube, the cylinder cut by a tilted box (intersection curves),+ /// a filleted box.+ fn curved_bodies() -> Vec<(&'static str, Body)> {+ use solidcraft_geom::{Loop2, Plane, Region2, Seg2, Vec2};+ use std::f64::consts::{FRAC_PI_2, PI, TAU};+ let turn = |outer: Loop2| crate::revolve(&Plane::XZ, &[Region2 { outer, holes: vec![] }], Vec2::ZERO, Vec2::Y, TAU).unwrap().pop().unwrap();+ let cyl = crate::cylinder(Vec3::ZERO, Vec3::Z, 5., 40.).unwrap();+ let block = crate::box_solid(Vec3::new(-20., -20., 20.), Vec3::new(20., 20., 60.)).unwrap();+ let block = crate::transform(&block, Vec3::ZERO, Vec3::new(0., 0., 20.), Vec3::X, 0.4).unwrap();+ let cut = crate::boolean(&cyl, &block, crate::BoolOp::Cut).unwrap().unwrap();+ let cube = crate::box_solid(Vec3::ZERO, Vec3::new(40., 30., 10.)).unwrap();+ let rounded = crate::fillet(&cube, &[Vec3::new(20., 0., 10.)], 2.).unwrap();+ let half = Loop2 {+ segs: vec![+ Seg2::Arc { center: Vec2::ZERO, radius: 6., start: -FRAC_PI_2, sweep: PI },+ Seg2::Line { a: Vec2::new(0., 6.), b: Vec2::new(0., -6.) },+ ],+ };+ vec![+ ("cylinder", cyl),+ ("sphere", crate::sphere(Vec3::ZERO, 12.).unwrap()),+ ("torus", crate::torus(Vec3::ZERO, 20., 4.).unwrap()),+ ("cone", turn(Loop2::polygon(&[Vec2::new(0., 0.), Vec2::new(5., 0.), Vec2::new(0., 10.)]))),+ ("ball", turn(half)),+ ("tube", turn(Loop2::polygon(&[Vec2::new(3., 0.), Vec2::new(5., 0.), Vec2::new(5., 4.), Vec2::new(3., 4.)]))),+ ("cut", cut),+ ("fillet", rounded),+ ]+ }++ #[test]+ fn pcurves_fit_curved_faces_within_tolerance() {+ for (name, body) in curved_bodies() {+ for tol in [1e-3, 1e-5, 1e-6] {+ // Truck places intersection curves on their surfaces to about 1e-6 mm only.+ if name == "cut" && tol < 1e-5 {+ let face = body.solid.face_iter().find(|f| {+ f.edge_iter().any(|e| matches!(e.curve(), truck_modeling::Curve::IntersectionCurve(_)))+ && !matches!(f.surface(), truck_modeling::Surface::Plane(_))+ });+ let error = pcurve::pcurves(face.unwrap(), tol).unwrap_err().to_string();+ assert!(error.contains("off the surface"), "{error}");+ continue;+ }+ let start = std::time::Instant::now();+ for face in body.solid.face_iter() {+ pcurve::pcurves(face, tol).unwrap();+ }+ let took = start.elapsed();+ let winding = check_pcurves(&body, tol);+ eprintln!("{name} at {tol}: {took:?}; loops round the surface: {winding:?}");+ assert!(winding.is_empty(), "{name}");+ }+ }+ }++ /// Faces with seams, as imported faces have them (the kernel's own revolutions come in+ /// pieces): a cylinder whose seam line is used twice between two full circles, each a closed+ /// edge on one vertex, and a sphere bounded by one meridian used twice from pole to pole.+ fn seam_faces() -> Vec<(&'static str, truck_modeling::Face)> {+ use crate::face_params::iso_curve;+ use solidcraft_geom::{Loop2, Plane, Region2, Seg2, Vec2};+ use std::f64::consts::{FRAC_PI_2, PI, TAU};+ use truck_modeling::{self as mt, ParametricSurface};+ let turn = |outer: Loop2| crate::revolve(&Plane::XZ, &[Region2 { outer, holes: vec![] }], Vec2::ZERO, Vec2::Y, TAU).unwrap().pop().unwrap();+ let tube = turn(Loop2::polygon(&[Vec2::new(3., 0.), Vec2::new(5., 0.), Vec2::new(5., 4.), Vec2::new(3., 4.)]));+ let wall = tube+ .solid+ .face_iter()+ .map(|f| f.surface())+ .find(|s| matches!(s, mt::Surface::RevolutedCurve(_)) && (s.subs(0., 0.).x.hypot(s.subs(0., 0.).y) - 5.).abs() < 1e-9)+ .unwrap();+ let (p0, p1) = (mt::Vertex::new(wall.subs(0., 0.)), mt::Vertex::new(wall.subs(1., 0.)));+ let seam = mt::Edge::new_unchecked(&p0, &p1, iso_curve(&wall, true, 0., 0., 1.).unwrap());+ let low = mt::Edge::new_unchecked(&p0, &p0, iso_curve(&wall, false, 0., 0., TAU).unwrap());+ let high = mt::Edge::new_unchecked(&p1, &p1, iso_curve(&wall, false, 1., 0., TAU).unwrap());+ let cylinder = mt::Face::new_unchecked(vec![mt::Wire::from(vec![seam.clone(), high.clone(), seam.inverse(), low.inverse()])], wall.clone());+ let band = mt::Face::new_unchecked(vec![mt::Wire::from(vec![low]), mt::Wire::from(vec![high.inverse()])], wall);+ let half = Loop2 {+ segs: vec![+ Seg2::Arc { center: Vec2::ZERO, radius: 6., start: -FRAC_PI_2, sweep: PI },+ Seg2::Line { a: Vec2::new(0., 6.), b: Vec2::new(0., -6.) },+ ],+ };+ let ball = turn(half);+ let round = ball.solid.face_iter().map(|f| f.surface()).find(|s| matches!(s, mt::Surface::RevolutedCurve(_))).unwrap();+ let (s0, s1) = (mt::Vertex::new(round.subs(0., 0.)), mt::Vertex::new(round.subs(1., 0.)));+ let meridian = mt::Edge::new_unchecked(&s0, &s1, iso_curve(&round, true, 0., 0., 1.).unwrap());+ let sphere = mt::Face::new_unchecked(vec![mt::Wire::from(vec![meridian.clone(), meridian.inverse()])], round);+ vec![("seam cylinder", cylinder), ("seam sphere", sphere), ("band", band)]+ }++ #[test]+ fn pcurves_of_seams_lie_a_period_apart() {+ use solidcraft_geom::brep::Curve2;+ for (name, face) in seam_faces() {+ for bad in [0., -1., f64::NAN, f64::INFINITY] {+ assert!(pcurve::pcurves(&face, bad).is_err());+ }+ for tol in [1e-3, 1e-6] {+ // A face round the surface without a seam: each loop closes a period apart.+ if name == "band" {+ assert_eq!(check_faces(std::slice::from_ref(&face), tol), [(0, 0), (0, 1)]);+ continue;+ }+ assert!(check_faces(std::slice::from_ref(&face), tol).is_empty(), "{name}");+ let wire = &pcurve::pcurves(&face, tol).unwrap()[0];+ let at = |c: &Curve2, f: f64| {+ let [a, b] = c.interval().unwrap();+ pcurve::eval(c, a + (b - a) * f).unwrap()+ };+ // The seam's two uses: the same curve on either side of the period.+ let (first, second) = if name == "seam cylinder" { (&wire[0], &wire[2]) } else { (&wire[0], &wire[1]) };+ for f in [0., 0.3, 1.] {+ let (a, b) = (at(first, f), at(second, f));+ assert!((a[0] - b[0]).abs() < 1e-9 && ((b[1] - a[1]).abs() - std::f64::consts::TAU).abs() < 1e-9, "{name}: {a:?} {b:?}");+ }+ for c in wire {+ let (lo, hi) = (0..=16).map(|k| at(c, k as f64 / 16.)[1]).fold((f64::MAX, f64::MIN), |(l, h), v| (l.min(v), h.max(v)));+ assert!(lo >= -1e-9 && hi <= std::f64::consts::TAU + 1e-9, "{name}: in the base period");+ }+ }+ }+ }++ /// With `SOLIDCRAFT_PCURVE_SVG=<dir>`, each test body's face loops in (u, v), one panel per+ /// face: the surface's base period framed, each edge use in its own colour with an arrow+ /// along the wire.+ #[test]+ fn pcurve_pictures() {+ let Ok(dir) = std::env::var("SOLIDCRAFT_PCURVE_SVG") else { return };+ let box_ = crate::box_solid(Vec3::ZERO, Vec3::new(40., 30., 10.)).unwrap();+ let mut sets: Vec<(String, Vec<truck_modeling::Face>)> = vec![("box".into(), box_.solid.face_iter().cloned().collect())];+ sets.extend(curved_bodies().into_iter().map(|(n, b)| (n.to_string(), b.solid.face_iter().cloned().collect())));+ sets.extend(seam_faces().into_iter().map(|(n, f)| (n.to_string(), vec![f])));+ for (name, faces) in sets {+ let svg = draw(&name, &faces, 1e-5);+ std::fs::write(format!("{dir}/{}.svg", name.replace(' ', "-")), svg).unwrap();+ }+ }++ fn draw(name: &str, faces: &[truck_modeling::Face], tol: f64) -> String {+ use std::fmt::Write;+ use std::ops::Bound::{Excluded, Included};+ use truck_modeling::ParametricSurface;+ const W: f64 = 300.;+ const COLOURS: [&str; 8] = ["#d62728", "#1f77b4", "#2ca02c", "#9467bd", "#ff7f0e", "#17becf", "#e377c2", "#8c564b"];+ let cols = faces.len().min(4);+ let rows = faces.len().div_ceil(4);+ let mut out = String::new();+ write!(out, r#"<svg xmlns="http://www.w3.org/2000/svg" width="{}" height="{}" font-family="sans-serif" font-size="12"><rect width="100%" height="100%" fill="white"/><text x="10" y="20" font-size="16">{name}: face loops in (u, v)</text>"#, cols as f64 * W, rows as f64 * W + 30.).unwrap();+ for (f, face) in faces.iter().enumerate() {+ let (ox, oy) = ((f % 4) as f64 * W, (f / 4) as f64 * W + 30.);+ let surface = face.surface();+ let wires = pcurve::pcurves(face, tol).unwrap();+ let lines: Vec<Vec<(usize, bool, Vec<[f64; 2]>)>> = wires+ .iter()+ .zip(face.boundaries())+ .map(|(pcs, wire)| {+ pcs.iter()+ .zip(wire.edge_iter())+ .enumerate()+ .map(|(i, (c, e))| {+ let [a, b] = c.interval().unwrap();+ (i, e.orientation(), (0..=64).map(|k| pcurve::eval(c, a + (b - a) * k as f64 / 64.).unwrap()).collect())+ })+ .collect()+ })+ .collect();+ // The frame: the base period along periodic directions, the surface's range along+ // bounded ones, else the loops' extent.+ let all: Vec<[f64; 2]> = lines.iter().flatten().flat_map(|l| l.2.clone()).collect();+ let ext = |d: usize| all.iter().map(|p| p[d]).fold((f64::MAX, f64::MIN), |(l, h), v| (l.min(v), h.max(v)));+ let (ru, rv) = surface.parameter_range();+ let range = |r: (std::ops::Bound<f64>, std::ops::Bound<f64>), d: usize| match r {+ (Included(a) | Excluded(a), Included(b) | Excluded(b)) => (a, b),+ _ => ext(d),+ };+ let frame = if matches!(surface, truck_modeling::Surface::Plane(_)) { [ext(0), ext(1)] } else { [range(ru, 0), range(rv, 1)] };+ let view = |d: usize| {+ let (e, r) = (ext(d), frame[d]);+ let (lo, hi) = (e.0.min(r.0), e.1.max(r.1));+ let pad = (hi - lo).max(1e-9) * 0.08;+ (lo - pad, hi + pad)+ };+ let (vu, vv) = (view(0), view(1));+ let px = |p: [f64; 2]| (ox + 50. + (p[0] - vu.0) / (vu.1 - vu.0) * (W - 70.), oy + W - 30. - (p[1] - vv.0) / (vv.1 - vv.0) * (W - 50.));+ let kind = match surface {+ truck_modeling::Surface::Plane(_) => "plane",+ truck_modeling::Surface::BSplineSurface(_) => "B-spline",+ truck_modeling::Surface::NurbsSurface(_) => "NURBS",+ truck_modeling::Surface::RevolutedCurve(_) => "revolution",+ };+ let periodic = match (surface.u_period(), surface.v_period()) {+ (Some(_), _) => ", u periodic",+ (_, Some(_)) => ", v periodic",+ _ => "",+ };+ let (a, b) = (px([frame[0].0, frame[1].1]), px([frame[0].1, frame[1].0]));+ write!(out, r##"<rect x="{}" y="{}" width="{}" height="{}" fill="#f4f4f4" stroke="#888" stroke-dasharray="4 3"/><text x="{}" y="{}">face {f}: {kind}{periodic}</text>"##, a.0, a.1, b.0 - a.0, b.1 - a.1, ox + 10., oy + 14.).unwrap();+ for (w, wire) in lines.iter().enumerate() {+ for (i, fwd, pts) in wire {+ let colour = COLOURS[(i + 3 * w) % COLOURS.len()];+ let path: Vec<String> = pts+ .iter()+ .map(|p| {+ let q = px(*p);+ format!("{:.2} {:.2}", q.0, q.1)+ })+ .collect();+ write!(out, r#"<path d="M {}" fill="none" stroke="{colour}" stroke-width="2"/>"#, path.join(" L ")).unwrap();+ // An arrow at the middle, along the wire.+ let (m0, m1) = (px(pts[31]), px(pts[33]));+ let (dx, dy) = if *fwd { (m1.0 - m0.0, m1.1 - m0.1) } else { (m0.0 - m1.0, m0.1 - m1.1) };+ let len = dx.hypot(dy).max(1e-9);+ let (ux, uy) = (dx / len * 9., dy / len * 9.);+ let c = px(pts[32]);+ write!(+ out,+ r#"<polygon points="{:.2},{:.2} {:.2},{:.2} {:.2},{:.2}" fill="{colour}"/>"#,+ c.0 + ux,+ c.1 + uy,+ c.0 - ux - uy * 0.6,+ c.1 - uy + ux * 0.6,+ c.0 - ux + uy * 0.6,+ c.1 - uy - ux * 0.6+ )+ .unwrap();+ let s = px(if *fwd { pts[0] } else { pts[64] });+ write!(+ out,+ r#"<circle cx="{:.2}" cy="{:.2}" r="2.5" fill="black"/><text x="{:.2}" y="{:.2}" fill="{colour}">{w}.{i}</text>"#,+ s.0,+ s.1,+ c.0 + 6.,+ c.1 - 6.+ )+ .unwrap();+ }+ }+ let (l0, l1) = (px([frame[0].0, frame[1].0]), px([frame[0].1, frame[1].1]));+ write!(out, r##"<text x="{:.2}" y="{:.2}" fill="#555">u {:.3}</text><text x="{:.2}" y="{:.2}" fill="#555" text-anchor="end">{:.3}</text><text x="{:.2}" y="{:.2}" fill="#555" text-anchor="end">v {:.3}</text><text x="{:.2}" y="{:.2}" fill="#555" text-anchor="end">{:.3}</text>"##,+ l0.0, oy + W - 12., frame[0].0, l1.0, oy + W - 12., frame[0].1, ox + 46., l0.1, frame[1].0, ox + 46., l1.1 + 10., frame[1].1).unwrap();+ }+ out.push_str("</svg>");+ out+ }}diff --git a/crates/kernel/src/native/pcurve.rs b/crates/kernel/src/native/pcurve.rsindex 53d3767a19..157f50419a 100644--- a/crates/kernel/src/native/pcurve.rs+++ b/crates/kernel/src/native/pcurve.rs@@ -2,6 +2,12 @@//! parameters, on the parameter of the edge's own curve (as the adapter writes it), running in//! that curve's direction. Exact where the edge lies on its surface in closed form, otherwise a//! 2D B-spline fitted within the tolerance.+//!+//! Periodic parameters are unwrapped along each curve, and each wire's uses are moved by whole+//! periods so every use starts where the one before it ends: a seam edge used twice gets two+//! pcurves a period apart. At a pole the parameter along the collapsed direction is undefined;+//! there it is taken from the nearest sample where it is defined, so a pcurve runs straight+//! into the pole, and where two uses meet at a pole the loop runs along the pole's line.use super::Result;use crate::KernelError;use crate::body::from_p3;@@ -21,24 +27,477 @@ pub(super) fn pcurves(face: &mt::Face, tolerance: f64) -> Result<Vec<Vec<b::Curv}crate::guard("pcurves", || {let surface = face.surface();+ let on = On::new(&surface);+ // A seam edge used twice is fitted once.+ let mut done: Vec<(mt::EdgeID, b::Curve2)> = Vec::new();let mut out = Vec::new();for (w, wire) in face.boundaries().iter().enumerate() {let mut uses = Vec::new();for (i, edge) in wire.edge_iter().enumerate() {- let curve = edge.curve();- let pc = pcurve(&surface, &curve).map_err(|e| KernelError::Failed(format!("pcurve of wire {w} edge {i}: {e}")))?;- uses.push(pc);+ let pc = match done.iter().find(|(id, _)| *id == edge.id()) {+ Some((_, pc)) => pc.clone(),+ None => {+ let curve = edge.curve();+ let pc = on.pcurve(&curve, tolerance).map_err(|e| {+ let (a, b) = (edge.absolute_front().point(), edge.absolute_back().point());+ KernelError::Failed(format!("pcurve of wire {w} edge {i} ({:?} to {:?}): {e}", [a.x, a.y, a.z], [b.x, b.y, b.z]))+ })?;+ done.push((edge.id(), pc.clone()));+ pc+ }+ };+ uses.push((pc, edge.orientation()));}- out.push(uses);+ on.close(&mut uses, face.orientation())?;+ out.push(uses.into_iter().map(|(c, _)| c).collect());}Ok(out)})}-fn pcurve(surface: &mt::Surface, curve: &mt::Curve) -> Result<b::Curve2> {- match surface {- mt::Surface::Plane(_) => on_plane(surface, curve),- _ => Err(KernelError::Failed("not supported yet: pcurves on curved surfaces".into())),+/// Knot spans a fitted pcurve may have (the schema takes 4096 control points).+const MAX_SPANS: usize = 4000;+/// Refinement rounds of one fit.+const MAX_ROUNDS: usize = 40;+/// Samples per knot span when a fit starts.+const PER_SPAN: usize = 4;+/// Spans a fit starts from (more where the curve has its own knots).+const START_SPANS: usize = 4;++/// A surface's parameters: the evaluator's projection where it takes the surface (it is+/// parameterised as truck parameterises it), else truck's own search.+struct On<'a> {+ surface: &'a mt::Surface,+ eval: Option<EvalSurface>,+ dom: uv::Domain,+}++/// A curve sample: its parameter, point, surface parameters (periodic ones unwrapped along the+/// curve), whether the surface is degenerate along each direction there (a pole), and the+/// curve's point halfway to the next sample once measured.+#[derive(Clone, Copy)]+struct Sample {+ t: f64,+ p: mt::Point3,+ uv: [f64; 2],+ pole: [bool; 2],+ mid: Option<mt::Point3>,+}++impl<'a> On<'a> {+ fn new(surface: &'a mt::Surface) -> Self {+ use mt::ParametricSurface;+ use std::ops::Bound::{Excluded, Included};+ let eval = crate::tess::surface::eval_surface(surface);+ let dom = match &eval {+ Some(e) => uv::domain(e),+ None => {+ let bound = |r: (std::ops::Bound<f64>, std::ops::Bound<f64>)| match r {+ (Included(a) | Excluded(a), Included(b) | Excluded(b)) => Some((a, b)),+ _ => None,+ };+ let (ru, rv) = surface.parameter_range();+ uv::Domain { range: [bound(ru), bound(rv)], period: [surface.u_period(), surface.v_period()] }+ }+ };+ On { surface, eval, dom }+ }++ fn pcurve(&self, curve: &mt::Curve, tol: f64) -> Result<b::Curve2> {+ match (self.surface, curve) {+ (mt::Surface::Plane(_), mt::Curve::Line(_) | mt::Curve::BSplineCurve(_) | mt::Curve::NurbsCurve(_)) => on_plane(self.surface, curve),+ _ => self.fit(curve, tol),+ }+ }++ /// The parameters of `p` within `accept`, from `near` (and unwrapped to it) when given.+ fn project(&self, p: mt::Point3, near: Option<[f64; 2]>, accept: f64) -> Option<[f64; 2]> {+ use mt::{MetricSpace, ParametricSurface, SearchParameter};+ let mut q = match &self.eval {+ Some(e) => uv::project(e, &self.dom, from_p3(p), near, accept)?,+ None => {+ let (u, v) = self.surface.search_parameter(p, near.map(|n| (n[0], n[1])), 100)?;+ (self.surface.subs(u, v).distance(p) <= accept).then_some([u, v])?+ }+ };+ if let Some(n) = near {+ for (d, x) in q.iter_mut().enumerate() {+ *x = uv::unwrap(*x, n[d], self.dom.period.get(d).copied().flatten());+ }+ }+ Some(q)+ }++ /// Whether moving along each direction at `uv` leaves the point where it is (a pole).+ fn pole(&self, uv: [f64; 2]) -> [bool; 2] {+ use mt::{InnerSpace, ParametricSurface};+ let (su, sv) = (self.surface.uder(uv[0], uv[1]).magnitude(), self.surface.vder(uv[0], uv[1]).magnitude());+ [su <= 1e-9 * sv.max(1e-12), sv <= 1e-9 * su.max(1e-12)]+ }++ fn sample(&self, curve: &mt::Curve, t: f64, near: Option<[f64; 2]>, accept: f64) -> Result<Sample> {+ use mt::ParametricCurve;+ let p = curve.subs(t);+ let uv = self.project(p, near, accept).ok_or_else(|| self.off(p, t, near))?;+ Ok(Sample { t, p, uv, pole: self.pole(uv), mid: None })+ }++ /// The error for a curve point `p` (at `t`) farther than the fit allows from the surface.+ fn off(&self, p: mt::Point3, t: f64, near: Option<[f64; 2]>) -> KernelError {+ use mt::{MetricSpace, ParametricSurface};+ let d = self.project(p, near, f64::INFINITY).map(|q| self.surface.subs(q[0], q[1]).distance(p));+ KernelError::Failed(format!("the curve at {t} lies {} mm off the surface", d.unwrap_or(f64::NAN)))+ }++ /// A cubic B-spline in (u, v) on the curve's own parameter, through the parameters of the+ /// curve's ends, least squares through samples between; spans whose lift misses the curve+ /// by more than half the tolerance (at the samples and halfway between them) are halved and+ /// sampled twice as densely until none does.+ fn fit(&self, curve: &mt::Curve, tol: f64) -> Result<b::Curve2> {+ use mt::{MetricSpace, ParametricCurve, ParametricSurface};+ let (t0, t1) = curve.range_tuple();+ if !(t0.is_finite() && t1.is_finite() && t1 > t0) {+ return Err(KernelError::Failed("the curve has no parameter range".into()));+ }+ let (target, accept) = (0.5 * tol, 0.5 * tol);+ // Interior knots: where the curve's own parameterisation is less smooth (a pcurve is no+ // smoother than its curve), else even.+ let mut inner = breaks(curve, t0, t1);+ if inner.len() + 1 > MAX_SPANS / 4 {+ return Err(KernelError::TooLarge(format!("a pcurve of a curve with {} knots", inner.len())));+ }+ if inner.is_empty() {+ inner = (1..START_SPANS).map(|k| (t0 + (t1 - t0) * k as f64 / START_SPANS as f64, 1)).collect();+ }+ let bounds =+ |inner: &[(f64, usize)]| -> Vec<f64> { std::iter::once(t0).chain(inner.iter().map(|k| k.0)).chain(std::iter::once(t1)).collect() };+ let mut samples: Vec<Sample> = Vec::new();+ let mut near = None;+ for w in bounds(&inner).windows(2) {+ let (a, b) = (w.first().copied().unwrap_or(t0), w.get(1).copied().unwrap_or(t1));+ for k in usize::from(!samples.is_empty())..=PER_SPAN {+ let t = if k == PER_SPAN { b } else { a + (b - a) * k as f64 / PER_SPAN as f64 };+ let s = self.sample(curve, t, near, accept)?;+ near = Some(s.uv);+ samples.push(s);+ }+ }+ for _ in 0..MAX_ROUNDS {+ let knots: Vec<f64> = [t0; 4].into_iter().chain(inner.iter().flat_map(|&(k, m)| std::iter::repeat_n(k, m))).chain([t1; 4]).collect();+ let points = least_squares(&knots, &fill_poles(&samples)).ok_or_else(|| KernelError::Failed("the pcurve fit is singular".into()))?;+ let pc = b::Curve2::Spline { knots, points };+ let miss = |t: f64, p: mt::Point3| eval(&pc, t).map_or(f64::INFINITY, |q| self.surface.subs(q[0], q[1]).distance(p));+ let spans = inner.len() + 1;+ let span_of = |t: f64| inner.partition_point(|k| k.0 <= t).min(spans - 1);+ let mut bad = vec![false; spans];+ for i in 0..samples.len() {+ let Some(s) = samples.get(i).copied() else { break };+ let mid_t = samples.get(i + 1).map(|n| 0.5 * (s.t + n.t));+ let mid = s.mid.or_else(|| mid_t.map(|t| curve.subs(t)));+ if let Some(slot) = samples.get_mut(i) {+ slot.mid = mid;+ }+ let between = match (mid_t, mid) {+ (Some(t), Some(m)) => miss(t, m),+ _ => 0.0,+ };+ if !(miss(s.t, s.p) <= target && between <= target)+ && let Some(flag) = bad.get_mut(span_of(mid_t.unwrap_or(s.t)))+ {+ *flag = true;+ }+ }+ if !bad.contains(&true) {+ return Ok(pc);+ }+ // Halve the failing spans and sample them twice as densely.+ let split: Vec<(f64, f64)> =+ bounds(&inner).windows(2).zip(&bad).filter(|(_, b)| **b).filter_map(|(w, _)| Some((*w.first()?, *w.get(1)?))).collect();+ if inner.iter().map(|k| k.1).sum::<usize>() + split.len() + 1 > MAX_SPANS {+ break;+ }+ inner.extend(split.iter().map(|(a, b)| (0.5 * (a + b), 1)));+ inner.sort_by(|a, b| a.0.total_cmp(&b.0));+ let inside = |t: f64| split.iter().any(|&(a, b)| t >= a && t < b);+ let mut dense = Vec::with_capacity(samples.len() * 2);+ for i in 0..samples.len() {+ let Some(s) = samples.get(i).copied() else { break };+ match (inside(s.t), samples.get(i + 1), s.mid) {+ (true, Some(n), Some(m)) => {+ let t = 0.5 * (s.t + n.t);+ let uv = self.project(m, Some(s.uv), accept).ok_or_else(|| self.off(m, t, Some(s.uv)))?;+ dense.push(Sample { mid: None, ..s });+ dense.push(Sample { t, p: m, uv, pole: self.pole(uv), mid: None });+ }+ _ => dense.push(s),+ }+ }+ samples = dense;+ }+ Err(KernelError::Failed(format!("no pcurve within {tol} mm in {MAX_SPANS} spans")))+ }++ /// The wire's uses moved by whole periods so each starts where the one before it ends (in+ /// wire order and direction), then all together into the surface's base period where the+ /// loop's lowest point allows. Where uses meet at a pole the periodic parameter is free:+ /// there the offsets that give the loop a face boundary's turn (counter-clockwise in (u, v)+ /// for a face along its surface's normal, clockwise against it) are taken, else the nearest.+ fn close(&self, uses: &mut [(b::Curve2, bool)], forward: bool) -> Result<()> {+ let n = uses.len();+ let mut ends = Vec::with_capacity(n);+ for (c, fwd) in uses.iter() {+ let [a, b] = c.interval().ok_or_else(|| KernelError::Failed("pcurve interval".into()))?;+ let (s, e) = (eval(c, a), eval(c, b));+ let (Some(s), Some(e)) = (s, e) else { return Err(KernelError::Failed("pcurve ends".into())) };+ ends.push(if *fwd { (s, e) } else { (e, s) });+ }+ for d in 0..2 {+ let Some(period) = self.dom.period.get(d).copied().flatten().filter(|p| *p > 0.0) else { continue };+ // Start after a pole junction if there is one: from there continuity fixes the+ // offsets up to the next pole.+ let at_pole: Vec<bool> = ends.iter().map(|(s, _)| self.pole(*s).get(d).copied().unwrap_or(false)).collect();+ let first = at_pole.iter().position(|&p| p).unwrap_or(0);+ let order: Vec<usize> = (0..n).map(|k| (first + k) % n).collect();+ let mut shift = vec![0.0; n];+ let mut free: Vec<usize> = Vec::new();+ let mut prev: Option<f64> = None;+ for (k, &i) in order.iter().enumerate() {+ let (Some(&(s, e)), Some(slot)) = (ends.get(i), shift.get_mut(i)) else { continue };+ if k > 0 && at_pole.get(i).copied().unwrap_or(false) {+ free.push(k);+ }+ *slot = prev.map_or(0.0, |p| ((p - s[d]) / period).round() * period);+ prev = Some(e[d] + *slot);+ }+ // After each later pole one period less, none or more: the right turn, then the+ // fewest moves.+ if !free.is_empty() && free.len() <= 6 {+ let want = if forward { 1.0 } else { -1.0 };+ let mut best: Option<(bool, usize, Vec<f64>)> = None;+ for combo in 0..3usize.pow(free.len() as u32) {+ let (mut code, mut moved, mut add) = (combo, 0, 0.0);+ let mut extra = shift.clone();+ for (k, &i) in order.iter().enumerate() {+ if free.contains(&k) {+ let step = (code % 3) as f64 - 1.0;+ code /= 3;+ moved += usize::from(step != 0.0);+ add += step * period;+ }+ if let Some(slot) = extra.get_mut(i) {+ *slot += add;+ }+ }+ let right = area(uses, &extra, d) * want > 0.0;+ if best.as_ref().is_none_or(|(r, m, _)| (right && !r) || (right == *r && moved < *m)) {+ best = Some((right, moved, extra));+ }+ }+ if let Some((_, _, extra)) = best {+ shift = extra;+ }+ }+ let lo = self.dom.range.get(d).copied().flatten().map_or(0.0, |(a, b)| a.min(b));+ let low = uses.iter().zip(&shift).flat_map(|((c, _), s)| points(c).into_iter().map(move |q| q[d] + s)).fold(f64::INFINITY, f64::min);+ let base = if low.is_finite() { ((low - lo) / period + 1e-9).floor() * period } else { 0.0 };+ for (((c, _), s), (st, en)) in uses.iter_mut().zip(&shift).zip(ends.iter_mut()) {+ let by = s - base;+ if by != 0.0 {+ move_by(c, d, by);+ st[d] += by;+ en[d] += by;+ }+ }+ }+ Ok(())+ }+}++/// The interior parameters where `curve` is less than twice continuously differentiable, with+/// the knot multiplicity a cubic needs there: a spline's knots by their multiplicity, and the+/// vertices of an intersection curve's leader polyline (its parameter turns there).+fn breaks(curve: &mt::Curve, t0: f64, t1: f64) -> Vec<(f64, usize)> {+ let spline = |degree: usize, knots: &mt::KnotVec| -> Vec<(f64, usize)> {+ let mut out: Vec<(f64, usize)> = Vec::new();+ for &k in knots.iter().filter(|&&k| k > t0 && k < t1) {+ match out.last_mut() {+ Some(last) if last.0 == k => last.1 += 1,+ _ => out.push((k, 1)),+ }+ }+ out.into_iter().map(|(k, m)| (k, (3 - degree.saturating_sub(m).min(2)).clamp(1, 3))).collect()+ };+ match curve {+ mt::Curve::Line(_) => Vec::new(),+ mt::Curve::BSplineCurve(c) => spline(c.degree(), c.knot_vec()),+ mt::Curve::NurbsCurve(c) => spline(c.degree(), c.knot_vec()),+ mt::Curve::IntersectionCurve(c) => match c.leader() {+ mt::Leader::Polyline(p) => (1..p.0.len().saturating_sub(1)).map(|i| (i as f64, 3)).filter(|k| k.0 > t0 && k.0 < t1).collect(),+ mt::Leader::BSpline(c) => spline(c.degree(), c.knot_vec()),+ },+ }+}++/// Signed area in (u, v) of the wire with its uses moved by `shift` along `d`.+fn area(uses: &[(b::Curve2, bool)], shift: &[f64], d: usize) -> f64 {+ let mut ring: Vec<[f64; 2]> = Vec::new();+ for ((c, fwd), s) in uses.iter().zip(shift) {+ let Some([a, b]) = c.interval() else { continue };+ for k in 0..16 {+ let f = k as f64 / 16.0;+ let t = if *fwd { a + (b - a) * f } else { b - (b - a) * f };+ if let Some(mut q) = eval(c, t) {+ if let Some(x) = q.get_mut(d) {+ *x += s;+ }+ ring.push(q);+ }+ }+ }+ let n = ring.len();+ (0..n).filter_map(|i| Some((ring.get(i)?, ring.get((i + 1) % n)?))).map(|(p, q)| p[0] * q[1] - q[0] * p[1]).sum::<f64>() * 0.5+}++/// The samples' parameters, where a pole leaves one undefined taken from the nearest sample+/// where it is defined (so the pcurve runs straight into the pole, never across to another+/// angle).+fn fill_poles(samples: &[Sample]) -> Vec<(f64, [f64; 2])> {+ let mut out: Vec<(f64, [f64; 2])> = samples.iter().map(|s| (s.t, s.uv)).collect();+ for d in 0..2 {+ // Where the surface collapses along `d`, the parameter `d` says nothing.+ let free = |s: &Sample| s.pole.get(d).copied().unwrap_or(false);+ if samples.iter().all(free) {+ continue;+ }+ for (i, s) in samples.iter().enumerate() {+ if !free(s) {+ continue;+ }+ let left = samples.get(..i).and_then(|l| l.iter().rposition(|x| !free(x)));+ let right = samples.get(i + 1..).and_then(|r| r.iter().position(|x| !free(x))).map(|k| k + i + 1);+ let dt = |k: usize| samples.get(k).map_or(f64::INFINITY, |x| (x.t - s.t).abs());+ let pick = match (left, right) {+ (Some(l), Some(r)) => Some(if dt(l) <= dt(r) { l } else { r }),+ (a, b) => a.or(b),+ };+ if let (Some(src), Some(slot)) = (pick.and_then(|k| samples.get(k)), out.get_mut(i))+ && let (Some(x), Some(v)) = (slot.1.get_mut(d), src.uv.get(d))+ {+ *x = *v;+ }+ }+ }+ out+}++/// Cubic control points on `knots` through the first and last data points, least squares+/// through the rest (banded normal equations, Cholesky).+fn least_squares(knots: &[f64], data: &[(f64, [f64; 2])]) -> Option<Vec<[f64; 2]>> {+ const P: usize = 3;+ let n = knots.len().checked_sub(P + 1)?;+ let (first, last) = (data.first()?.1, data.last()?.1);+ let m = n.checked_sub(2)?;+ // Normal equations, upper band: ata[j][k] = A(j, j + k) over the free points 1..n−1.+ let mut ata = vec![[0.0f64; P + 1]; m];+ let mut atb = vec![[0.0f64; 2]; m];+ for &(t, q) in data {+ let span = solidcraft_geom::bspline::find_span(knots, P, n, t)?;+ let nb = basis(knots, P, span, t)?;+ let mut r = q;+ for (j, w) in nb.iter().enumerate() {+ let i = span + j - P;+ let fixed = if i == 0 {+ Some(first)+ } else if i + 1 == n {+ Some(last)+ } else {+ None+ };+ if let Some(f) = fixed {+ r = [r[0] - w * f[0], r[1] - w * f[1]];+ }+ }+ for (j, wj) in nb.iter().enumerate() {+ let Some(row) = (span + j - P).checked_sub(1).filter(|&r| r < m) else { continue };+ if let Some(b) = atb.get_mut(row) {+ b[0] += wj * r[0];+ b[1] += wj * r[1];+ }+ for (k, wk) in nb.iter().enumerate().skip(j) {+ let Some(col) = (span + k - P).checked_sub(1).filter(|&c| c < m) else { continue };+ if let Some(x) = ata.get_mut(row).and_then(|a| a.get_mut(col - row)) {+ *x += wj * wk;+ }+ }+ }+ }+ // A = Rᵀ R with R upper of the same band: r[j][k] = R(j, j + k).+ let at = |r: &[[f64; P + 1]], j: usize, k: usize| r.get(j).and_then(|x| x.get(k)).copied().unwrap_or(0.0);+ let scale = ata.iter().map(|a| a[0]).fold(0.0, f64::max);+ let mut r = vec![[0.0f64; P + 1]; m];+ for j in 0..m {+ let mut diag = at(&ata, j, 0);+ for l in 1..=P.min(j) {+ diag -= at(&r, j - l, l).powi(2);+ }+ if !(diag > 1e-14 * scale) {+ return None;+ }+ let diag = diag.sqrt();+ let mut row = [diag, 0.0, 0.0, 0.0];+ for (k, x) in row.iter_mut().enumerate().skip(1).take_while(|(k, _)| j + k < m) {+ let mut v = at(&ata, j, k);+ for l in 1..=(P - k).min(j) {+ v -= at(&r, j - l, l) * at(&r, j - l, l + k);+ }+ *x = v / diag;+ }+ *r.get_mut(j)? = row;+ }+ let mut y = vec![[0.0f64; 2]; m];+ for j in 0..m {+ let mut v = *atb.get(j)?;+ for l in 1..=P.min(j) {+ let (c, yl) = (at(&r, j - l, l), *y.get(j - l)?);+ v = [v[0] - c * yl[0], v[1] - c * yl[1]];+ }+ let d = at(&r, j, 0);+ *y.get_mut(j)? = [v[0] / d, v[1] / d];+ }+ let mut x = vec![[0.0f64; 2]; m];+ for j in (0..m).rev() {+ let mut v = *y.get(j)?;+ for k in (1..=P).take_while(|k| j + k < m) {+ let (c, xk) = (at(&r, j, k), *x.get(j + k)?);+ v = [v[0] - c * xk[0], v[1] - c * xk[1]];+ }+ let d = at(&r, j, 0);+ *x.get_mut(j)? = [v[0] / d, v[1] / d];+ }+ let out: Vec<[f64; 2]> = std::iter::once(first).chain(x).chain(std::iter::once(last)).collect();+ out.iter().flatten().all(|v| v.is_finite()).then_some(out)+}++/// The control points of `c` in (u, v).+fn points(c: &b::Curve2) -> Vec<[f64; 2]> {+ match c {+ b::Curve2::Spline { points, .. } => points.clone(),+ b::Curve2::RationalSpline { homogeneous, .. } => homogeneous.iter().map(|h| [h[0] / h[2], h[1] / h[2]]).collect(),+ }+}++/// `c` moved by `by` along parameter `d`.+fn move_by(c: &mut b::Curve2, d: usize, by: f64) {+ match c {+ b::Curve2::Spline { points, .. } => points.iter_mut().filter_map(|p| p.get_mut(d)).for_each(|x| *x += by),+ b::Curve2::RationalSpline { homogeneous, .. } => {+ for h in homogeneous {+ let w = h[2];+ if let Some(x) = h.get_mut(d) {+ *x += by * w;+ }+ }+ }}}@@ -70,7 +529,7 @@ fn on_plane(surface: &mt::Surface, curve: &mt::Curve) -> Result<b::Curve2> {}).collect::<Result<_>>()?,},- mt::Curve::IntersectionCurve(_) => return Err(KernelError::Failed("not supported yet: intersection pcurves".into())),+ mt::Curve::IntersectionCurve(_) => return Err(KernelError::Failed("an intersection curve has no closed-form pcurve".into())),})}