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

Remove redundant function argument

This commit is contained in:
Hanno Braun 2022-06-28 15:45:36 +02:00
parent f6cec1f5f6
commit c437a02ac8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/fj-operations/src/difference_2d.rs
View File

@ -48,11 +48,11 @@ impl ToShape for fj::Difference2d {
); );
for cycle in face.exteriors.as_local_form().cloned() { for cycle in face.exteriors.as_local_form().cloned() {
let cycle = add_cycle(cycle, &mut difference, false); let cycle = add_cycle(cycle, false);
exteriors.push(cycle); exteriors.push(cycle);
} }
for cycle in face.interiors.as_local_form().cloned() { for cycle in face.interiors.as_local_form().cloned() {
let cycle = add_cycle(cycle, &mut difference, true); let cycle = add_cycle(cycle, true);
interiors.push(cycle); interiors.push(cycle);
} }
} }
@ -67,7 +67,7 @@ impl ToShape for fj::Difference2d {
); );
for cycle in face.exteriors.as_local_form().cloned() { for cycle in face.exteriors.as_local_form().cloned() {
let cycle = add_cycle(cycle, &mut difference, true); let cycle = add_cycle(cycle, true);
interiors.push(cycle); interiors.push(cycle);
} }
} }
@ -95,9 +95,10 @@ impl ToShape for fj::Difference2d {
fn add_cycle( fn add_cycle(
cycle: LocalForm<Cycle<2>, Cycle<3>>, cycle: LocalForm<Cycle<2>, Cycle<3>>,
shape: &mut Shape,
reverse: bool, reverse: bool,
) -> LocalForm<Cycle<2>, Cycle<3>> { ) -> LocalForm<Cycle<2>, Cycle<3>> {
let mut tmp = Shape::new();
let mut edges = Vec::new(); let mut edges = Vec::new();
for edge in cycle.local().edges.clone() { for edge in cycle.local().edges.clone() {
let curve_local = *edge.local().curve.local(); let curve_local = *edge.local().curve.local();
@ -113,7 +114,7 @@ fn add_cycle(
} else { } else {
curve_canonical curve_canonical
}; };
let curve_canonical = shape.insert(curve_canonical); let curve_canonical = tmp.insert(curve_canonical);
let vertices = if reverse { let vertices = if reverse {
edge.local().vertices.clone().reverse() edge.local().vertices.clone().reverse()
@ -125,7 +126,7 @@ fn add_cycle(
curve: LocalForm::new(curve_local, curve_canonical.clone()), curve: LocalForm::new(curve_local, curve_canonical.clone()),
vertices: vertices.clone(), vertices: vertices.clone(),
}; };
let edge_canonical = shape.merge(Edge { let edge_canonical = tmp.merge(Edge {
curve: LocalForm::canonical_only(curve_canonical), curve: LocalForm::canonical_only(curve_canonical),
vertices, vertices,
}); });
@ -140,8 +141,8 @@ fn add_cycle(
let cycle_local = Cycle { let cycle_local = Cycle {
edges: edges.clone(), edges: edges.clone(),
}; };
let cycle_canonical = shape let cycle_canonical =
.insert(Cycle::new(edges.into_iter().map(|edge| edge.canonical()))); tmp.insert(Cycle::new(edges.into_iter().map(|edge| edge.canonical())));
LocalForm::new(cycle_local, cycle_canonical) LocalForm::new(cycle_local, cycle_canonical)
} }