* 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>
116 lines
4.7 KiB
Rust
116 lines
4.7 KiB
Rust
//! Two bores of one radius crossing each other (#788): the surfaces touch where the two ellipses
|
|
//! of the crossing meet, which a mesh intersection cannot trace and a boolean cannot take in the
|
|
//! middle of a face.
|
|
use crate::*;
|
|
use solidcore_record::Vec3;
|
|
use std::f64::consts::PI;
|
|
|
|
const SIDE: f64 = 45.0;
|
|
|
|
fn volume(b: &Body) -> f64 {
|
|
measure(b).unwrap().volume
|
|
}
|
|
|
|
fn block() -> Body {
|
|
let h = SIDE / 2.0;
|
|
box_solid(Vec3::new(-h, -h, -h), Vec3::new(h, h, h)).unwrap()
|
|
}
|
|
|
|
/// A cylinder of radius `r` along `axis` through `centre`, longer than the block.
|
|
fn bore(centre: Vec3, axis: Vec3, r: f64, length: f64) -> Body {
|
|
cylinder(centre - axis * (length / 2.0), axis, r, length).unwrap()
|
|
}
|
|
|
|
/// The block with a bore along Z, then one of the same radius along `axis` through `centre`.
|
|
fn crossed(r: f64, centre: Vec3, axis: Vec3) -> Result<Option<Body>> {
|
|
let one = boolean(&block(), &bore(Vec3::ZERO, Vec3::Z, r, 60.0), BoolOp::Cut)?.expect("first bore");
|
|
boolean(&one, &bore(centre, axis, r, 60.0), BoolOp::Cut)
|
|
}
|
|
|
|
fn within(got: f64, want: f64, what: &str) {
|
|
assert!((got - want).abs() < 2e-3 * want, "{what}: {got} vs {want}");
|
|
}
|
|
|
|
/// Block less two perpendicular bores through its middle: each takes `π r² L`, and the Steinmetz
|
|
/// solid they share, 16r³/3, is counted twice.
|
|
fn expected_perpendicular(r: f64) -> f64 {
|
|
SIDE.powi(3) - 2.0 * PI * r * r * SIDE + 16.0 * r.powi(3) / 3.0
|
|
}
|
|
|
|
#[test]
|
|
fn equal_bores_crossing_at_right_angles() {
|
|
for r in [10.0, 17.5, 4.0] {
|
|
let body = crossed(r, Vec3::ZERO, Vec3::Y).unwrap_or_else(|e| panic!("r {r}: {e}")).unwrap();
|
|
assert_eq!(body.shell_count(), 1, "r {r}");
|
|
within(volume(&body), expected_perpendicular(r), &format!("r {r}"));
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn equal_bores_crossing_along_every_axis_pair() {
|
|
let r = 10.0;
|
|
let want = expected_perpendicular(r);
|
|
for (first, second) in [(Vec3::X, Vec3::Y), (Vec3::Y, Vec3::X), (Vec3::X, Vec3::Z), (Vec3::Z, Vec3::X), (Vec3::Y, Vec3::Z)] {
|
|
let one = boolean(&block(), &bore(Vec3::ZERO, first, r, 60.0), BoolOp::Cut).unwrap().unwrap();
|
|
let body = boolean(&one, &bore(Vec3::ZERO, second, r, 60.0), BoolOp::Cut).unwrap().unwrap();
|
|
within(volume(&body), want, &format!("{first:?} then {second:?}"));
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn equal_bores_crossing_at_an_angle() {
|
|
// Two infinite cylinders of radius r at angle t share 16r³ / (3 sin t).
|
|
let (r, t) = (5.0f64, PI / 3.0);
|
|
let axis = Vec3::new(0.0, t.sin(), t.cos());
|
|
let body = crossed(r, Vec3::ZERO, axis).unwrap().unwrap();
|
|
let first = PI * r * r * SIDE;
|
|
let second = PI * r * r * SIDE / t.sin();
|
|
let shared = 16.0 * r.powi(3) / (3.0 * t.sin());
|
|
within(volume(&body), SIDE.powi(3) - first - second + shared, "60 degrees");
|
|
}
|
|
|
|
#[test]
|
|
fn equal_bores_crossing_off_the_middle_of_the_block() {
|
|
// Both axes meet at (3, -2, 5): the touching points are not at the block's centre.
|
|
let r = 8.0;
|
|
let c = Vec3::new(3.0, -2.0, 5.0);
|
|
let one = boolean(&block(), &bore(c, Vec3::Z, r, 60.0), BoolOp::Cut).unwrap().unwrap();
|
|
let body = boolean(&one, &bore(c, Vec3::Y, r, 80.0), BoolOp::Cut).unwrap().unwrap();
|
|
// The bores leave the block through its faces; the shared part lies inside it.
|
|
let removed = PI * r * r * SIDE * 2.0 - 16.0 * r.powi(3) / 3.0;
|
|
within(volume(&body), SIDE.powi(3) - removed, "off centre");
|
|
}
|
|
|
|
#[test]
|
|
fn equal_cylinders_joined_and_intersected() {
|
|
let r = 10.0;
|
|
let (z, y) = (bore(Vec3::ZERO, Vec3::Z, r, 60.0), bore(Vec3::ZERO, Vec3::Y, r, 60.0));
|
|
let tee = boolean(&z, &y, BoolOp::Union).unwrap().unwrap();
|
|
within(volume(&tee), 2.0 * PI * r * r * 60.0 - 16.0 * r.powi(3) / 3.0, "join");
|
|
assert_eq!(tee.shell_count(), 1);
|
|
let steinmetz = boolean(&z, &y, BoolOp::Intersect).unwrap().unwrap();
|
|
within(volume(&steinmetz), 16.0 * r.powi(3) / 3.0, "intersect");
|
|
}
|
|
|
|
#[test]
|
|
fn the_result_keeps_a_history_over_the_operands_as_given() {
|
|
let r = 10.0;
|
|
let one = boolean(&block(), &bore(Vec3::ZERO, Vec3::Z, r, 60.0), BoolOp::Cut).unwrap().unwrap();
|
|
let tool = bore(Vec3::ZERO, Vec3::Y, r, 60.0);
|
|
let body = boolean(&one, &tool, BoolOp::Cut).unwrap().unwrap();
|
|
let history = body.history().expect("the cut has a history");
|
|
assert_eq!(history.operands, 2);
|
|
assert_eq!(history.faces.len(), body.face_count());
|
|
}
|
|
|
|
#[test]
|
|
fn faces_split_for_the_crossing_leave_the_operands_alone() {
|
|
// The split is on the working copies: the target keeps its faces.
|
|
let r = 10.0;
|
|
let one = boolean(&block(), &bore(Vec3::ZERO, Vec3::Z, r, 60.0), BoolOp::Cut).unwrap().unwrap();
|
|
let (faces, volume_before) = (one.face_count(), volume(&one));
|
|
let _ = boolean(&one, &bore(Vec3::ZERO, Vec3::Y, r, 60.0), BoolOp::Cut).unwrap();
|
|
assert_eq!(one.face_count(), faces);
|
|
assert_eq!(volume(&one), volume_before);
|
|
}
|