* 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>
123 lines
4.6 KiB
Rust
123 lines
4.6 KiB
Rust
//! The geometry a feature holds, each piece with its role: the points that pick faces (moved
|
|
//! with the feature, and the source of its persistent face names), other positions, directions,
|
|
//! planes, construction references, a primitive's placement point and its profile selections.
|
|
//! The walk (`crate::walk`) is behind `transform_geometry`, `face_points`, `profile_sels` and
|
|
//! `point_expr`.
|
|
|
|
use solidcore_record::Vec3;
|
|
|
|
use crate::walk::Walk;
|
|
use crate::{FeatureKind, PointExpr, ProfileSel};
|
|
|
|
/// A piece of a feature's geometry: `V` is `&Vec3` or `&mut Vec3`, and so on for the others.
|
|
pub(crate) enum Geo<V, P, G, E, S> {
|
|
/// A point that picks a face: it moves with the feature and names the face it picks.
|
|
Pick(V),
|
|
/// A point that picks a face but stays where it is when the feature is moved (an Emboss
|
|
/// cylinder, chosen in its component's frame).
|
|
Pinned(V),
|
|
/// Any other position (an edge pick, an axis origin, a fold line): it moves with the feature.
|
|
Pos(V),
|
|
/// A direction: it turns with the feature.
|
|
Dir(V),
|
|
Plane(P),
|
|
/// A construction axis's or point's reference to the model.
|
|
Construct(G),
|
|
/// A primitive's placement point (length expressions).
|
|
Placement(E),
|
|
/// A profile selection, with its sketch.
|
|
Profiles(u64, S),
|
|
}
|
|
|
|
impl FeatureKind {
|
|
/// The points that pick faces (shell, draft, offset and replace faces, a hole's placement and
|
|
/// `to`, an extrude's `to` and `from`…), in the order of the feature's persistent face names.
|
|
pub fn face_points_mut(&mut self) -> Vec<&mut Vec3> {
|
|
let mut v = Vec::new();
|
|
self.walk_geometry_mut(&mut |g| {
|
|
if let Geo::Pick(p) | Geo::Pinned(p) = g {
|
|
v.push(p);
|
|
}
|
|
});
|
|
v
|
|
}
|
|
|
|
/// Read-only view of [`FeatureKind::face_points_mut`].
|
|
pub fn face_points(&self) -> Vec<Vec3> {
|
|
let mut v = Vec::new();
|
|
self.walk_geometry(&mut |g| {
|
|
if let Geo::Pick(p) | Geo::Pinned(p) = g {
|
|
v.push(*p);
|
|
}
|
|
});
|
|
v
|
|
}
|
|
|
|
/// The body a feature that works on one body's faces names (shell, draft, split, offset,
|
|
/// delete and replace face, surface offset, the placed plastic features, sheet metal
|
|
/// conversion, ruled surface, untrim): its face points pick faces of that body.
|
|
pub fn face_body(&self) -> Option<&str> {
|
|
match self {
|
|
FeatureKind::Shell { body, .. }
|
|
| FeatureKind::Draft { body, .. }
|
|
| FeatureKind::SplitFace { body, .. }
|
|
| FeatureKind::OffsetFace { body, .. }
|
|
| FeatureKind::DeleteFace { body, .. }
|
|
| FeatureKind::ReplaceFace { body, .. }
|
|
| FeatureKind::SurfaceOffset { body, .. }
|
|
| FeatureKind::Boss { body, .. }
|
|
| FeatureKind::SnapFit { body, .. }
|
|
| FeatureKind::Rest { body, .. } => body.as_deref(),
|
|
FeatureKind::SheetConvert { body, .. } | FeatureKind::SurfaceRuled { body, .. } => Some(body.as_ref()),
|
|
FeatureKind::SurfaceUntrim { face, .. } => Some(face.body.as_ref()),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// The feature's profile selections, each with its sketch.
|
|
pub fn profile_sels_mut(&mut self) -> Vec<(u64, &mut ProfileSel)> {
|
|
let mut v = Vec::new();
|
|
self.walk_geometry_mut(&mut |g| {
|
|
if let Geo::Profiles(sketch, sel) = g {
|
|
v.push((sketch, sel));
|
|
}
|
|
});
|
|
v
|
|
}
|
|
|
|
/// Read-only view of [`FeatureKind::profile_sels_mut`].
|
|
pub fn profile_sels(&self) -> Vec<(u64, &ProfileSel)> {
|
|
let mut v = Vec::new();
|
|
self.walk_geometry(&mut |g| {
|
|
if let Geo::Profiles(sketch, sel) = g {
|
|
v.push((sketch, sel));
|
|
}
|
|
});
|
|
v
|
|
}
|
|
|
|
/// A primitive's placement point (length expressions). Its coordinates are not inputs:
|
|
/// they get no parameter names and keep bare numbers in mm whatever the design's units, as
|
|
/// every other position does; renames and users still find them.
|
|
pub fn point_expr_mut(&mut self) -> Option<&mut PointExpr> {
|
|
let mut found = None;
|
|
self.walk_geometry_mut(&mut |g| {
|
|
if let Geo::Placement(p) = g {
|
|
found = Some(p);
|
|
}
|
|
});
|
|
found
|
|
}
|
|
|
|
/// Read-only view of [`FeatureKind::point_expr_mut`].
|
|
pub fn point_expr(&self) -> Option<&PointExpr> {
|
|
let mut found = None;
|
|
self.walk_geometry(&mut |g| {
|
|
if let Geo::Placement(p) = g {
|
|
found = Some(p);
|
|
}
|
|
});
|
|
found
|
|
}
|
|
}
|