rei-mirrors
/
Fornjot
mirror of https://github.com/hannobraun/Fornjot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify `PartialHalfEdge::with_curve`

This commit is contained in:
Hanno Braun 2022-11-05 21:46:40 +01:00
parent 076400632c
commit 421e03efda
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/fj-kernel/src/algorithms/transform/edge.rs
View File

@ -36,7 +36,7 @@ impl TransformObject for PartialHalfEdge {
.into(); .into();
Ok(Self::default() Ok(Self::default()
.with_curve(Some(curve)) .with_curve(curve)
.with_vertices(Some(vertices)) .with_vertices(Some(vertices))
.with_global_form(global_form)) .with_global_form(global_form))
} }

2
crates/fj-kernel/src/builder/cycle.rs
View File

@ -81,7 +81,7 @@ impl CycleBuilder for PartialCycle {
half_edges.push( half_edges.push(
HalfEdge::partial() HalfEdge::partial()
.with_curve(Some(curve)) .with_curve(curve)
.with_vertices(Some([from, to])), .with_vertices(Some([from, to])),
); );

7
crates/fj-kernel/src/builder/edge.rs
View File

@ -79,9 +79,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
.with_surface_form(surface_vertex.clone()) .with_surface_form(surface_vertex.clone())
}); });
Ok(self Ok(self.with_curve(curve).with_vertices(Some([back, front])))
.with_curve(Some(curve))
.with_vertices(Some([back, front])))
} }
fn update_as_line_segment_from_points( fn update_as_line_segment_from_points(
@ -181,8 +179,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
}) })
}; };
self.with_curve(Some(curve)) self.with_curve(curve).with_vertices(Some([back, front]))
.with_vertices(Some([back, front]))
} }
} }

2
crates/fj-kernel/src/builder/shell.rs
View File

@ -148,7 +148,7 @@ impl<'a> ShellBuilder<'a> {
)); ));
HalfEdge::partial() HalfEdge::partial()
.with_curve(Some(curve)) .with_curve(curve)
.with_vertices(Some([ .with_vertices(Some([
Vertex::partial().with_surface_form(from), Vertex::partial().with_surface_form(from),
Vertex::partial().with_surface_form(to), Vertex::partial().with_surface_form(to),

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

@ -67,13 +67,9 @@ impl PartialHalfEdge {
} }
/// Update the partial half-edge with the given curve /// Update the partial half-edge with the given curve
pub fn with_curve( pub fn with_curve(mut self, curve: impl Into<MaybePartial<Curve>>) -> Self {
mut self,
curve: Option<impl Into<MaybePartial<Curve>>>,
) -> Self {
if let Some(curve) = curve {
self.curve = curve.into(); self.curve = curve.into();
}
self self
} }