Files
makeCAD/crates/kernel/src/sphere_lens_tests.rs
T
jyviko dc38349cbf Layer split stage 1: the B-rep record, native body file and Vec/Plane come from solidcore-record (#11496)
* 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>
2026-11-03 09:04:26 -05:00

58 lines
2.5 KiB
Rust

//! A lens extruded from a sphere's projected outline cut from the sphere (#2750): one of its
//! cylinders encloses the target and only touches the sphere.
use crate::history::BodyHistory;
use crate::{Body, BoolOp};
use solidcore_record::{Loop2, Plane, Region2, Seg2, Vec2, Vec3};
use std::f64::consts::{FRAC_PI_2, PI};
fn dome() -> Body {
let profile = Region2 {
outer: Loop2 {
segs: vec![
Seg2::Arc { center: Vec2::ZERO, radius: 25., start: 0., sweep: PI },
Seg2::Line { a: Vec2::new(-25., 0.), b: Vec2::new(25., 0.) },
],
},
holes: vec![],
};
let plane = Plane { origin: Vec3::ZERO, x: Vec3::X, y: Vec3::Z };
crate::revolve_whole(&plane, &[profile], Vec2::ZERO, Vec2::X, FRAC_PI_2).unwrap().pop().unwrap()
}
fn lens(enclosing_radius: f64) -> Region2 {
crate::planar_regions_boolean(
&[Region2 { outer: Loop2::circle(Vec2::ZERO, enclosing_radius), holes: vec![] }],
&[Region2 { outer: Loop2::circle(Vec2::new(0., 20.), 15.), holes: vec![] }],
BoolOp::Intersect,
1e-7,
)
.unwrap()
.pop()
.unwrap()
}
fn tool(region: Region2, depth: f64) -> Body {
let plane = Plane { origin: Vec3::ZERO, x: Vec3::X, y: Vec3::Z };
crate::extrude(&plane, &[region], 0., depth).unwrap().pop().unwrap()
}
#[test]
fn projected_spherical_outline_does_not_block_a_lens_cut() {
let target = dome();
let cutter = tool(lens(25.), 30.);
let result = crate::boolean(&target, &cutter, BoolOp::Cut).unwrap().unwrap();
assert!(result.validity().is_empty(), "{:?}", result.validity());
assert_eq!(result.lumps().unwrap().len(), 1);
// Integrating the half-disc cross-section left by the offset bore gives
// 8810.08973246 mm³ (R=25, bore radius=15, bore centre z=20).
let measured = crate::measure(&result).unwrap();
assert!((measured.volume - 8810.08973246).abs() < 2., "{measured:?}");
assert!(measured.bbox.max.z < 20.01, "no thin lid may remain above the cut: {measured:?}");
assert_eq!(result.classify_point(Vec3::new(0., -10., 2.)).unwrap(), crate::PointClass::Inside);
assert_eq!(result.classify_point(Vec3::new(0., -10., 15.)).unwrap(), crate::PointClass::Outside);
assert_eq!(measured.merged.face_types.get("cylinder"), Some(&1));
let history = result.history().expect("the cut has a face history");
history.check(&result, &[&target, &cutter]).unwrap();
assert!(history.faces.iter().all(|f| !f.origins.is_empty()));
}