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

Add PartialHalfEdge::extract_global_curve

Browse Source
This commit is contained in:
Hanno Braun 2022-10-07 14:56:41 +02:00
parent 062cbbbf3b
commit b7d878b9e1
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/fj-kernel/src/partial/objects/edge.rs
View File

@ -30,6 +30,17 @@ pub struct PartialHalfEdge {
} }
impl PartialHalfEdge { impl PartialHalfEdge {
/// Extract the global curve from either the curve or global form
///
/// If a global curve is available through both, the curve is preferred.
pub fn extract_global_curve(&self) -> Option<Handle<GlobalCurve>> {
let global_curve_from_curve = || self.curve.as_ref()?.global_form();
let global_curve_from_global_form =
|| Some(self.global_form.as_ref()?.curve()?.clone());
global_curve_from_curve().or_else(global_curve_from_global_form)
}
/// Update the partial half-edge with the given surface /// Update the partial half-edge with the given surface
pub fn with_surface(mut self, surface: Option<Handle<Surface>>) -> Self { pub fn with_surface(mut self, surface: Option<Handle<Surface>>) -> Self {
if let Some(surface) = surface { if let Some(surface) = surface {
@ -139,16 +150,8 @@ impl PartialHalfEdge {
.expect("Can't infer line segment without surface position") .expect("Can't infer line segment without surface position")
}); });
let global_curve = {
let global_curve_from_curve = || self.curve.as_ref()?.global_form();
let global_curve_from_global_form =
|| Some(self.global_form.as_ref()?.curve()?.clone());
global_curve_from_curve().or_else(global_curve_from_global_form)
};
let curve = Handle::<Curve>::partial() let curve = Handle::<Curve>::partial()
.with_global_form(global_curve) .with_global_form(self.extract_global_curve())
.with_surface(Some(surface)) .with_surface(Some(surface))
.as_line_from_points(points); .as_line_from_points(points);