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.6 KiB
Rust
77 lines
3.6 KiB
Rust
//! #871: a fillet that opened holes in the model must be refused, not accepted.
|
||
|
||
use solidcore_record::Vec3;
|
||
|
||
use crate::{Body, BoolOp, build::box_solid, ops::boolean};
|
||
|
||
/// The part from #871: a plate with a narrower block on top and a window through both, filleted
|
||
/// at radius 1 along every edge of both end faces.
|
||
fn part() -> Body {
|
||
let (a, b) = (12.74437365538526, 22.69275963366936);
|
||
let base = box_solid(Vec3::new(9.5, 8.0, 0.0), Vec3::new(23.5, 29.5, 10.0)).unwrap();
|
||
let top = box_solid(Vec3::new(9.5, a, 10.0), Vec3::new(23.5, b, 20.0)).unwrap();
|
||
let joined = boolean(&base, &top, BoolOp::Union).unwrap().unwrap();
|
||
let window = box_solid(Vec3::new(9.5, 14.0, 7.0), Vec3::new(23.5, 19.2, 14.1)).unwrap();
|
||
boolean(&joined, &window, BoolOp::Cut).unwrap().unwrap()
|
||
}
|
||
|
||
fn edges() -> Vec<Vec3> {
|
||
let yz = [
|
||
(12.74437365538526, 15.0),
|
||
(10.37218682769263, 10.0),
|
||
(8.0, 5.0),
|
||
(18.75, 0.0),
|
||
(29.5, 5.0),
|
||
(26.09637981683468, 10.0),
|
||
(22.69275963366936, 15.0),
|
||
(17.71856664452731, 20.0),
|
||
(16.6, 7.0),
|
||
(14.0, 10.55),
|
||
(16.6, 14.100000000000001),
|
||
(19.200000000000003, 10.55),
|
||
];
|
||
[23.5, 9.5].iter().flat_map(|x| yz.iter().map(move |(y, z)| Vec3::new(*x, *y, *z))).collect()
|
||
}
|
||
|
||
/// Radius 1 on both the window's edges and the block's sides: the wall between them is 1.26
|
||
/// mm thick, so the rounds overlap and the end faces' boundaries cross. That result has
|
||
/// openings and is refused.
|
||
#[test]
|
||
fn overlapping_rounds_are_refused() {
|
||
let p = part();
|
||
assert_eq!(p.crossed_face_loops().unwrap(), 0);
|
||
assert!(crate::fillet(&p, &edges(), 1.0).is_err(), "a fillet with openings in its surface was accepted");
|
||
// The corner build makes that body (what #871 got): closed as topology, every face meshes,
|
||
// but the loops of its end faces cross.
|
||
let sel: Vec<(Vec3, f64)> = edges().into_iter().map(|e| (e, 1.0)).collect();
|
||
if let Ok(b) = crate::blend_corner::fillet_radii(&p, &sel) {
|
||
assert!(b.validity().is_empty() && b.crossed_face_loops().unwrap() > 0);
|
||
}
|
||
}
|
||
|
||
/// Below half the wall the rounds fit: a closed solid with a round on every edge. Each end face's
|
||
/// round section at depth u into the round is the end face's outline moved in by
|
||
/// d = r − √(r² − (r − u)²), each edge parallel to itself and every corner mitred (two rounds
|
||
/// meeting at a corner beside an unpicked sharp edge, convex or concave: the owner's ruling of
|
||
/// 2026-10-30): the area less L d (L the outline's and the window's length together,
|
||
/// 2 · 41.5 + 2 · 12.3 = 107.6), plus d² at each of the six convex corners (the two strips
|
||
/// overlap) and less d² at each of the six concave ones (the two shoulders and the window's four
|
||
/// corners: the mitre takes the d × d square beyond both strips). The corner terms cancel, so
|
||
/// both ends remove 2 L ∫ d = 2 L r² (1 − π/4).
|
||
#[test]
|
||
fn rounds_that_fit_are_closed() {
|
||
use std::f64::consts::FRAC_PI_4;
|
||
let p = part();
|
||
let r = 0.5;
|
||
let b = crate::fillet(&p, &edges(), r).unwrap();
|
||
assert!(b.validity().is_empty(), "{:?}", b.validity());
|
||
assert_eq!(b.crossed_face_loops().unwrap(), 0);
|
||
let (a, top) = (12.74437365538526, 22.69275963366936);
|
||
let part_volume = 14.0 * (21.5 * 10.0 + (top - a) * 10.0 - 5.2 * 7.1);
|
||
assert!((crate::measure(&p).unwrap().volume - part_volume).abs() < 1e-9 * part_volume);
|
||
let length = 2.0 * (21.5 + 20.0) + 2.0 * (5.2 + 7.1);
|
||
let removed = 2.0 * length * r * r * (1.0 - FRAC_PI_4);
|
||
let v = crate::measure(&b).unwrap().volume;
|
||
assert!((v - (part_volume - removed)).abs() < 1e-7 * part_volume, "{v} vs {}", part_volume - removed);
|
||
}
|