Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 17 additions & 9 deletions src/mesh/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,21 @@ impl<S: Clone + Send + Sync + Debug> CSG for Mesh<S> {
impl<S: Clone + Send + Sync + Debug> From<Sketch<S>> for Mesh<S> {
/// Convert a Sketch into a Mesh.
fn from(sketch: Sketch<S>) -> Self {
/// Helper function to convert a geo::LineString to a Vec<crate::vertex::Vertex>
fn geo_line_string_to_vertices(
line_string: &geo::LineString,
) -> Vec<Vertex> {
let mut vertices: Vec<_> = line_string
.coords_iter()
.map(|c| Vertex::new(Point3::new(c.x, c.y, 0.0), Vector3::z()))
.collect();
// LineString can closed, which means first and last Coords are the same
// but crate::mesh::polygon::Polygon expects can't have conflicting edges so we need to remove last Vertex
if vertices.first() == vertices.last() {
vertices.pop();
}
vertices
}
/// Helper function to convert a geo::Polygon to a Vec<crate::mesh::polygon::Polygon>
fn geo_poly_to_csg_polys<S: Clone + Debug + Send + Sync>(
poly2d: &GeoPolygon<Real>,
Expand All @@ -805,22 +820,15 @@ impl<S: Clone + Send + Sync + Debug> From<Sketch<S>> for Mesh<S> {
let mut all_polygons = Vec::new();

// Handle the exterior ring
let outer_vertices_3d: Vec<_> = poly2d
.exterior()
.coords_iter()
.map(|c| Vertex::new(Point3::new(c.x, c.y, 0.0), Vector3::z()))
.collect();
let outer_vertices_3d = geo_line_string_to_vertices(poly2d.exterior());

if outer_vertices_3d.len() >= 3 {
all_polygons.push(Polygon::new(outer_vertices_3d, metadata.clone()));
}

// Handle interior rings (holes)
for ring in poly2d.interiors() {
let hole_vertices_3d: Vec<_> = ring
.coords_iter()
.map(|c| Vertex::new(Point3::new(c.x, c.y, 0.0), Vector3::z()))
.collect();
let hole_vertices_3d = geo_line_string_to_vertices(ring);
if hole_vertices_3d.len() >= 3 {
all_polygons.push(Polygon::new(hole_vertices_3d, metadata.clone()));
}
Expand Down
Loading