rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-01-15 21:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix SurfaceVertex duplication in face sweep code

Browse Source
This commit is contained in:
Hanno Braun 2022-10-13 16:31:04 +02:00
parent 7009aa4c36
commit 5d8a5a6a92
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,9 +90,9 @@ impl Sweep for (HalfEdge, Color) {
let top_edge = { let top_edge = {
let bottom_vertices = bottom_edge.vertices(); let bottom_vertices = bottom_edge.vertices();
let global_vertices = side_edges.clone().map(|edge| { let surface_vertices = side_edges.clone().map(|edge| {
let [_, vertex] = edge.vertices(); let [_, vertex] = edge.vertices();
vertex.global_form().clone() vertex.surface_form().clone()
}); });
let points_curve_and_surface = let points_curve_and_surface =
@ -120,30 +120,19 @@ impl Sweep for (HalfEdge, Color) {
let global = GlobalEdge::new( let global = GlobalEdge::new(
curve.global_form().clone(), curve.global_form().clone(),
global_vertices.clone(), surface_vertices
.clone()
.map(|surface_vertex| surface_vertex.global_form().clone()),
); );
let vertices = { let vertices = {
let surface_points = points_curve_and_surface
.map(|(_, point_surface)| point_surface);
// Can be cleaned up, once `zip` is stable: // Can be cleaned up, once `zip` is stable:
// https://doc.rust-lang.org/std/primitive.array.html#method.zip // https://doc.rust-lang.org/std/primitive.array.html#method.zip
let [a_vertex, b_vertex] = bottom_vertices; let [a_vertex, b_vertex] = bottom_vertices;
let [a_surface, b_surface] = surface_points; let [a_surface, b_surface] = surface_vertices;
let [a_global, b_global] = global_vertices; let vertices = [(a_vertex, a_surface), (b_vertex, b_surface)];
let vertices = [
(a_vertex, a_surface, a_global),
(b_vertex, b_surface, b_global),
];
vertices.map(|(vertex, point_surface, global_form)| { vertices.map(|(vertex, surface_form)| {
let surface_form = SurfaceVertex::new(
point_surface,
surface.clone(),
global_form,
objects,
);
Vertex::new(vertex.position(), curve.clone(), surface_form) Vertex::new(vertex.position(), curve.clone(), surface_form)
}) })
}; };