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

Clean global curve extraction in as_line_segment

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

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

@ -116,26 +116,6 @@ impl PartialHalfEdge {
/// Update partial half-edge as a line segment, reusing existing vertices /// Update partial half-edge as a line segment, reusing existing vertices
pub fn as_line_segment(mut self) -> Self { pub fn as_line_segment(mut self) -> Self {
fn extract_global_curve(
partial: &PartialHalfEdge,
) -> Option<HandleWrapper<GlobalCurve>> {
fn extract_global_curve_from_curve(
partial: &PartialHalfEdge,
) -> Option<Handle<GlobalCurve>> {
partial.curve.as_ref()?.global_form()
}
fn extract_global_curve_from_global_form(
partial: &PartialHalfEdge,
) -> Option<Handle<GlobalCurve>> {
Some(partial.global_form.as_ref()?.curve()?.clone())
}
extract_global_curve_from_curve(partial)
.or_else(|| extract_global_curve_from_global_form(partial))
.map(Into::into)
}
let [from, to] = self let [from, to] = self
.vertices .vertices
.clone() .clone()
@ -159,8 +139,16 @@ 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(extract_global_curve(&self)) .with_global_form(global_curve)
.with_surface(Some(surface)) .with_surface(Some(surface))
.as_line_from_points(points); .as_line_from_points(points);