Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more SurfaceVertex duplication issues #1218

Merged
merged 3 commits into from
Oct 13, 2022
Merged

Fix more SurfaceVertex duplication issues #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68850d8
Fix `SurfaceVertex` duplication in `ShellBuilder`
hannobraun Oct 13, 2022
7009aa4
Fix `SurfaceVertex` duplication in `ShellBuilder`
hannobraun Oct 13, 2022
5d8a5a6
Fix `SurfaceVertex` duplication in face sweep code
hannobraun Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions crates/fj-kernel/src/algorithms/sweep/edge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ impl Sweep for (HalfEdge, Color) {
let top_edge = {
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();
vertex.global_form().clone()
vertex.surface_form().clone()
});

let points_curve_and_surface =
Expand Down Expand Up @@ -120,30 +120,19 @@ impl Sweep for (HalfEdge, Color) {

let global = GlobalEdge::new(
curve.global_form().clone(),
global_vertices.clone(),
surface_vertices
.clone()
.map(|surface_vertex| surface_vertex.global_form().clone()),
);

let vertices = {
let surface_points = points_curve_and_surface
.map(|(_, point_surface)| point_surface);

// Can be cleaned up, once `zip` is stable:
// https://doc.rust-lang.org/std/primitive.array.html#method.zip
let [a_vertex, b_vertex] = bottom_vertices;
let [a_surface, b_surface] = surface_points;
let [a_global, b_global] = global_vertices;
let vertices = [
(a_vertex, a_surface, a_global),
(b_vertex, b_surface, b_global),
];

vertices.map(|(vertex, point_surface, global_form)| {
let surface_form = SurfaceVertex::new(
point_surface,
surface.clone(),
global_form,
objects,
);
let [a_surface, b_surface] = surface_vertices;
let vertices = [(a_vertex, a_surface), (b_vertex, b_surface)];

vertices.map(|(vertex, surface_form)| {
Vertex::new(vertex.position(), curve.clone(), surface_form)
})
};
Expand Down
36 changes: 19 additions & 17 deletions crates/fj-kernel/src/builder/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,12 @@ impl<'a> ShellBuilder<'a> {
.clone()
.into_iter()
.zip(sides_down.clone())
.zip(&surfaces)
.map(|((side_up, side_down), surface)| {
.map(|(side_up, side_down)| {
let [_, from] = side_up.vertices();
let [to, _] = side_down.vertices();

let from = from.surface_form().clone();
let to = Handle::<SurfaceVertex>::partial()
.with_position(Some(
from.position() + [-edge_length, Z],
))
.with_surface(Some(surface.clone()))
.with_global_form(Some(to.global_form().clone()));
let to = to.surface_form().clone();

let from = Vertex::partial().with_surface_form(Some(from));
let to = Vertex::partial().with_surface_form(Some(to));
Expand Down Expand Up @@ -194,6 +188,8 @@ impl<'a> ShellBuilder<'a> {
let mut top_edges = top_edges;
top_edges.reverse();

let mut vertex_prev = None;

let mut edges = Vec::new();
for (points, edge) in points.windows(2).zip(top_edges) {
// This can't panic, as we passed `2` to `windows`. Can be
Expand All @@ -204,20 +200,26 @@ impl<'a> ShellBuilder<'a> {
// https://doc.rust-lang.org/std/primitive.array.html#method.zip
let [point_a, point_b] = points;
let [vertex_a, vertex_b] = edge.vertices().clone();
let vertices = [(point_a, vertex_a), (point_b, vertex_b)].map(
|(point, vertex)| {
let surface_form = Handle::<SurfaceVertex>::partial()
let vertices = [
(point_a, vertex_a, vertex_prev.clone()),
(point_b, vertex_b, None),
]
.map(|(point, vertex, surface_form)| {
let surface_form = surface_form.unwrap_or_else(|| {
Handle::<SurfaceVertex>::partial()
.with_position(Some(point))
.with_surface(Some(surface.clone()))
.with_global_form(Some(
vertex.global_form().clone(),
))
.build(self.objects);
Vertex::partial()
.with_position(Some(vertex.position()))
.with_surface_form(Some(surface_form))
},
);
.build(self.objects)
});
vertex_prev = Some(surface_form.clone());

Vertex::partial()
.with_position(Some(vertex.position()))
.with_surface_form(Some(surface_form))
});

edges.push(
HalfEdge::partial()
Expand Down