dc38349cbf
* Kernel: the B-rep record and the native body file come from solidcore-record SolidCraft's portable B-rep record (`solidcraft_geom::brep`: brep.rs, topology, history, envelope, part, curve2) and the native body file (`solidcraft_kernel::native`: the tagged binary codec and the container) move to solidcore's `solidcore-record` crate: geometry as data, with structural validation and no maths (solidcore's docs/layers.md, stage 1). Every caller uses `solidcore_record::brep` and `solidcore_record::native`; the old copies are deleted. What computes from coordinates stays with the kernel, in geom's `brep`: - `brep::check`: the record's geometric checks (orthonormal frames, non-degenerate planes, unit revolution axes, non-singular placements). `check::validate` and `check::validate_built` are the record's validation and these together, and every caller of `Brep::validate` uses them, so what is accepted is unchanged; - `brep::label`: a surface's natural ranges (a cone's apex), `curve_interval`, `edge_curve_interval` and `form_turns`; - `brep::pcurve::eval`: a pcurve's point; - `geometry::check`, `placement::moved` and `split_edges` become functions on the record. The kernel's native module keeps the conversion between a body and its saved record (metadata.rs) and checks the decoded record's geometry. `native/analytic.rs`, which no module declared, is deleted. solidcore-record is pinned to its rev on solidcore's `layer-record` branch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NvoxKMbMFSQU8tzRtoJhtT * Geometry: Vec2, Vec3, Plane and the profile types come from solidcore-record The plain data of vectors and points, sketch planes and planar profiles (`Seg2`, `Loop2`, `Region2`) moves to `solidcore-record`, with its constants and component-wise operators only (owner decision, solidcore layer split). Their geometry stays in geom as traits: `Vec2Geom`, `Vec3Geom`, `PlaneGeom`, `Seg2Geom`, `Loop2Geom`, `Region2Geom`, `Seg2ArcFit`, `Loop2ArcFit` and `Region2ArcFit`, in scope with `use solidcraft_geom::prelude::*`. Every caller names the types from `solidcore_record`; geom no longer defines or re-exports them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NvoxKMbMFSQU8tzRtoJhtT * Kernel: pin solidcore-record to solidcore main f5e8e9a29 solidcore-record is merged on solidcore main (tangency-labs/solidcore#2519); its crate there is identical to the rev pinned before but for its clippy configuration. The lock is regenerated against the merged rev. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NvoxKMbMFSQU8tzRtoJhtT --------- Co-authored-by: jyviko <2501648+jyviko@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
77 lines
3.1 KiB
Rust
77 lines
3.1 KiB
Rust
//! Round faces read from STEP: a whole turn bounded by one wire that runs along its seam twice.
|
|
//! A boolean whose intersection loop lies wholly inside such a face is exact.
|
|
use crate::*;
|
|
use solidcore_record::{Loop2, Plane, Region2, Vec2, Vec3};
|
|
use std::f64::consts::PI;
|
|
|
|
const R: f64 = 4.5;
|
|
|
|
fn volume(b: &Body) -> f64 {
|
|
measure(b).unwrap().volume
|
|
}
|
|
|
|
fn rel(a: f64, b: f64) -> f64 {
|
|
(a - b).abs() / b.abs().max(1e-12)
|
|
}
|
|
|
|
/// `body` written to STEP and read back: its round faces come back whole, as other systems
|
|
/// write them.
|
|
fn through_step(body: &Body) -> Body {
|
|
step_import(&step_export(&[body], "t").unwrap()).unwrap().bodies.into_iter().next().unwrap().body
|
|
}
|
|
|
|
/// A pin of radius `R` along X, 40 long, centred on the origin.
|
|
fn pin() -> Body {
|
|
cylinder(Vec3::new(-20.0, 0.0, 0.0), Vec3::X, R, 40.0).unwrap()
|
|
}
|
|
|
|
/// A block pressed into the top of the pin's side: 10 long, 6 wide, from 2 above the axis up.
|
|
fn block() -> Body {
|
|
box_solid(Vec3::new(-5.0, -3.0, 2.0), Vec3::new(5.0, 3.0, 9.0)).unwrap()
|
|
}
|
|
|
|
/// The part of the pin inside [`block`]: the circle's segment above 2 and within 3 of the
|
|
/// middle, 10 long.
|
|
fn pressed_volume() -> f64 {
|
|
let segment = 3.0 * (R * R - 9.0).sqrt() + R * R * (3.0 / R).asin() - 6.0 * 2.0;
|
|
10.0 * segment
|
|
}
|
|
|
|
/// The boolean, which must succeed (SMLib's, exact: there is no other).
|
|
fn exact(a: &Body, b: &Body, op: BoolOp) -> Option<Body> {
|
|
boolean(a, b, op).unwrap()
|
|
}
|
|
|
|
#[test]
|
|
fn a_block_pressed_into_a_read_pins_side_is_intersected_and_cut_exactly() {
|
|
let (read, block) = (through_step(&pin()), block());
|
|
let want = pressed_volume();
|
|
let shared = exact(&read, &block, BoolOp::Intersect).unwrap();
|
|
assert!(rel(volume(&shared), want) < 1e-3, "{} {want}", volume(&shared));
|
|
let dented = exact(&read, &block, BoolOp::Cut).unwrap();
|
|
assert!(rel(volume(&dented), PI * R * R * 40.0 - want) < 1e-3, "{}", volume(&dented));
|
|
// The operands' faces carry over: the dented pin's round face is still the pin's.
|
|
assert!(dented.history().is_some());
|
|
}
|
|
|
|
#[test]
|
|
fn a_ball_pressed_into_a_read_pins_side_matches_the_built_pin() {
|
|
let ball = sphere(Vec3::new(3.0, 1.0, 5.5), 3.0).unwrap();
|
|
let built = volume(&boolean(&pin(), &ball, BoolOp::Intersect).unwrap().unwrap());
|
|
let read = volume(&exact(&through_step(&pin()), &ball, BoolOp::Intersect).unwrap());
|
|
assert!(rel(read, built) < 1e-3, "{read} {built}");
|
|
}
|
|
|
|
/// A cone's side read from STEP is one face along its seam as well.
|
|
#[test]
|
|
fn a_block_pressed_into_a_read_cones_side_matches_the_built_cone() {
|
|
let outline =
|
|
Region2 { outer: Loop2::polygon(&[Vec2::new(0.0, 0.0), Vec2::new(8.0, 0.0), Vec2::new(5.0, 20.0), Vec2::new(0.0, 20.0)]), holes: vec![] };
|
|
let cone = revolve(&Plane::YZ, &[outline], Vec2::ZERO, Vec2::Y, 2.0 * PI).unwrap().pop().unwrap();
|
|
let read = through_step(&cone);
|
|
let block = box_solid(Vec3::new(-2.0, 4.0, 6.0), Vec3::new(2.0, 12.0, 12.0)).unwrap();
|
|
let built = volume(&boolean(&cone, &block, BoolOp::Intersect).unwrap().unwrap());
|
|
let read = volume(&exact(&read, &block, BoolOp::Intersect).unwrap());
|
|
assert!(rel(read, built) < 1e-3, "{read} {built}");
|
|
}
|