rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-03 17:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2287 from hannobraun/geometry

Browse Source 
Add redundant definition of `HalfEdge`'s `CurveBoundary` to geometry layer
This commit is contained in:
Hanno Braun 2024-03-23 01:37:49 +01:00 committed by GitHub
commit 2ebc613a92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 76 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/fj-core/src/algorithms/approx/edge.rs
View File

@ -31,7 +31,7 @@ impl Approx for (&Handle<HalfEdge>, &SurfaceGeometry) {
.layers
.geometry
.of_half_edge(half_edge)
.start_position(half_edge.boundary());
.start_position();
let start_position =
match cache.start_position.get(half_edge.start_vertex()) {
Some(position) => position,

19
crates/fj-core/src/geometry/half_edge.rs
View File

@ -31,19 +31,28 @@ pub struct HalfEdgeGeometry {
/// really belong here. It exists here for practical reasons that are,
/// hopefully, temporary.
pub path: SurfacePath,
/// # The boundary of the half-edge on its curve
pub boundary: CurveBoundary<Point<1>>,
}
impl HalfEdgeGeometry {
/// Update the boundary
pub fn with_boundary(
mut self,
boundary: impl Into<CurveBoundary<Point<1>>>,
) -> Self {
self.boundary = boundary.into();
self
}
/// Compute the surface position where the half-edge starts
pub fn start_position(
&self,
boundary: CurveBoundary<Point<1>>,
) -> Point<2> {
pub fn start_position(&self) -> Point<2> {
// Computing the surface position from the curve position is fine.
// `HalfEdge` "owns" its start position. There is no competing code that
// could compute the surface position from slightly different data.
let [start, _] = boundary.inner;
let [start, _] = self.boundary.inner;
self.path.point_from_path_coords(start)
}
}

4
crates/fj-core/src/objects/kinds/cycle.rs
View File

@ -66,9 +66,7 @@ impl Cycle {
for (a, b) in self.half_edges().pairs() {
let [a, b] = [a, b].map(|half_edge| {
geometry
.of_half_edge(half_edge)
.start_position(half_edge.boundary())
geometry.of_half_edge(half_edge).start_position()
});
sum += (b.u - a.u) * (b.v + a.v);

36
crates/fj-core/src/operations/build/half_edge.rs
View File

@ -32,16 +32,16 @@ pub trait BuildHalfEdge {
start_vertex: Handle<Vertex>,
core: &mut Core,
) -> Handle<HalfEdge> {
let mut geometry = core.layers.geometry.of_half_edge(sibling);
geometry.boundary = geometry.boundary.reverse();
HalfEdge::new(
sibling.boundary().reverse(),
sibling.curve().clone(),
start_vertex,
)
.insert(core)
.set_geometry(
core.layers.geometry.of_half_edge(sibling),
&mut core.layers.geometry,
)
.set_geometry(geometry, &mut core.layers.geometry)
}
/// Create an arc
@ -68,9 +68,13 @@ pub trait BuildHalfEdge {
[arc.start_angle, arc.end_angle].map(|coord| Point::from([coord]));
let half_edge = HalfEdge::unjoined(boundary, core).insert(core);
core.layers
.geometry
.define_half_edge(half_edge.clone(), HalfEdgeGeometry { path });
core.layers.geometry.define_half_edge(
half_edge.clone(),
HalfEdgeGeometry {
path,
boundary: boundary.into(),
},
);
half_edge
}
@ -86,9 +90,13 @@ pub trait BuildHalfEdge {
[Scalar::ZERO, Scalar::TAU].map(|coord| Point::from([coord]));
let half_edge = HalfEdge::unjoined(boundary, core).insert(core);
core.layers
.geometry
.define_half_edge(half_edge.clone(), HalfEdgeGeometry { path });
core.layers.geometry.define_half_edge(
half_edge.clone(),
HalfEdgeGeometry {
path,
boundary: boundary.into(),
},
);
half_edge
}
@ -107,7 +115,13 @@ pub trait BuildHalfEdge {
HalfEdge::unjoined(boundary, core)
.insert(core)
.set_geometry(HalfEdgeGeometry { path }, &mut core.layers.geometry)
.set_geometry(
HalfEdgeGeometry {
path,
boundary: boundary.into(),
},
&mut core.layers.geometry,
)
}
}

2
crates/fj-core/src/operations/join/cycle.rs
View File

@ -98,7 +98,7 @@ impl JoinCycle for Cycle {
)
.insert(core)
.set_geometry(
HalfEdgeGeometry { path },
HalfEdgeGeometry { path, boundary },
&mut core.layers.geometry,
)
})

8
crates/fj-core/src/operations/reverse/cycle.rs
View File

@ -14,6 +14,9 @@ impl Reverse for Cycle {
.half_edges()
.pairs()
.map(|(current, next)| {
let mut geometry = core.layers.geometry.of_half_edge(current);
geometry.boundary = geometry.boundary.reverse();
HalfEdge::new(
current.boundary().reverse(),
current.curve().clone(),
@ -21,10 +24,7 @@ impl Reverse for Cycle {
)
.insert(core)
.derive_from(current, core)
.set_geometry(
core.layers.geometry.of_half_edge(current),
&mut core.layers.geometry,
)
.set_geometry(geometry, &mut core.layers.geometry)
})
.collect::<Vec<_>>();

10
crates/fj-core/src/operations/reverse/edge.rs
View File

@ -1,5 +1,4 @@
use crate::{
geometry::HalfEdgeGeometry,
objects::HalfEdge,
operations::{derive::DeriveFrom, insert::Insert},
storage::Handle,
@ -10,11 +9,12 @@ use super::ReverseCurveCoordinateSystems;
impl ReverseCurveCoordinateSystems for Handle<HalfEdge> {
fn reverse_curve_coordinate_systems(&self, core: &mut Core) -> Self {
let path = core.layers.geometry.of_half_edge(self).path.reverse();
let boundary = self.boundary().reverse();
let mut geometry = core.layers.geometry.of_half_edge(self);
geometry.path = geometry.path.reverse();
geometry.boundary = geometry.boundary.reverse();
let half_edge = HalfEdge::new(
boundary,
geometry.boundary,
self.curve().clone(),
self.start_vertex().clone(),
)
@ -23,7 +23,7 @@ impl ReverseCurveCoordinateSystems for Handle<HalfEdge> {
core.layers
.geometry
.define_half_edge(half_edge.clone(), HalfEdgeGeometry { path });
.define_half_edge(half_edge.clone(), geometry);
half_edge
}

10
crates/fj-core/src/operations/split/face.rs
View File

@ -105,14 +105,8 @@ impl SplitFace for Shell {
let dividing_half_edge_a_to_d = {
let half_edge = HalfEdge::line_segment(
[
core.layers
.geometry
.of_half_edge(&b)
.start_position(b.boundary()),
core.layers
.geometry
.of_half_edge(&d)
.start_position(d.boundary()),
core.layers.geometry.of_half_edge(&b).start_position(),
core.layers.geometry.of_half_edge(&d).start_position(),
],
None,
core,

29
crates/fj-core/src/operations/split/half_edge.rs
View File

@ -2,7 +2,9 @@ use fj_math::Point;
use crate::{
objects::{HalfEdge, Vertex},
operations::{derive::DeriveFrom, insert::Insert},
operations::{
derive::DeriveFrom, geometry::UpdateHalfEdgeGeometry, insert::Insert,
},
storage::Handle,
Core,
};
@ -48,22 +50,27 @@ impl SplitHalfEdge for Handle<HalfEdge> {
self.start_vertex().clone(),
)
.insert(core)
.derive_from(self, core);
.derive_from(self, core)
.set_geometry(
core.layers
.geometry
.of_half_edge(self)
.with_boundary([start, point]),
&mut core.layers.geometry,
);
let b = HalfEdge::new(
[point, end],
self.curve().clone(),
Vertex::new().insert(core),
)
.insert(core)
.derive_from(self, core);
core.layers.geometry.define_half_edge(
a.clone(),
core.layers.geometry.of_half_edge(self),
);
core.layers.geometry.define_half_edge(
b.clone(),
core.layers.geometry.of_half_edge(self),
.derive_from(self, core)
.set_geometry(
core.layers
.geometry
.of_half_edge(self)
.with_boundary([point, end]),
&mut core.layers.geometry,
);
[a, b]

2
crates/fj-core/src/validate/shell.rs
View File

@ -450,6 +450,8 @@ mod tests {
.geometry
.of_half_edge(half_edge);
geometry.path = geometry.path.reverse();
geometry.boundary =
geometry.boundary.reverse();
[HalfEdge::new(
half_edge.boundary().reverse(),

2
crates/fj-core/src/validate/solid.rs
View File

@ -93,7 +93,7 @@ impl SolidValidationError {
.map(|(h, s)| {
(
s.point_from_surface_coords(
geometry.of_half_edge(&h).start_position(h.boundary()),
geometry.of_half_edge(&h).start_position(),
),
h.start_vertex().clone(),
)

5
crates/fj-core/src/validation/checks/half_edge_connection.rs
View File

@ -52,9 +52,8 @@ impl ValidationCheck<Cycle> for AdjacentHalfEdgesNotConnected {
.path
.point_from_path_coords(end)
};
let start_pos_of_second_half_edge = geometry
.of_half_edge(second)
.start_position(second.boundary());
let start_pos_of_second_half_edge =
geometry.of_half_edge(second).start_position();
let distance_between_positions = (end_pos_of_first_half_edge
- start_pos_of_second_half_edge)