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

Shorten HalfEdgeGeometry to HalfEdgeGeom

Browse Source 
Geometry is a very common concept within `fj-core`, and
`HalfEdgeGeometry` is used in many places. A shorthand seems justified.
This commit is contained in:
Hanno Braun 2024-03-27 12:17:44 +01:00
parent 9e67c4b8c6
commit 2b49b57faf
8 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/fj-core/src/algorithms/approx/curve.rs
View File

@ -6,7 +6,7 @@ use fj_math::Point;
use crate::{ use crate::{
geometry::{ geometry::{
CurveBoundary, Geometry, GlobalPath, HalfEdgeGeometry, SurfaceGeometry, CurveBoundary, Geometry, GlobalPath, HalfEdgeGeom, SurfaceGeometry,
SurfacePath, SurfacePath,
}, },
storage::Handle, storage::Handle,
@ -15,7 +15,7 @@ use crate::{
use super::{Approx, ApproxPoint, Tolerance}; use super::{Approx, ApproxPoint, Tolerance};
impl Approx for (&Handle<Curve>, &HalfEdgeGeometry, &Handle<Surface>) { impl Approx for (&Handle<Curve>, &HalfEdgeGeom, &Handle<Surface>) {
type Approximation = CurveApprox; type Approximation = CurveApprox;
type Cache = CurveApproxCache; type Cache = CurveApproxCache;
@ -182,7 +182,7 @@ mod tests {
use crate::{ use crate::{
algorithms::approx::{Approx, ApproxPoint}, algorithms::approx::{Approx, ApproxPoint},
geometry::{CurveBoundary, GlobalPath, HalfEdgeGeometry, SurfacePath}, geometry::{CurveBoundary, GlobalPath, HalfEdgeGeom, SurfacePath},
operations::{build::BuildSurface, insert::Insert}, operations::{build::BuildSurface, insert::Insert},
topology::{Curve, Surface}, topology::{Curve, Surface},
Core, Core,
@ -196,7 +196,7 @@ mod tests {
let (path, boundary) = let (path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]); SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let boundary = CurveBoundary::from(boundary); let boundary = CurveBoundary::from(boundary);
let half_edge = HalfEdgeGeometry { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = core.layers.topology.surfaces.xz_plane(); let surface = core.layers.topology.surfaces.xz_plane();
let tolerance = 1.; let tolerance = 1.;
@ -214,7 +214,7 @@ mod tests {
let (path, boundary) = let (path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]); SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let boundary = CurveBoundary::from(boundary); let boundary = CurveBoundary::from(boundary);
let half_edge = HalfEdgeGeometry { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = Surface::from_uv( let surface = Surface::from_uv(
GlobalPath::circle_from_radius(1.), GlobalPath::circle_from_radius(1.),
[0., 0., 1.], [0., 0., 1.],
@ -239,7 +239,7 @@ mod tests {
([TAU], [TAU, 1.]), ([TAU], [TAU, 1.]),
]); ]);
let boundary = CurveBoundary::from([[0.], [TAU]]); let boundary = CurveBoundary::from([[0.], [TAU]]);
let half_edge = HalfEdgeGeometry { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = Surface::from_uv(global_path, [0., 0., 1.], &mut core); let surface = Surface::from_uv(global_path, [0., 0., 1.], &mut core);
let tolerance = 1.; let tolerance = 1.;
@ -269,7 +269,7 @@ mod tests {
let curve = Curve::new().insert(&mut core); let curve = Curve::new().insert(&mut core);
let path = SurfacePath::circle_from_center_and_radius([0., 0.], 1.); let path = SurfacePath::circle_from_center_and_radius([0., 0.], 1.);
let boundary = CurveBoundary::from([[0.], [TAU]]); let boundary = CurveBoundary::from([[0.], [TAU]]);
let half_edge = HalfEdgeGeometry { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = core.layers.topology.surfaces.xz_plane(); let surface = core.layers.topology.surfaces.xz_plane();
let tolerance = 1.; let tolerance = 1.;

11
crates/fj-core/src/geometry/geometry.rs
View File

@ -7,11 +7,11 @@ use crate::{
topology::{HalfEdge, Surface, Topology}, topology::{HalfEdge, Surface, Topology},
}; };
use super::{GlobalPath, HalfEdgeGeometry, SurfaceGeometry}; use super::{GlobalPath, HalfEdgeGeom, SurfaceGeometry};
/// Geometric data that is associated with topological objects /// Geometric data that is associated with topological objects
pub struct Geometry { pub struct Geometry {
half_edge: BTreeMap<Handle<HalfEdge>, HalfEdgeGeometry>, half_edge: BTreeMap<Handle<HalfEdge>, HalfEdgeGeom>,
surface: BTreeMap<Handle<Surface>, SurfaceGeometry>, surface: BTreeMap<Handle<Surface>, SurfaceGeometry>,
xy_plane: Handle<Surface>, xy_plane: Handle<Surface>,
@ -59,7 +59,7 @@ impl Geometry {
pub(crate) fn define_half_edge_inner( pub(crate) fn define_half_edge_inner(
&mut self, &mut self,
half_edge: Handle<HalfEdge>, half_edge: Handle<HalfEdge>,
geometry: HalfEdgeGeometry, geometry: HalfEdgeGeom,
) { ) {
self.half_edge.insert(half_edge, geometry); self.half_edge.insert(half_edge, geometry);
} }
@ -77,10 +77,7 @@ impl Geometry {
/// ## Panics /// ## Panics
/// ///
/// Panics, if the geometry of the half-edge is not defined. /// Panics, if the geometry of the half-edge is not defined.
pub fn of_half_edge( pub fn of_half_edge(&self, half_edge: &Handle<HalfEdge>) -> &HalfEdgeGeom {
&self,
half_edge: &Handle<HalfEdge>,
) -> &HalfEdgeGeometry {
self.half_edge self.half_edge
.get(half_edge) .get(half_edge)
.expect("Expected geometry of half-edge to be defined") .expect("Expected geometry of half-edge to be defined")

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

@ -4,7 +4,7 @@ use super::{CurveBoundary, SurfacePath};
/// The geometry of a half-edge /// The geometry of a half-edge
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct HalfEdgeGeometry { pub struct HalfEdgeGeom {
/// # The path of the half-edge /// # The path of the half-edge
/// ///
/// ## Implementation Note /// ## Implementation Note
@ -36,7 +36,7 @@ pub struct HalfEdgeGeometry {
pub boundary: CurveBoundary<Point<1>>, pub boundary: CurveBoundary<Point<1>>,
} }
impl HalfEdgeGeometry { impl HalfEdgeGeom {
/// Update the boundary /// Update the boundary
pub fn with_boundary( pub fn with_boundary(
mut self, mut self,

2
crates/fj-core/src/geometry/mod.rs
View File

@ -9,7 +9,7 @@ mod surface;
pub use self::{ pub use self::{
boundary::{CurveBoundary, CurveBoundaryElement}, boundary::{CurveBoundary, CurveBoundaryElement},
geometry::Geometry, geometry::Geometry,
half_edge::HalfEdgeGeometry, half_edge::HalfEdgeGeom,
path::{GlobalPath, SurfacePath}, path::{GlobalPath, SurfacePath},
surface::SurfaceGeometry, surface::SurfaceGeometry,
}; };

6
crates/fj-core/src/layers/geometry.rs
View File

@ -1,7 +1,7 @@
//! Layer infrastructure for [`Geometry`] //! Layer infrastructure for [`Geometry`]
use crate::{ use crate::{
geometry::{Geometry, HalfEdgeGeometry, SurfaceGeometry}, geometry::{Geometry, HalfEdgeGeom, SurfaceGeometry},
storage::Handle, storage::Handle,
topology::{HalfEdge, Surface}, topology::{HalfEdge, Surface},
}; };
@ -13,7 +13,7 @@ impl Layer<Geometry> {
pub fn define_half_edge( pub fn define_half_edge(
&mut self, &mut self,
half_edge: Handle<HalfEdge>, half_edge: Handle<HalfEdge>,
geometry: HalfEdgeGeometry, geometry: HalfEdgeGeom,
) { ) {
let mut events = Vec::new(); let mut events = Vec::new();
self.process( self.process(
@ -39,7 +39,7 @@ impl Layer<Geometry> {
/// Define the geometry of a half-edge /// Define the geometry of a half-edge
pub struct DefineHalfEdge { pub struct DefineHalfEdge {
half_edge: Handle<HalfEdge>, half_edge: Handle<HalfEdge>,
geometry: HalfEdgeGeometry, geometry: HalfEdgeGeom,
} }
impl Command<Geometry> for DefineHalfEdge { impl Command<Geometry> for DefineHalfEdge {

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

@ -2,7 +2,7 @@ use fj_interop::ext::ArrayExt;
use fj_math::{Arc, Point, Scalar}; use fj_math::{Arc, Point, Scalar};
use crate::{ use crate::{
geometry::{HalfEdgeGeometry, SurfacePath}, geometry::{HalfEdgeGeom, SurfacePath},
operations::{geometry::UpdateHalfEdgeGeometry, insert::Insert}, operations::{geometry::UpdateHalfEdgeGeometry, insert::Insert},
storage::Handle, storage::Handle,
topology::{Curve, HalfEdge, Vertex}, topology::{Curve, HalfEdge, Vertex},
@ -63,7 +63,7 @@ pub trait BuildHalfEdge {
let half_edge = HalfEdge::unjoined(core).insert(core); let half_edge = HalfEdge::unjoined(core).insert(core);
core.layers.geometry.define_half_edge( core.layers.geometry.define_half_edge(
half_edge.clone(), half_edge.clone(),
HalfEdgeGeometry { HalfEdgeGeom {
path, path,
boundary: boundary.into(), boundary: boundary.into(),
}, },
@ -85,7 +85,7 @@ pub trait BuildHalfEdge {
let half_edge = HalfEdge::unjoined(core).insert(core); let half_edge = HalfEdge::unjoined(core).insert(core);
core.layers.geometry.define_half_edge( core.layers.geometry.define_half_edge(
half_edge.clone(), half_edge.clone(),
HalfEdgeGeometry { HalfEdgeGeom {
path, path,
boundary: boundary.into(), boundary: boundary.into(),
}, },
@ -107,7 +107,7 @@ pub trait BuildHalfEdge {
); );
HalfEdge::unjoined(core).insert(core).set_geometry( HalfEdge::unjoined(core).insert(core).set_geometry(
HalfEdgeGeometry { HalfEdgeGeom {
path, path,
boundary: boundary.into(), boundary: boundary.into(),
}, },

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

@ -1,5 +1,5 @@
use crate::{ use crate::{
geometry::{Geometry, HalfEdgeGeometry}, geometry::{Geometry, HalfEdgeGeom},
layers::Layer, layers::Layer,
storage::Handle, storage::Handle,
topology::HalfEdge, topology::HalfEdge,
@ -10,7 +10,7 @@ pub trait UpdateHalfEdgeGeometry {
/// Set the path of the half-edge /// Set the path of the half-edge
fn set_geometry( fn set_geometry(
self, self,
geometry: HalfEdgeGeometry, geometry: HalfEdgeGeom,
layer: &mut Layer<Geometry>, layer: &mut Layer<Geometry>,
) -> Self; ) -> Self;
} }
@ -18,7 +18,7 @@ pub trait UpdateHalfEdgeGeometry {
impl UpdateHalfEdgeGeometry for Handle<HalfEdge> { impl UpdateHalfEdgeGeometry for Handle<HalfEdge> {
fn set_geometry( fn set_geometry(
self, self,
geometry: HalfEdgeGeometry, geometry: HalfEdgeGeom,
layer: &mut Layer<Geometry>, layer: &mut Layer<Geometry>,
) -> Self { ) -> Self {
layer.define_half_edge(self.clone(), geometry); layer.define_half_edge(self.clone(), geometry);

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

@ -3,7 +3,7 @@ use std::ops::RangeInclusive;
use itertools::Itertools; use itertools::Itertools;
use crate::{ use crate::{
geometry::HalfEdgeGeometry, geometry::HalfEdgeGeom,
operations::{ operations::{
build::BuildHalfEdge, build::BuildHalfEdge,
geometry::UpdateHalfEdgeGeometry, geometry::UpdateHalfEdgeGeometry,
@ -21,7 +21,7 @@ pub trait JoinCycle {
#[must_use] #[must_use]
fn add_joined_edges<Es>(&self, edges: Es, core: &mut Core) -> Self fn add_joined_edges<Es>(&self, edges: Es, core: &mut Core) -> Self
where where
Es: IntoIterator<Item = (Handle<HalfEdge>, HalfEdgeGeometry)>, Es: IntoIterator<Item = (Handle<HalfEdge>, HalfEdgeGeom)>,
Es::IntoIter: Clone + ExactSizeIterator; Es::IntoIter: Clone + ExactSizeIterator;
/// Join the cycle to another /// Join the cycle to another
@ -78,7 +78,7 @@ pub trait JoinCycle {
impl JoinCycle for Cycle { impl JoinCycle for Cycle {
fn add_joined_edges<Es>(&self, edges: Es, core: &mut Core) -> Self fn add_joined_edges<Es>(&self, edges: Es, core: &mut Core) -> Self
where where
Es: IntoIterator<Item = (Handle<HalfEdge>, HalfEdgeGeometry)>, Es: IntoIterator<Item = (Handle<HalfEdge>, HalfEdgeGeom)>,
Es::IntoIter: Clone + ExactSizeIterator, Es::IntoIter: Clone + ExactSizeIterator,
{ {
let half_edges = edges let half_edges = edges