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

Rewrite `PartialCycle::build` to be more clear

This commit is contained in:
Hanno Braun 2022-11-05 20:31:51 +01:00
parent e2ddd014b1
commit 3278ae73ad
1 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
crates/fj-kernel/src/partial/objects/cycle.rs
View File

@ -86,51 +86,47 @@ impl PartialCycle {
mut self, mut self,
objects: &Objects, objects: &Objects,
) -> Result<Handle<Cycle>, ValidationError> { ) -> Result<Handle<Cycle>, ValidationError> {
let half_edges = { // To create a cycle, we need to make sure that all its half-edges
let last_vertex = { // connect to each other. Let's start with all the connections between
let last_half_edge = self // the first and the last half-edge.
.half_edges let mut previous_vertex = None;
.last_mut() for half_edge in &mut self.half_edges {
.expect("Can't build cycle without any half-edges"); let back_vertex = previous_vertex.unwrap_or_default();
let front_vertex =
half_edge.front().surface_form().into_full(objects)?;
let surface_vertex = *half_edge = half_edge.clone().merge_with(
last_half_edge.front().surface_form().into_full(objects)?; PartialHalfEdge::default()
.with_back_vertex(
*last_half_edge = last_half_edge.clone().merge_with( PartialVertex::default().with_surface_form(back_vertex),
PartialHalfEdge::default().with_front_vertex( )
.with_front_vertex(
PartialVertex::default() PartialVertex::default()
.with_surface_form(surface_vertex.clone()), .with_surface_form(front_vertex.clone()),
), ),
); );
surface_vertex previous_vertex = Some(MaybePartial::from(front_vertex));
}; }
let (half_edges, _) = self.half_edges.into_iter().fold( // We're not quite done yet. We need to close the cycle, by connecting
Ok((Vec::new(), last_vertex)), // the last half-edge back around to the first one.
|result: Result<_, ValidationError>, half_edge| { if let Some(half_edge) = self.half_edges.first_mut() {
let (mut half_edges, previous_vertex) = result?; let back_vertex = previous_vertex.unwrap_or_default();
let half_edge = half_edge *half_edge = half_edge.clone().merge_with(
.update_partial(|half_edge| { PartialHalfEdge::default().with_back_vertex(
let [back, _] = half_edge.vertices(); PartialVertex::default().with_surface_form(back_vertex),
let back = back.update_partial(|partial| { ),
partial.with_surface_form(previous_vertex) );
}); }
half_edge.with_back_vertex(back) // All connections made! All that's left is to build the half-edges.
}) let mut half_edges = Vec::new();
.into_full(objects)?; for half_edge in self.half_edges {
let half_edge = half_edge.into_full(objects)?;
let front = half_edge.front().surface_form().clone(); half_edges.push(half_edge);
half_edges.push(half_edge); }
Ok((half_edges, front))
},
)?;
half_edges
};
Ok(objects.cycles.insert(Cycle::new(half_edges))?) Ok(objects.cycles.insert(Cycle::new(half_edges))?)
} }