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

Don't duplicate global curves in shell builder #1145

Merged
merged 1 commit into from
Sep 27, 2022
Merged

Don't duplicate global curves in shell builder #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
215 changes: 196 additions & 19 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 @@ -2,7 +2,9 @@ use fj_math::Scalar;

use crate::{
algorithms::transform::TransformObject,
objects::{Face, Shell, Surface},
objects::{
Curve, Cycle, Face, HalfEdge, Shell, Surface, SurfaceVertex, Vertex,
},
stores::Stores,
};

Expand All @@ -20,27 +22,202 @@ impl<'a> ShellBuilder<'a> {
self,
edge_length: impl Into<Scalar>,
) -> Shell {
// Let's define a short-hand for half the edge length. We're going to
// need it a lot.
let h = edge_length.into() / 2.;

let points = [[-h, -h], [h, -h], [h, h], [-h, h]];
let edge_length = edge_length.into();

// Let's define some short-hands. We're going to need them a lot.
const Z: Scalar = Scalar::ZERO;
let planes = [
Surface::xy_plane().translate([Z, Z, -h], self.stores), // bottom
Surface::xy_plane().translate([Z, Z, h], self.stores), // top
Surface::xz_plane().translate([Z, -h, Z], self.stores), // front
Surface::xz_plane().translate([Z, h, Z], self.stores), // back
Surface::yz_plane().translate([-h, Z, Z], self.stores), // left
Surface::yz_plane().translate([h, Z, Z], self.stores), // right
];

let faces = planes.map(|plane| {
Face::builder(self.stores, plane)
.with_exterior_polygon_from_points(points)
let h = edge_length / 2.;

let bottom = {
let surface =
Surface::xy_plane().translate([Z, Z, -h], self.stores);

Face::builder(self.stores, surface)
.with_exterior_polygon_from_points([
[-h, -h],
[h, -h],
[h, h],
[-h, h],
])
.build()
});
};

let (sides, top_edges) = {
let surfaces = bottom
.exterior()
.half_edges()
.map(|half_edge| {
let [a, b] = half_edge
.vertices()
.clone()
.map(|vertex| vertex.global_form().position());
let c = a + [Z, Z, edge_length];

Surface::plane_from_points([a, b, c])
})
.collect::<Vec<_>>();

let bottoms = bottom
.exterior()
.half_edges()
.zip(&surfaces)
.map(|(half_edge, &surface)| {
HalfEdge::partial()
.with_global_form(half_edge.global_form().clone())
.as_line_segment_from_points(
surface,
[[Z, Z], [edge_length, Z]],
)
.build(self.stores)
})
.collect::<Vec<_>>();

let sides_up = bottoms
.clone()
.into_iter()
.zip(&surfaces)
.map(|(bottom, &surface)| {
let [_, from] = bottom.vertices();

let from = *from.surface_form();
let to = SurfaceVertex::partial()
.with_position(from.position() + [Z, edge_length])
.with_surface(surface);

HalfEdge::partial()
.with_vertices([
Vertex::partial().with_surface_form(from),
Vertex::partial().with_surface_form(to),
])
.as_line_segment()
.build(self.stores)
})
.collect::<Vec<_>>();

let sides_down = {
let mut sides_up_prev = sides_up.clone();
sides_up_prev.rotate_right(1);

bottoms
.clone()
.into_iter()
.zip(sides_up_prev)
.zip(&surfaces)
.map(|((bottom, side_up_prev), &surface)| {
let [_, from] = side_up_prev.vertices();
let [to, _] = bottom.vertices();

let to = *to.surface_form();
let from = SurfaceVertex::partial()
.with_position(to.position() + [Z, edge_length])
.with_surface(surface)
.with_global_form(*from.global_form());

let curve = Curve::partial().with_global_form(
side_up_prev.curve().global_form().clone(),
);

HalfEdge::partial()
.with_curve(curve)
.with_vertices([
Vertex::partial().with_surface_form(from),
Vertex::partial().with_surface_form(to),
])
.as_line_segment()
.build(self.stores)
})
.collect::<Vec<_>>()
};

let tops = sides_up
.clone()
.into_iter()
.zip(sides_down.clone())
.zip(&surfaces)
.map(|((side_up, side_down), &surface)| {
let [_, from] = side_up.vertices();
let [to, _] = side_down.vertices();

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

let from = Vertex::partial().with_surface_form(from);
let to = Vertex::partial().with_surface_form(to);

HalfEdge::partial()
.with_vertices([from, to])
.as_line_segment()
.build(self.stores)
})
.collect::<Vec<_>>();

let sides = bottoms
.into_iter()
.zip(sides_up)
.zip(tops.clone())
.zip(sides_down)
.zip(surfaces)
.map(|((((bottom, side_up), top), side_down), surface)| {
let cycle = Cycle::builder(self.stores, surface)
.with_half_edges([bottom, side_up, top, side_down])
.build();

Face::from_exterior(cycle)
});

(sides, tops)
};

let top = {
let surface = Surface::xy_plane().translate([Z, Z, h], self.stores);

let points = [[-h, -h], [-h, h], [h, h], [h, -h], [-h, -h]];

let mut top_edges = top_edges;
top_edges.reverse();

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
// cleaned up, once `array_windows` is stable.
let points = [points[0], points[1]];

// Can be cleaned up, once `zip` is stable:
// 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 = SurfaceVertex::partial()
.with_position(point)
.with_surface(surface)
.with_global_form(*vertex.global_form())
.build(self.stores);
Vertex::partial()
.with_position(vertex.position())
.with_surface_form(surface_form)
},
);

edges.push(
HalfEdge::partial()
.with_vertices(vertices)
.with_global_form(edge.global_form().clone())
.as_line_segment()
.build(self.stores),
);
}

Face::from_exterior(Cycle::new(surface, edges))
};

let mut faces = Vec::new();
faces.push(bottom);
faces.extend(sides);
faces.push(top);

Shell::new().with_faces(faces)
}
Expand Down
4 changes: 2 additions & 2 deletions crates/fj-kernel/src/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ mod tests {
assert_eq!(24, object.curve_iter().count());
assert_eq!(6, object.cycle_iter().count());
assert_eq!(6, object.face_iter().count());
assert_eq!(18, object.global_curve_iter().count());
assert_eq!(12, object.global_curve_iter().count());
assert_eq!(8, object.global_vertex_iter().count());
assert_eq!(24, object.half_edge_iter().count());
assert_eq!(1, object.shell_iter().count());
Expand Down Expand Up @@ -535,7 +535,7 @@ mod tests {
assert_eq!(24, object.curve_iter().count());
assert_eq!(6, object.cycle_iter().count());
assert_eq!(6, object.face_iter().count());
assert_eq!(18, object.global_curve_iter().count());
assert_eq!(12, object.global_curve_iter().count());
assert_eq!(8, object.global_vertex_iter().count());
assert_eq!(24, object.half_edge_iter().count());
assert_eq!(1, object.shell_iter().count());
Expand Down