diff --git a/crates/kernel/src/iges_out.rs b/crates/kernel/src/iges_out.rs index ae9fb327a..cf5a5a185 100644 --- a/crates/kernel/src/iges_out.rs +++ b/crates/kernel/src/iges_out.rs @@ -1,14 +1,18 @@ -//! IGES 5.3 export, written from the published specification: each body as a manifold solid -//! B-rep (186) with its shell, faces, loops, edge and vertex lists, on analytic surfaces -//! (planes, cylinders, cones, spheres, tori), surfaces of revolution and extrusion, and -//! rational B-splines, with body names (406 name properties) and colours (314). The bodies are -//! first written as STEP (so faces are merged and surfaces recognised exactly as in a STEP -//! export) and restated entity by entity. +//! IGES 5.3 export, written from the published specification: each body's record as manifold +//! solid B-reps (186, one per material region, with its voids) and open shells (514 form 2), +//! with their faces, loops, edge and vertex lists, on analytic surfaces (planes, cylinders, +//! cones, spheres, tori), surfaces of revolution and rational B-splines, with body names (406 +//! name properties) and colours (314). Geometry is the record's, exact, in the same STEP form +//! the STEP export writes ([`solidcraft_step::write::topology`]); IGES loops run +//! counter-clockwise about their surface's normal. use std::collections::HashMap; use std::fmt::Write as _; -use crate::step_in::p21::{self, Exchange, Param}; +use solidcraft_geom::brep::{Brep, Loop, Shell}; +use solidcraft_step::geom::{Curve, Placement, Surface}; +use solidcraft_step::write::topology; + use crate::{ExportBody, KernelError, Result, StepHeader}; type V3 = [f64; 3]; @@ -22,13 +26,6 @@ fn dot(a: V3, b: V3) -> f64 { fn cross(a: V3, b: V3) -> V3 { [a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], a[0] * b[1] - a[1] * b[0]] } -fn norm(a: V3) -> f64 { - dot(a, a).sqrt() -} -fn unit(a: V3) -> Option { - let n = norm(a); - (n > 1e-300 && n.is_finite()).then(|| a.map(|x| x / n)) -} /// A real in IGES free format (always with a decimal point). fn real(x: f64) -> String { @@ -64,6 +61,8 @@ struct Ent { struct W { ents: Vec, colors: HashMap<[u32; 3], i64>, + /// The largest coordinate written (the global section's maximum coordinate). + max_coord: f64, } impl W { @@ -74,8 +73,14 @@ impl W { fn get_mut(&mut self, de: i64) -> Option<&mut Ent> { usize::try_from((de - 1) / 2).ok().and_then(|i| self.ents.get_mut(i)) } + /// Coordinates of a model point, noted for the maximum coordinate. + fn coords(&mut self, p: V3) -> [String; 3] { + self.max_coord = p.iter().fold(self.max_coord, |m, x| if x.is_finite() { m.max(x.abs()) } else { m }); + p.map(real) + } fn point(&mut self, p: V3) -> i64 { - self.add(116, 0, vec![real(p[0]), real(p[1]), real(p[2])]) + let c = self.coords(p); + self.add(116, 0, c.to_vec()) } fn direction(&mut self, d: V3) -> i64 { self.add(123, 0, vec![real(d[0]), real(d[1]), real(d[2])]) @@ -100,137 +105,50 @@ impl W { } } -/// Reading the STEP exchange. -struct S<'a> { - ex: &'a Exchange, +fn failed(what: impl std::fmt::Display) -> KernelError { + KernelError::Failed(format!("IGES export: {what}")) } -impl<'a> S<'a> { - fn e(&self, id: u64) -> Result<&'a p21::Entity> { - self.ex.get(id).ok_or_else(|| KernelError::Failed(format!("IGES export: missing #{id}"))) - } - fn r(&self, p: Option<&Param>) -> Result { - p.and_then(Param::as_ref_id).ok_or_else(|| KernelError::Failed("IGES export: bad reference".into())) - } - fn f(&self, p: Option<&Param>) -> Result { - p.and_then(Param::as_f64).ok_or_else(|| KernelError::Failed("IGES export: bad number".into())) - } - fn list(&self, p: Option<&'a Param>) -> Result<&'a [Param]> { - p.and_then(Param::as_list).ok_or_else(|| KernelError::Failed("IGES export: bad list".into())) - } - fn point(&self, id: u64) -> Result { - let e = self.e(id)?; - let c = self.list(e.params().get(1))?; - Ok([self.f(c.first())?, self.f(c.get(1))?, self.f(c.get(2))?]) - } - fn dir(&self, id: u64) -> Result { - let d = self.point(id)?; - unit(d).ok_or_else(|| KernelError::Failed("IGES export: zero direction".into())) - } - fn vertex(&self, id: u64) -> Result { - self.point(self.r(self.e(id)?.params().get(1))?) - } - /// AXIS2_PLACEMENT_3D: origin, z, x. - fn placement(&self, id: u64) -> Result<(V3, V3, V3)> { - let p = self.e(id)?.params(); - let o = self.point(self.r(p.get(1))?)?; - let z = match p.get(2).and_then(Param::as_ref_id) { - Some(d) => self.dir(d)?, - None => [0.0, 0.0, 1.0], - }; - let x0 = match p.get(3).and_then(Param::as_ref_id) { - Some(d) => self.dir(d)?, - None => [1.0, 0.0, 0.0], - }; - let x = unit(sub(x0, z.map(|c| c * dot(x0, z)))).unwrap_or_else(|| { - let a = if z[0].abs() < 0.9 { [1.0, 0.0, 0.0] } else { [0.0, 1.0, 0.0] }; - unit(sub(a, z.map(|c| c * dot(a, z)))).unwrap_or([1.0, 0.0, 0.0]) - }); - Ok((o, z, x)) - } +/// The record's surface parameters' frame axes, as IGES's analytic surfaces take them. +fn axes(p: &Placement) -> (V3, V3, V3) { + (p.origin, p.axis, p.ref_direction) } -/// B-spline data of a STEP curve or surface record set: degrees, control rows, weights, knots. -struct Spline { - deg: Vec, - pts: Vec>, - weights: Option>>, - knots: Vec>, +/// A B-spline (126) of degree `degree` on full `knots`, over `[t0, t1]`. +fn bspline_curve(w: &mut W, degree: usize, knots: &[f64], weights: &[f64], points: &[V3], [t0, t1]: [f64; 2]) -> i64 { + let rational = weights.iter().any(|x| (x - 1.0).abs() > 1e-12); + let mut p = vec![ + points.len().saturating_sub(1).to_string(), + degree.to_string(), + "0".into(), + "0".into(), + if rational { "0" } else { "1" }.into(), + "0".into(), + ]; + p.extend(knots.iter().map(|x| real(*x))); + p.extend(weights.iter().map(|x| real(*x))); + for q in points { + p.extend(w.coords(*q)); + } + p.extend([real(t0), real(t1), real(0.0), real(0.0), real(0.0)]); + w.add(126, 0, p) } -fn expand(mults: &[Param], knots: &[Param]) -> Option> { - let mut out = Vec::new(); - for (m, k) in mults.iter().zip(knots) { - let (m, k) = (m.as_i64()?, k.as_f64()?); - if !(1..=64).contains(&m) { - return None; +/// Full knots of a STEP B-spline (each repeated by its multiplicity). +fn full_knots(knots: &[f64], mults: &[usize]) -> Vec { + knots.iter().zip(mults).flat_map(|(k, m)| std::iter::repeat_n(*k, *m)).collect() +} + +/// The curve over `[t0, t1]` as an IGES entity running from `a` to `b` (the edge's vertices at +/// its interval's ends); `closed` when they are one vertex. The DE pointer. +fn curve(w: &mut W, c: &Curve, interval: [f64; 2], a: V3, b: V3, closed: bool) -> Result { + match c { + Curve::Line { .. } => { + let (ca, cb) = (w.coords(a), w.coords(b)); + Ok(w.add(110, 0, ca.into_iter().chain(cb).collect())) } - for _ in 0..m { - out.push(k); - } - } - Some(out) -} - -fn spline(s: &S, e: &p21::Entity, surface: bool) -> Result { - let bad = || KernelError::Failed("IGES export: unreadable B-spline".into()); - let (base, kn): (Vec, Vec) = if e.is_complex() { - let b = e.record(if surface { "B_SPLINE_SURFACE" } else { "B_SPLINE_CURVE" }).ok_or_else(bad)?; - let k = e.record(if surface { "B_SPLINE_SURFACE_WITH_KNOTS" } else { "B_SPLINE_CURVE_WITH_KNOTS" }).ok_or_else(bad)?; - let mut v = vec![Param::Str(String::new())]; - v.extend(b.iter().cloned()); - (v, k.to_vec()) - } else { - let p = e.params(); - let skip = if surface { 8 } else { 6 }; - (p.to_vec(), p.get(skip..).map(<[Param]>::to_vec).unwrap_or_default()) - }; - let deg_n = if surface { 2 } else { 1 }; - let deg: Vec = (0..deg_n) - .map(|i| base.get(1 + i).and_then(Param::as_i64).filter(|d| (1..=32).contains(d)).map(|d| d as usize).ok_or_else(bad)) - .collect::>()?; - let ctrl = base.get(1 + deg_n).and_then(Param::as_list).ok_or_else(bad)?; - let pts: Vec> = if surface { - ctrl.iter() - .map(|row| row.as_list().ok_or_else(bad)?.iter().map(|c| s.point(c.as_ref_id().ok_or_else(bad)?)).collect::>>()) - .collect::>()? - } else { - vec![ctrl.iter().map(|c| s.point(c.as_ref_id().ok_or_else(bad)?)).collect::>>()?] - }; - let knots: Vec> = if surface { - let (mu, mv, ku, kv) = (kn.first(), kn.get(1), kn.get(2), kn.get(3)); - vec![ - expand(mu.and_then(Param::as_list).ok_or_else(bad)?, ku.and_then(Param::as_list).ok_or_else(bad)?).ok_or_else(bad)?, - expand(mv.and_then(Param::as_list).ok_or_else(bad)?, kv.and_then(Param::as_list).ok_or_else(bad)?).ok_or_else(bad)?, - ] - } else { - vec![expand(kn.first().and_then(Param::as_list).ok_or_else(bad)?, kn.get(1).and_then(Param::as_list).ok_or_else(bad)?).ok_or_else(bad)?] - }; - let weights = match e.record(if surface { "RATIONAL_B_SPLINE_SURFACE" } else { "RATIONAL_B_SPLINE_CURVE" }) { - Some(r) => { - let w = r.first().and_then(Param::as_list).ok_or_else(bad)?; - Some(if surface { - w.iter() - .map(|row| row.as_list().ok_or_else(bad)?.iter().map(|x| x.as_f64().ok_or_else(bad)).collect::>>()) - .collect::>()? - } else { - vec![w.iter().map(|x| x.as_f64().ok_or_else(bad)).collect::>>()?] - }) - } - None => None, - }; - Ok(Spline { deg, pts, weights, knots }) -} - -/// A curve as an IGES entity running from `a` to `b` (its direction in the STEP file), the DE -/// pointer. -fn curve(w: &mut W, s: &S, id: u64, a: V3, b: V3, closed: bool) -> Result { - let e = s.e(id)?; - match e.name() { - "LINE" => Ok(w.add(110, 0, [a, b].iter().flatten().map(|x| real(*x)).collect())), - "CIRCLE" | "ELLIPSE" => { - let p = e.params(); - let (o, z, x) = s.placement(s.r(p.get(1))?)?; + Curve::Circle { position, .. } | Curve::Ellipse { position, .. } => { + let (o, z, x) = axes(position); let y = cross(z, x); let local = |q: V3| { let v = sub(q, o); @@ -238,152 +156,99 @@ fn curve(w: &mut W, s: &S, id: u64, a: V3, b: V3, closed: bool) -> Result { }; let (la, lb) = (local(a), if closed { local(a) } else { local(b) }); let tr = w.frame(o, x, z); - let de = if e.name() == "CIRCLE" { - w.add(100, 0, vec![real(0.0), real(0.0), real(0.0), real(la[0]), real(la[1]), real(lb[0]), real(lb[1])]) - } else { - let (ra, rb) = (s.f(p.get(2))?, s.f(p.get(3))?); - // A x² + C y² + F = 0 with F = -1: A = 1/ra², C = 1/rb². - w.add( - 104, - 1, - vec![ - real(1.0 / (ra * ra)), - real(0.0), - real(1.0 / (rb * rb)), - real(0.0), - real(0.0), - real(-1.0), - real(0.0), - real(la[0]), - real(la[1]), - real(lb[0]), - real(lb[1]), - ], - ) + let de = match c { + Curve::Ellipse { semi_axis_1: ra, semi_axis_2: rb, .. } => { + // A x² + C y² + F = 0 with F = -1: A = 1/ra², C = 1/rb². + w.add( + 104, + 1, + vec![ + real(1.0 / (ra * ra)), + real(0.0), + real(1.0 / (rb * rb)), + real(0.0), + real(0.0), + real(-1.0), + real(0.0), + real(la[0]), + real(la[1]), + real(lb[0]), + real(lb[1]), + ], + ) + } + _ => w.add(100, 0, vec![real(0.0), real(0.0), real(0.0), real(la[0]), real(la[1]), real(lb[0]), real(lb[1])]), }; if let Some(ent) = w.get_mut(de) { ent.xform = tr; } Ok(de) } - _ if e.has("B_SPLINE_CURVE") || e.name() == "B_SPLINE_CURVE_WITH_KNOTS" => { - let sp = spline(s, e, false)?; - let (Some(pts), Some(knots), Some(°)) = (sp.pts.first(), sp.knots.first(), sp.deg.first()) else { - return Err(KernelError::Failed("IGES export: empty B-spline".into())); - }; - let k = pts.len().saturating_sub(1); - let ws = sp.weights.as_ref().and_then(|w| w.first().cloned()).unwrap_or_else(|| vec![1.0; pts.len()]); - let rational = ws.iter().any(|w| (w - 1.0).abs() > 1e-12); - let (t0, t1) = (knots.get(deg).copied().unwrap_or(0.0), knots.get(pts.len()).copied().unwrap_or(1.0)); - let mut p = vec![k.to_string(), deg.to_string(), "0".into(), "0".into(), if rational { "0" } else { "1" }.into(), "0".into()]; - p.extend(knots.iter().map(|x| real(*x))); - p.extend(ws.iter().map(|x| real(*x))); - p.extend(pts.iter().flatten().map(|x| real(*x))); - p.extend([real(t0), real(t1), real(0.0), real(0.0), real(0.0)]); - Ok(w.add(126, 0, p)) + Curve::BSpline(s) => { + let weights = s.weights.clone().unwrap_or_else(|| vec![1.0; s.points.len()]); + Ok(bspline_curve(w, s.degree, &full_knots(&s.knots, &s.multiplicities), &weights, &s.points, interval)) } - n => Err(KernelError::Failed(format!("IGES export: curve {n} is not written yet"))), + // Segment i on [i, i + 1]: a degree-1 B-spline on knots 0, 0, 1, …, n − 1, n − 1. + Curve::Polyline(points) => { + let n = points.len(); + let knots: Vec = std::iter::once(0.0).chain((0..n).map(|i| i as f64)).chain(std::iter::once(n.saturating_sub(1) as f64)).collect(); + Ok(bspline_curve(w, 1, &knots, &vec![1.0; n], points, interval)) + } + _ => Err(failed("a curve of this kind is not written yet")), } } -/// Start point of a STEP curve (for extrusion directrices). -fn curve_start(s: &S, id: u64) -> Result { - let e = s.e(id)?; - match e.name() { - "LINE" => s.point(s.r(e.params().get(1))?), - "CIRCLE" => { - let (o, _, x) = s.placement(s.r(e.params().get(1))?)?; - let r = s.f(e.params().get(2))?; - Ok([o[0] + r * x[0], o[1] + r * x[1], o[2] + r * x[2]]) - } - _ => { - let sp = spline(s, e, false)?; - sp.pts.first().and_then(|r| r.first()).copied().ok_or_else(|| KernelError::Failed("IGES export: empty curve".into())) - } - } +/// A revolution's profile written over `range` of its parameter. +fn profile(w: &mut W, c: &Curve, range: [f64; 2]) -> Result { + let at = |t: f64| c.point(t).ok_or_else(|| failed(format!("the profile has no point at {t}"))); + let (a, b) = (at(range[0])?, at(range[1])?); + curve(w, c, range, a, b, false) } -/// A curve written whole (a revolution's generatrix, an extrusion's directrix). -fn whole_curve(w: &mut W, s: &S, id: u64) -> Result { - let e = s.e(id)?; - match e.name() { - "LINE" => { - let p = e.params(); - let o = s.point(s.r(p.get(1))?)?; - let v = s.e(s.r(p.get(2))?)?; - let d = s.dir(s.r(v.params().get(1))?)?; - let m = s.f(v.params().get(2))?; - curve(w, s, id, o, [o[0] + d[0] * m, o[1] + d[1] * m, o[2] + d[2] * m], false) - } - "CIRCLE" | "ELLIPSE" => { - let a = curve_start(s, id)?; - curve(w, s, id, a, a, true) - } - _ => curve(w, s, id, [0.0; 3], [0.0; 3], false), - } -} - -fn surface(w: &mut W, s: &S, id: u64) -> Result { - let e = s.e(id)?; - let p = e.params(); - let analytic = |w: &mut W, typ: i64, place: u64, extra: &[f64]| -> Result { - let (o, z, x) = s.placement(place)?; +/// A face's surface; `domain` is the face's parameter box in the surface's (STEP) parameters. +fn surface(w: &mut W, s: &Surface, domain: [[f64; 2]; 2]) -> Result { + let analytic = |w: &mut W, typ: i64, p: &Placement, extra: &[f64]| -> Result { + let (o, z, x) = axes(p); let (po, pz, px) = (w.point(o), w.direction(z), w.direction(x)); let mut v = vec![po.to_string()]; + let e = |i: usize| real(extra.get(i).copied().unwrap_or(0.0)); match typ { 190 => v.extend([pz.to_string(), px.to_string()]), - 192 => v.extend([pz.to_string(), real(extra.first().copied().unwrap_or(0.0)), px.to_string()]), - 194 => v.extend([ - pz.to_string(), - real(extra.first().copied().unwrap_or(0.0)), - real(extra.get(1).copied().unwrap_or(0.0).to_degrees()), - px.to_string(), - ]), - 196 => v.extend([real(extra.first().copied().unwrap_or(0.0)), pz.to_string(), px.to_string()]), - _ => v.extend([pz.to_string(), real(extra.first().copied().unwrap_or(0.0)), real(extra.get(1).copied().unwrap_or(0.0)), px.to_string()]), + 192 => v.extend([pz.to_string(), e(0), px.to_string()]), + 194 => v.extend([pz.to_string(), e(0), real(extra.get(1).copied().unwrap_or(0.0).to_degrees()), px.to_string()]), + 196 => v.extend([e(0), pz.to_string(), px.to_string()]), + _ => v.extend([pz.to_string(), e(0), e(1), px.to_string()]), } Ok(w.add(typ, 1, v)) }; - match e.name() { - "PLANE" => analytic(w, 190, s.r(p.get(1))?, &[]), - "CYLINDRICAL_SURFACE" => analytic(w, 192, s.r(p.get(1))?, &[s.f(p.get(2))?]), - "CONICAL_SURFACE" => analytic(w, 194, s.r(p.get(1))?, &[s.f(p.get(2))?, s.f(p.get(3))?]), - "SPHERICAL_SURFACE" => analytic(w, 196, s.r(p.get(1))?, &[s.f(p.get(2))?]), - "TOROIDAL_SURFACE" => analytic(w, 198, s.r(p.get(1))?, &[s.f(p.get(2))?, s.f(p.get(3))?]), - "SURFACE_OF_REVOLUTION" => { - let gen_curve = whole_curve(w, s, s.r(p.get(1))?)?; - let ax = s.e(s.r(p.get(2))?)?; - let o = s.point(s.r(ax.params().get(1))?)?; - let d = s.dir(s.r(ax.params().get(2))?)?; - let axis = w.add(110, 0, [o, [o[0] + d[0], o[1] + d[1], o[2] + d[2]]].iter().flatten().map(|x| real(*x)).collect()); - Ok(w.add(120, 0, vec![axis.to_string(), gen_curve.to_string(), real(0.0), real(std::f64::consts::TAU)])) + match s { + Surface::Plane { position } => analytic(w, 190, position, &[]), + Surface::Cylinder { position, radius } => analytic(w, 192, position, &[*radius]), + Surface::Cone { position, radius, semi_angle } => analytic(w, 194, position, &[*radius, *semi_angle]), + Surface::Sphere { position, radius } => analytic(w, 196, position, &[*radius]), + Surface::Torus { position, major_radius, minor_radius } => analytic(w, 198, position, &[*major_radius, *minor_radius]), + Surface::Revolution { profile: c, axis } => { + // STEP's v is the profile's parameter: the generatrix over the face's. + let generatrix = profile(w, c, domain[1])?; + let (o, d) = (axis.origin, axis.direction); + let (co, cd) = (w.coords(o), w.coords([o[0] + d[0], o[1] + d[1], o[2] + d[2]])); + let line = w.add(110, 0, co.into_iter().chain(cd).collect()); + Ok(w.add(120, 0, vec![line.to_string(), generatrix.to_string(), real(0.0), real(std::f64::consts::TAU)])) } - "SURFACE_OF_LINEAR_EXTRUSION" => { - let c = s.r(p.get(1))?; - let dir = whole_curve(w, s, c)?; - let start = curve_start(s, c)?; - let v = s.e(s.r(p.get(2))?)?; - let d = s.dir(s.r(v.params().get(1))?)?; - let m = s.f(v.params().get(2))?; - Ok(w.add(122, 0, vec![dir.to_string(), real(start[0] + d[0] * m), real(start[1] + d[1] * m), real(start[2] + d[2] * m)])) - } - _ if e.has("B_SPLINE_SURFACE") || e.name() == "B_SPLINE_SURFACE_WITH_KNOTS" => { - let sp = spline(s, e, true)?; - let (Some(&du), Some(&dv), Some(ku), Some(kv)) = (sp.deg.first(), sp.deg.get(1), sp.knots.first(), sp.knots.get(1)) else { - return Err(KernelError::Failed("IGES export: bad B-spline surface".into())); - }; - let nu = sp.pts.len(); - let nv = sp.pts.first().map(Vec::len).unwrap_or(0); - if nu == 0 || nv == 0 || sp.pts.iter().any(|r| r.len() != nv) { - return Err(KernelError::Failed("IGES export: ragged B-spline surface".into())); + Surface::BSpline(b) => { + let nu = b.points.len(); + let nv = b.points.first().map_or(0, Vec::len); + if nu == 0 || nv == 0 || b.points.iter().any(|r| r.len() != nv) { + return Err(failed("a ragged B-spline surface")); } - let wt = |i: usize, j: usize| sp.weights.as_ref().and_then(|w| w.get(i)?.get(j).copied()).unwrap_or(1.0); + let (ku, kv) = (full_knots(&b.u_knots, &b.u_multiplicities), full_knots(&b.v_knots, &b.v_multiplicities)); + let wt = |i: usize, j: usize| b.weights.as_ref().and_then(|w| w.get(i)?.get(j).copied()).unwrap_or(1.0); let rational = (0..nu).any(|i| (0..nv).any(|j| (wt(i, j) - 1.0).abs() > 1e-12)); let mut v = vec![ (nu - 1).to_string(), (nv - 1).to_string(), - du.to_string(), - dv.to_string(), + b.u_degree.to_string(), + b.v_degree.to_string(), "0".into(), "0".into(), if rational { "0" } else { "1" }.into(), @@ -400,110 +265,68 @@ fn surface(w: &mut W, s: &S, id: u64) -> Result { } for j in 0..nv { for i in 0..nu { - let q = sp.pts.get(i).and_then(|r| r.get(j)).copied().unwrap_or([0.0; 3]); - v.extend(q.map(real)); + let q = b.points.get(i).and_then(|r| r.get(j)).copied().unwrap_or([0.0; 3]); + v.extend(w.coords(q)); } } - let range = |k: &Vec, d: usize, n: usize| (k.get(d).copied().unwrap_or(0.0), k.get(n).copied().unwrap_or(1.0)); - let ((u0, u1), (v0, v1)) = (range(ku, du, nu), range(kv, dv, nv)); + let range = |k: &[f64], d: usize, n: usize| (k.get(d).copied().unwrap_or(0.0), k.get(n).copied().unwrap_or(1.0)); + let ((u0, u1), (v0, v1)) = (range(&ku, b.u_degree, nu), range(&kv, b.v_degree, nv)); v.extend([real(u0), real(u1), real(v0), real(v1)]); Ok(w.add(128, 0, v)) } - n => Err(KernelError::Failed(format!("IGES export: surface {n} is not written yet"))), + _ => Err(failed("a surface of this kind is not written yet")), } } -/// Colours of styled items (solids and faces). -fn colours(ex: &Exchange) -> HashMap { - let mut out = HashMap::new(); - for e in ex.entities.values() { - if e.name() != "STYLED_ITEM" { - continue; - } - let Some(item) = e.params().get(2).and_then(Param::as_ref_id) else { continue }; - let mut queue: Vec = - e.params().get(1).and_then(Param::as_list).map(|l| l.iter().filter_map(Param::as_ref_id).collect()).unwrap_or_default(); - let mut seen = 0; - while let Some(id) = queue.pop() { - seen += 1; - if seen > 64 { - break; - } - let Some(s) = ex.get(id) else { continue }; - if s.name() == "COLOUR_RGB" { - let c = |i: usize| s.params().get(i).and_then(Param::as_f64).map(|x| x.clamp(0.0, 1.0) as f32); - if let (Some(r), Some(g), Some(b)) = (c(1), c(2), c(3)) { - out.insert(item, [r, g, b]); - } - break; - } - for r in &s.records { - for p in &r.params { - match p { - Param::Ref(x) => queue.push(*x), - Param::List(v) => queue.extend(v.iter().filter_map(Param::as_ref_id)), - _ => {} - } - } - } - } - } - out +/// The face's parameter box mapped onto its STEP surface's parameters (a linear map: the box +/// of the mapped corners). +fn mapped_domain(domain: [[f64; 2]; 2], map: topology::Map) -> [[f64; 2]; 2] { + let [[u0, u1], [v0, v1]] = domain; + let corners = [[u0, v0], [u1, v0], [u0, v1], [u1, v1]].map(|c| map.apply(c)); + let span = |d: usize| corners.iter().fold([f64::INFINITY, f64::NEG_INFINITY], |[lo, hi], c| [lo.min(c[d]), hi.max(c[d])]); + [span(0), span(1)] } -/// A shell (514) with its vertex list, edge list, loops and faces. -fn shell(w: &mut W, s: &S, id: u64, colors: &HashMap) -> Result { - let sh = s.e(id)?; - let faces = s.list(sh.params().get(1))?; +/// The parameters of a shell (514): its faces, with their vertex list, edge list and loops +/// written first. +fn shell(w: &mut W, b: &Brep, si: u32, paint: &HashMap) -> Result> { + let Some(Shell::Faces { faces, .. }) = b.shells.get(si as usize) else { return Err(failed(format!("shell {si} is not a face shell"))) }; // Vertices and edges of the shell, in first-use order. - let mut vidx: HashMap = HashMap::new(); - let mut verts: Vec = Vec::new(); - let mut eidx: HashMap = HashMap::new(); - let mut edges: Vec<(u64, bool, usize, usize)> = Vec::new(); // curve, same sense, start, end - let mut face_data = Vec::new(); - for f in faces { - let fid = s.r(Some(f))?; - let fe = s.e(fid)?; - let sense = fe.params().get(3).and_then(Param::as_bool).unwrap_or(true); - let mut loops: Vec> = Vec::new(); - let bounds = s.list(fe.params().get(1))?; - // The outer bound first. - let mut ordered: Vec<&Param> = - bounds.iter().filter(|b| b.as_ref_id().and_then(|x| s.ex.get(x)).is_some_and(|e| e.name() == "FACE_OUTER_BOUND")).collect(); - ordered.extend(bounds.iter().filter(|b| b.as_ref_id().and_then(|x| s.ex.get(x)).is_some_and(|e| e.name() != "FACE_OUTER_BOUND"))); - for b in ordered { - let be = s.e(s.r(Some(b))?)?; - let orient = be.params().get(2).and_then(Param::as_bool).unwrap_or(true); - let lp = s.e(s.r(be.params().get(1))?)?; - if lp.name() != "EDGE_LOOP" { - continue; - } - let mut l = Vec::new(); - for oe in s.list(lp.params().get(1))? { - let oe = s.e(s.r(Some(oe))?)?; - let ec = s.r(oe.params().get(3))?; - let d = oe.params().get(4).and_then(Param::as_bool).unwrap_or(true); - #[allow(clippy::map_entry)] // the edge's vertices are numbered before it - if !eidx.contains_key(&ec) { - let ee = s.e(ec)?; - let (v0, v1) = (s.r(ee.params().get(1))?, s.r(ee.params().get(2))?); - let mut vi = |v: u64| -> Result { - if let Some(i) = vidx.get(&v) { - return Ok(*i); + let (mut vidx, mut verts): (HashMap, Vec) = (HashMap::new(), Vec::new()); + let (mut eidx, mut edges): (HashMap, Vec) = (HashMap::new(), Vec::new()); + let mut face_data = Vec::with_capacity(faces.len()); + for of in faces { + let face = b.faces.get(of.face as usize).ok_or_else(|| failed(format!("face {}: no such face", of.face)))?; + let (s, map) = topology::surface(&face.surface).map_err(|e| failed(format!("face {}: {e}", of.face)))?; + let keeps = map.keeps_normal(); + let outer = topology::outer_loop(b, face); + let order: Vec = outer.into_iter().chain((0..face.loops.len()).filter(|l| Some(*l) != outer)).collect(); + let mut loops: Vec> = Vec::new(); + for li in order { + let Some(Loop::Edges { edges: uses }) = face.loops.get(li) else { continue }; + let mut l = Vec::with_capacity(uses.len()); + for u in uses { + let k = match eidx.get(&u.edge) { + Some(k) => *k, + None => { + let e = b.edges.get(u.edge as usize).ok_or_else(|| failed(format!("edge {}: no such edge", u.edge)))?; + for v in e.vertices { + if !vidx.contains_key(&v) { + let p = b.vertices.get(v as usize).ok_or_else(|| failed(format!("vertex {v}: no such vertex")))?.point; + vidx.insert(v, verts.len()); + verts.push(p); + } } - verts.push(s.vertex(v)?); - vidx.insert(v, verts.len() - 1); - Ok(verts.len() - 1) - }; - let (a, bb) = (vi(v0)?, vi(v1)?); - let same = ee.params().get(4).and_then(Param::as_bool).unwrap_or(true); - eidx.insert(ec, edges.len()); - edges.push((s.r(ee.params().get(3))?, same, a, bb)); - } - l.push((ec, d)); + eidx.insert(u.edge, edges.len()); + edges.push(u.edge); + edges.len() - 1 + } + }; + l.push((k, u.forward)); } - // IGES loops run counter-clockwise about the surface normal. - if orient != sense { + // Record loops run counter-clockwise about the natural normal; IGES's about the + // surface's. + if !keeps { l.reverse(); for x in &mut l { x.1 = !x.1; @@ -511,95 +334,93 @@ fn shell(w: &mut W, s: &S, id: u64, colors: &HashMap) -> Result, name: &str, color: Option<[f32; 3]>) -> i64 { + let np = w.add(406, 15, vec!["1".into(), holl(name)]); + params.extend(["0".into(), "1".into(), np.to_string()]); + let d = w.add(typ, form, params); + let c = color.map(|c| w.color(c)); + if let Some(ent) = w.get_mut(d) { + ent.dependent = false; + ent.label = name.chars().filter(|c| c.is_ascii_alphanumeric()).take(8).collect(); + if let Some(c) = c { + ent.color = -c; + } + } + d } /// IGES text (5.3, millimetres) for bodies. pub fn iges_export_bodies(bodies: &[ExportBody], header: &StepHeader) -> Result { - let step = crate::step_export_bodies(bodies, header)?; - let ex = p21::parse(&step).map_err(|e| KernelError::Failed(format!("IGES export: {e}")))?; - let s = S { ex: &ex }; - let colors = colours(&ex); - let mut w = W::default(); - let mut solids: Vec = - ex.entities.iter().filter(|(_, e)| matches!(e.name(), "MANIFOLD_SOLID_BREP" | "BREP_WITH_VOIDS")).map(|(i, _)| *i).collect(); - solids.sort(); - let mut max_coord: f64 = 1.0; - for p in ex.entities.values().filter(|e| e.name() == "CARTESIAN_POINT") { - if let Some(c) = p.params().get(1).and_then(Param::as_list) { - for x in c.iter().filter_map(Param::as_f64) { - max_coord = max_coord.max(x.abs()); + let mut w = W { max_coord: 1.0, ..W::default() }; + for eb in bodies { + eb.body.require_brep("IGES export")?; + let b = eb.body.record(); + let paint: HashMap = eb.body.paint().map(|p| p.faces.iter().map(|f| (f.face, f.color)).collect()).unwrap_or_default(); + let items = topology::layout(b).map_err(failed)?; + // A closed shell is form 1, an open one form 2. + for solid in &items.solids { + let params = shell(&mut w, b, solid.outer, &paint)?; + let outer = w.add(514, 1, params); + let mut p = vec![outer.to_string(), "1".into(), solid.voids.len().to_string()]; + for &v in &solid.voids { + let params = shell(&mut w, b, v, &paint)?; + p.extend([w.add(514, 1, params).to_string(), "1".into()]); } + top_level(&mut w, 186, 0, p, &eb.name, eb.color); } - } - for id in solids { - let e = s.e(id)?; - let name = e.params().first().and_then(Param::as_str).unwrap_or("").to_string(); - let outer = shell(&mut w, &s, s.r(e.params().get(1))?, &colors)?; - let mut p = vec![outer.to_string(), "1".into()]; - let voids: Vec = if e.name() == "BREP_WITH_VOIDS" { - s.list(e.params().get(2))?.iter().map(|v| shell(&mut w, &s, s.r(Some(v))?, &colors)).collect::>()? - } else { - Vec::new() - }; - p.push(voids.len().to_string()); - for v in voids { - p.extend([v.to_string(), "1".into()]); - } - // The body's name as a name property (406 form 15). - let np = w.add(406, 15, vec!["1".into(), holl(&name)]); - p.extend(["0".into(), "1".into(), np.to_string()]); - let d = w.add(186, 0, p); - let c = colors.get(&id).map(|c| w.color(*c)); - if let Some(ent) = w.get_mut(d) { - ent.dependent = false; - ent.label = name.chars().filter(|c| c.is_ascii_alphanumeric()).take(8).collect(); - if let Some(c) = c { - ent.color = -c; - } + for &si in &items.sheets { + let params = shell(&mut w, b, si, &paint)?; + top_level(&mut w, 514, 2, params, &eb.name, eb.color); } } if w.ents.is_empty() { return Err(KernelError::Invalid("nothing to export".into())); } + let max_coord = w.max_coord; Ok(layout(&w, header, max_coord)) } diff --git a/crates/kernel/src/step_in/mod.rs b/crates/kernel/src/step_in/mod.rs index 26b8d050f..dd05c7833 100644 --- a/crates/kernel/src/step_in/mod.rs +++ b/crates/kernel/src/step_in/mod.rs @@ -53,8 +53,7 @@ pub struct ImportedBody { pub instance: Option, /// The body is a closed solid (false: faces were left out, or the file had a surface model). pub closed: bool, - /// Faces read from the file. The body can have more: a face that wraps all the way around - /// a closed surface is split in two for the kernel. + /// Faces read from the file (each body face is one of them: `face_origin`). pub file_faces: usize, } diff --git a/crates/kernel/src/step_in/tests.rs b/crates/kernel/src/step_in/tests.rs index 0ac89ee15..c8c520639 100644 --- a/crates/kernel/src/step_in/tests.rs +++ b/crates/kernel/src/step_in/tests.rs @@ -915,38 +915,6 @@ fn validator_catches_broken_files() { assert!(step_validate(&format!("{HEAD}#1=SHAPE_DEFINITION_REPRESENTATION(#5);\n#5=B();\n{TAIL}")).unwrap_err().contains("dense")); } -#[test] -fn split_band_edges_are_seams() { - // A quarter pipe (torus R 10, r 3) whose face wraps around the tube with a seam edge: it is - // split for the kernel, and the split edge is drawn as a seam. - let mut t = String::from(HEAD); - t += "#1=CARTESIAN_POINT('',(0.,0.,0.));\n#2=DIRECTION('',(0.,0.,1.));\n#3=DIRECTION('',(1.,0.,0.));\n#4=AXIS2_PLACEMENT_3D('',#1,#2,#3);\n"; - t += "#5=TOROIDAL_SURFACE('',#4,10.,3.);\n"; - t += "#10=CARTESIAN_POINT('',(13.,0.,0.));\n#11=CARTESIAN_POINT('',(0.,13.,0.));\n#12=VERTEX_POINT('',#10);\n#13=VERTEX_POINT('',#11);\n"; - // Tube circles at azimuth 0 (plane XZ) and 90 degrees (plane YZ), the seam around Z. - t += "#20=CARTESIAN_POINT('',(10.,0.,0.));\n#21=DIRECTION('',(0.,-1.,0.));\n#22=AXIS2_PLACEMENT_3D('',#20,#21,#3);\n#23=CIRCLE('',#22,3.);\n"; - t += "#24=CARTESIAN_POINT('',(0.,10.,0.));\n#25=DIRECTION('',(1.,0.,0.));\n#26=DIRECTION('',(0.,1.,0.));\n#27=AXIS2_PLACEMENT_3D('',#24,#25,#26);\n#28=CIRCLE('',#27,3.);\n"; - t += "#29=CIRCLE('',#4,13.);\n"; - t += "#30=EDGE_CURVE('',#12,#12,#23,.T.);\n#31=EDGE_CURVE('',#13,#13,#28,.T.);\n#32=EDGE_CURVE('',#12,#13,#29,.T.);\n"; - t += "#40=ORIENTED_EDGE('',*,*,#30,.T.);\n#41=ORIENTED_EDGE('',*,*,#32,.T.);\n#42=ORIENTED_EDGE('',*,*,#31,.F.);\n#43=ORIENTED_EDGE('',*,*,#32,.F.);\n"; - t += "#44=EDGE_LOOP('',(#40,#41,#42,#43));\n#45=FACE_OUTER_BOUND('',#44,.T.);\n#46=ADVANCED_FACE('',(#45),#5,.F.);\n"; - t += "#47=PLANE('',#22);\n#48=ORIENTED_EDGE('',*,*,#30,.F.);\n#49=EDGE_LOOP('',(#48));\n#50=FACE_OUTER_BOUND('',#49,.T.);\n#51=ADVANCED_FACE('',(#50),#47,.T.);\n"; - t += "#52=PLANE('',#27);\n#53=ORIENTED_EDGE('',*,*,#31,.T.);\n#54=EDGE_LOOP('',(#53));\n#55=FACE_OUTER_BOUND('',#54,.T.);\n#56=ADVANCED_FACE('',(#55),#52,.T.);\n"; - t += "#60=CLOSED_SHELL('',(#46,#51,#56));\n#61=MANIFOLD_SOLID_BREP('Pipe',#60);\n#62=SHAPE_REPRESENTATION('',(#61),$);\n"; - t += TAIL; - let imp = step_import(&t).unwrap(); - let ib = &imp.bodies[0]; - assert_eq!(ib.file_faces, 3); - assert_eq!(ib.body.face_count(), 4, "{:?}", imp.warnings); - // The two halves of the tube face make a quarter torus: area π²·R·r. - let curved: f64 = ib.body.faces(1e-3).unwrap().iter().filter(|f| f.plane_normal.is_none()).map(|f| f.area).sum(); - let want = std::f64::consts::PI.powi(2) * 30.0; - assert!(rel(curved, want) < 2e-3, "{curved} vs {want}"); - let m = ib.body.mesh(&crate::MeshTolerance::chord(ib.body.size() * 1e-3)).unwrap(); - // Seams: the file's own seam (inside the tube face) and the split edge. - assert!(m.seams.iter().filter(|s| **s).count() >= 2, "{:?}", m.seams); -} - /// Revolved faces of a mirrored tool keep their orientation through STEP (the writer used to /// drop an inverted or mirrored revolution's sense). #[test] diff --git a/crates/step/src/write/topology.rs b/crates/step/src/write/topology.rs index b895d1734..c7205d86f 100644 --- a/crates/step/src/write/topology.rs +++ b/crates/step/src/write/topology.rs @@ -319,8 +319,58 @@ pub struct Written { pub faces: Vec, } +/// A solid of a record: the outer shell of a material region and the shells of the voids inside it. +#[derive(Clone, Debug, PartialEq)] +pub struct SolidShells { + pub outer: u32, + pub voids: Vec, +} + +/// How a record's shells make up exchange items: a solid per material region, in region order, +/// and the open shells (sheets), in shell order. Wire and vertex shells, and material regions +/// that meet across a shell, have no exchange form here and are refused. +#[derive(Clone, Debug, Default, PartialEq)] +pub struct Layout { + pub solids: Vec, + pub sheets: Vec, +} + +/// The record's [`Layout`]. +pub fn layout(b: &Brep) -> R { + // The bounded region each closed shell is the outer shell of. + let mut outer_of: Vec> = vec![None; b.shells.len()]; + for (ri, region) in b.regions.iter().enumerate().skip(1) { + if let Some(slot) = region.shells.first().and_then(|s| outer_of.get_mut(*s as usize)) { + *slot = Some(ri); + } + } + let mut out = Layout::default(); + for region in b.regions.iter().skip(1).filter(|r| !r.void) { + let (Some(&outer), inner) = (region.shells.first(), region.shells.get(1..).unwrap_or(&[])) else { continue }; + let mut voids = Vec::new(); + for &shell in inner { + match outer_of.get(shell as usize).copied().flatten() { + Some(v) if b.regions.get(v).is_some_and(|r| r.void) => voids.push(shell), + Some(_) => return Err(unsupported("material regions that meet across a shell")), + // An open shell inside the material: one of the sheets. + None => {} + } + } + out.solids.push(SolidShells { outer, voids }); + } + for (si, shell) in b.shells.iter().enumerate() { + match shell { + Shell::Faces { .. } if outer_of.get(si).copied().flatten().is_none() => out.sheets.push(index(si)?), + Shell::Faces { .. } => {} + Shell::Wire { .. } | Shell::Vertex { .. } => return Err(unsupported("wire and vertex shells")), + } + } + Ok(out) +} + /// Write `b`'s solids and sheets, each item named `name`. pub fn brep(g: &mut GeomWriter<'_>, b: &Brep, name: &str) -> R { + let layout = layout(b)?; let mut w = BrepWriter { g, b, @@ -329,29 +379,14 @@ pub fn brep(g: &mut GeomWriter<'_>, b: &Brep, name: &str) -> R { edges: vec![None; b.edges.len()], faces: vec![None; b.faces.len()], }; - // The bounded region each closed shell is the outer shell of. - let mut outer_of: Vec> = vec![None; b.shells.len()]; - for (ri, region) in b.regions.iter().enumerate().skip(1) { - if let Some(slot) = region.shells.first().and_then(|s| outer_of.get_mut(*s as usize)) { - *slot = Some(ri); - } - } let item_name = Param::Str(name.to_string()); let mut out = Written::default(); - for region in b.regions.iter().skip(1).filter(|r| !r.void) { - let (Some(&outer), inner) = (region.shells.first(), region.shells.get(1..).unwrap_or(&[])) else { continue }; - let shell = w.shell(outer, true)?; - let mut voids = Vec::new(); - for &inner_shell in inner { - match outer_of.get(inner_shell as usize).copied().flatten() { - Some(v) if b.regions.get(v).is_some_and(|r| r.void) => { - let void = w.shell(inner_shell, true)?; - voids.push(r(w.g.w.add_distinct("ORIENTED_CLOSED_SHELL", &[s(), Param::Derived, r(void), boolean(true)]))); - } - Some(_) => return Err(unsupported("material regions that meet across a shell")), - // An open shell inside the material: written with the sheets. - None => {} - } + for solid in &layout.solids { + let shell = w.shell(solid.outer, true)?; + let mut voids = Vec::with_capacity(solid.voids.len()); + for &v in &solid.voids { + let void = w.shell(v, true)?; + voids.push(r(w.g.w.add_distinct("ORIENTED_CLOSED_SHELL", &[s(), Param::Derived, r(void), boolean(true)]))); } out.solids.push(if voids.is_empty() { w.g.w.add_distinct("MANIFOLD_SOLID_BREP", &[item_name.clone(), r(shell)]) @@ -359,13 +394,9 @@ pub fn brep(g: &mut GeomWriter<'_>, b: &Brep, name: &str) -> R { w.g.w.add_distinct("BREP_WITH_VOIDS", &[item_name.clone(), r(shell), list(voids)]) }); } - let mut sheets = Vec::new(); - for (si, shell) in b.shells.iter().enumerate() { - match shell { - Shell::Faces { .. } if outer_of.get(si).copied().flatten().is_none() => sheets.push(r(w.shell(index(si)?, false)?)), - Shell::Faces { .. } => {} - Shell::Wire { .. } | Shell::Vertex { .. } => return Err(unsupported("wire and vertex shells")), - } + let mut sheets = Vec::with_capacity(layout.sheets.len()); + for &si in &layout.sheets { + sheets.push(r(w.shell(si, false)?)); } if !sheets.is_empty() { out.sheets = Some(w.g.w.add_distinct("SHELL_BASED_SURFACE_MODEL", &[item_name, list(sheets)])); @@ -374,6 +405,27 @@ pub fn brep(g: &mut GeomWriter<'_>, b: &Brep, name: &str) -> R { Ok(out) } +/// The face's outer loop: the one edge loop whose pcurves run counter-clockwise in (u, v) about +/// the natural normal (the record's loop convention); `None` when no single loop does. +pub fn outer_loop(b: &Brep, face: &Face) -> Option { + let mut ccw = face.loops.iter().enumerate().filter_map(|(li, l)| match l { + Loop::Edges { edges } => { + let mut ring = Vec::with_capacity(edges.len() * AREA_SAMPLES); + for u in edges { + let [t0, t1] = edge_of(b, u.edge).ok()?.interval; + for k in 0..AREA_SAMPLES { + let f = k as f64 / AREA_SAMPLES as f64; + ring.push(u.pcurve.eval(if u.forward { t0 + (t1 - t0) * f } else { t1 - (t1 - t0) * f })?); + } + } + (signed_area(&ring) > 0.0).then_some(li) + } + Loop::Vertex { .. } => None, + }); + let first = ccw.next(); + if ccw.next().is_some() { None } else { first } +} + fn index(i: usize) -> R { u32::try_from(i).map_err(|_| "too many items".to_string()) } @@ -468,7 +520,7 @@ impl BrepWriter<'_, '_, '_> { let face = face_of(self.b, f)?; let (surface, map) = self.surface(f)?; let geometry = self.g.surface(&surface); - let outer = self.outer_loop(face); + let outer = outer_loop(self.b, face); let mut bounds = Vec::with_capacity(face.loops.len()); for (li, l) in face.loops.iter().enumerate() { let lp = match l { @@ -500,27 +552,6 @@ impl BrepWriter<'_, '_, '_> { Ok(id) } - /// The face's outer loop: the one edge loop whose pcurves run counter-clockwise in (u, v) - /// about the natural normal (the record's loop convention); `None` when no single loop does. - fn outer_loop(&self, face: &Face) -> Option { - let mut ccw = face.loops.iter().enumerate().filter_map(|(li, l)| match l { - Loop::Edges { edges } => { - let mut ring = Vec::with_capacity(edges.len() * AREA_SAMPLES); - for u in edges { - let [t0, t1] = edge_of(self.b, u.edge).ok()?.interval; - for k in 0..AREA_SAMPLES { - let f = k as f64 / AREA_SAMPLES as f64; - ring.push(u.pcurve.eval(if u.forward { t0 + (t1 - t0) * f } else { t1 - (t1 - t0) * f })?); - } - } - (signed_area(&ring) > 0.0).then_some(li) - } - Loop::Vertex { .. } => None, - }); - let first = ccw.next(); - if ccw.next().is_some() { None } else { first } - } - /// A face shell: CLOSED_SHELL when it bounds a region, else OPEN_SHELL. fn shell(&mut self, si: u32, closed: bool) -> R { let b = self.b;