rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-02-07 07:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify PartialCycle construction

Browse Source
This commit is contained in:
Hanno Braun 2023-02-20 15:32:16 +01:00
parent bba87e7ccf
commit 1d64b5afbc
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/fj-kernel/src/algorithms/sweep/edge.rs
View File

@ -268,9 +268,7 @@ mod tests {
.clone() .clone()
}; };
let mut cycle = PartialCycle { let mut cycle = PartialCycle::default();
..Default::default()
};
cycle.half_edges.extend( cycle.half_edges.extend(
[bottom, side_up, top, side_down].map(Partial::from_partial), [bottom, side_up, top, side_down].map(Partial::from_partial),
); );

8
crates/fj-kernel/src/validate/cycle.rs
View File

@ -147,9 +147,7 @@ mod tests {
let valid = { let valid = {
let surface = services.objects.surfaces.xy_plane(); let surface = services.objects.surfaces.xy_plane();
let mut cycle = PartialCycle { let mut cycle = PartialCycle::default();
..Default::default()
};
cycle.update_as_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]]); cycle.update_as_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]]);
cycle.infer_vertex_positions_if_necessary(&surface.geometry()); cycle.infer_vertex_positions_if_necessary(&surface.geometry());
cycle.build(&mut services.objects) cycle.build(&mut services.objects)
@ -190,9 +188,7 @@ mod tests {
let valid = { let valid = {
let surface = services.objects.surfaces.xy_plane(); let surface = services.objects.surfaces.xy_plane();
let mut cycle = PartialCycle { let mut cycle = PartialCycle::default();
..Default::default()
};
cycle.update_as_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]]); cycle.update_as_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]]);
cycle.infer_vertex_positions_if_necessary(&surface.geometry()); cycle.infer_vertex_positions_if_necessary(&surface.geometry());
cycle.build(&mut services.objects) cycle.build(&mut services.objects)

4
crates/fj-kernel/src/validate/face.rs
View File

@ -181,9 +181,7 @@ mod tests {
let invalid = { let invalid = {
let surface = services.objects.surfaces.xz_plane(); let surface = services.objects.surfaces.xz_plane();
let mut cycle = PartialCycle { let mut cycle = PartialCycle::default();
..Default::default()
};
cycle.update_as_polygon_from_points([[1., 1.], [1., 2.], [2., 1.]]); cycle.update_as_polygon_from_points([[1., 1.], [1., 2.], [2., 1.]]);
cycle.infer_vertex_positions_if_necessary(&surface.geometry()); cycle.infer_vertex_positions_if_necessary(&surface.geometry());
let cycle = cycle let cycle = cycle

8
crates/fj-operations/src/sketch.rs
View File

@ -36,9 +36,7 @@ impl Shape for fj::Sketch {
Partial::from_partial(half_edge) Partial::from_partial(half_edge)
}; };
let exterior = { let exterior = {
let mut cycle = PartialCycle { let mut cycle = PartialCycle::default();
..Default::default()
};
cycle.half_edges.push(half_edge); cycle.half_edges.push(half_edge);
Partial::from_partial(cycle) Partial::from_partial(cycle)
}; };
@ -58,9 +56,7 @@ impl Shape for fj::Sketch {
); );
let exterior = { let exterior = {
let mut cycle = PartialCycle { let mut cycle = PartialCycle::default();
..Default::default()
};
let mut line_segments = vec![]; let mut line_segments = vec![];
let mut arcs = vec![]; let mut arcs = vec![];
poly_chain.to_segments().into_iter().for_each( poly_chain.to_segments().into_iter().for_each(