rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-01-12 03:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2270 from hannobraun/geometry

Browse Source 
Add operation for updating half-edge geometry
This commit is contained in:
Hanno Braun 2024-03-18 13:43:10 +01:00 committed by GitHub
commit 795fe382a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
crates/fj-core/src/operations/geometry/half_edge.rs Normal file
View File

@ -0,0 +1,60 @@
use fj_math::Point;
use crate::{
geometry::{CurveBoundary, SurfacePath},
objects::HalfEdge,
operations::insert::Insert,
storage::Handle,
Core,
};
/// Update the geometry of a [`HalfEdge`]
pub trait UpdateHalfEdgeGeometry {
/// Update the path of the edge
#[must_use]
fn update_path(
&self,
update: impl FnOnce(SurfacePath) -> SurfacePath,
core: &mut Core,
) -> Self;
/// Update the boundary of the edge
#[must_use]
fn update_boundary(
&self,
update: impl FnOnce(CurveBoundary<Point<1>>) -> CurveBoundary<Point<1>>,
core: &mut Core,
) -> Self;
}
impl UpdateHalfEdgeGeometry for Handle<HalfEdge> {
fn update_path(
&self,
update: impl FnOnce(SurfacePath) -> SurfacePath,
core: &mut Core,
) -> Self {
let path = update(self.path());
HalfEdge::new(
path,
self.boundary(),
self.curve().clone(),
self.start_vertex().clone(),
)
.insert(core)
}
fn update_boundary(
&self,
update: impl FnOnce(CurveBoundary<Point<1>>) -> CurveBoundary<Point<1>>,
core: &mut Core,
) -> Self {
HalfEdge::new(
self.path(),
update(self.boundary()),
self.curve().clone(),
self.start_vertex().clone(),
)
.insert(core)
}
}

5
crates/fj-core/src/operations/geometry/mod.rs Normal file
View File

@ -0,0 +1,5 @@
//! Operations to update the geometry of objects
mod half_edge;
pub use self::half_edge::UpdateHalfEdgeGeometry;

1
crates/fj-core/src/operations/mod.rs
View File

@ -40,6 +40,7 @@
pub mod build;
pub mod derive;
pub mod geometry;
pub mod holes;
pub mod insert;
pub mod join;

48
crates/fj-core/src/operations/update/half_edge.rs
View File

@ -1,7 +1,4 @@
use fj_math::Point;
use crate::{
geometry::{CurveBoundary, SurfacePath},
objects::{Curve, HalfEdge, Vertex},
operations::{derive::DeriveFrom, insert::Insert},
storage::Handle,
@ -9,22 +6,7 @@ use crate::{
};
/// Update a [`HalfEdge`]
pub trait UpdateHalfEdge: Sized {
/// Update the path of the edge
#[must_use]
fn update_path(
&self,
update: impl FnOnce(SurfacePath) -> SurfacePath,
core: &mut Core,
) -> Handle<Self>;
/// Update the boundary of the edge
#[must_use]
fn update_boundary(
&self,
update: impl FnOnce(CurveBoundary<Point<1>>) -> CurveBoundary<Point<1>>,
) -> Self;
pub trait UpdateHalfEdge {
/// Update the curve of the edge
#[must_use]
fn update_curve<T>(
@ -47,34 +29,6 @@ pub trait UpdateHalfEdge: Sized {
}
impl UpdateHalfEdge for HalfEdge {
fn update_path(
&self,
update: impl FnOnce(SurfacePath) -> SurfacePath,
core: &mut Core,
) -> Handle<Self> {
let path = update(self.path());
HalfEdge::new(
path,
self.boundary(),
self.curve().clone(),
self.start_vertex().clone(),
)
.insert(core)
}
fn update_boundary(
&self,
update: impl FnOnce(CurveBoundary<Point<1>>) -> CurveBoundary<Point<1>>,
) -> Self {
HalfEdge::new(
self.path(),
update(self.boundary()),
self.curve().clone(),
self.start_vertex().clone(),
)
}
fn update_curve<T>(
&self,
update: impl FnOnce(&Handle<Curve>, &mut Core) -> T,

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

@ -403,6 +403,7 @@ mod tests {
objects::{Curve, Shell},
operations::{
build::BuildShell,
geometry::UpdateHalfEdgeGeometry,
update::{
UpdateCycle, UpdateFace, UpdateHalfEdge, UpdateRegion,
UpdateShell,
@ -435,9 +436,10 @@ mod tests {
|path| path.reverse(),
core,
)
.update_boundary(|boundary| {
boundary.reverse()
})]
.update_boundary(
|boundary| boundary.reverse(),
core,
)]
},
core,
)