Merge pull request #102 from timschmidt/main

Pull in Sketch::triangulate()

Author: timschmidt

readme.md

@@ -129,7 +129,7 @@ converted into a `Mesh<S>`.
 - <img src="docs/bspline.png" width="128" alt="top down view of a neer semi-circle shape"/> **`Sketch::bspline(control: &[[Real; 2]], p: usize, segments_per_span: usize, metadata: Option<S>)`**
 - <img src="docs/heart.png" width="128" alt="top down view of a cartune heart"/> **`Sketch::heart(width: Real, height: Real, segments: usize, metadata: Option<S>)`**
 - <img src="docs/crescent.png" width="128"/> **`Sketch::crescent(outer_r: Real, inner_r: Real, offset: Real, segments: usize, metadata: Option<S>)`** - 
-- <img src="docs/gear_involute.png" width="128"/> **`Sketch::involute_gear(module_: Real, teeth: usize, pressure_angle_deg: Real, clearance: Real, backlash: Real, segments_per_flank: usize, metadata: Option<S>)`**
+- <img src="docs/gear_involute.png" width="128"/> **`Sketch::involute_gear(module: Real, teeth: usize, pressure_angle_deg: Real, clearance: Real, backlash: Real, segments_per_flank: usize, metadata: Option<S>)`**
 - **`Sketch::cycloidal_gear(module_: Real, teeth: usize, pin_teeth: usize, clearance: Real, segments_per_flank: usize, metadata: Option<S>)`** - under construction
 - **`Sketch::involute_rack(module_: Real, num_teeth: usize, pressure_angle_deg: Real, clearance: Real, backlash: Real, metadata: Option<S>)`** - under construction
 - **`Sketch::cycloidal_rack(module_: Real, num_teeth: usize, generating_radius: Real, clearance: Real, segments_per_flank: usize, metadata: Option<S>)`** - under construction
@@ -601,6 +601,7 @@ for Polygon
 - rework bezier and bspline using https://github.com/mattatz/curvo
   - import functions from https://github.com/nical/lyon/tree/main/crates/geom/src for cubic and quadratic bezier
 - https://docs.rs/rgeometry/latest/rgeometry/algorithms/polygonization/fn.two_opt_moves.html and other algorithms from rgeometry crate
+- add optional root fillets, dedendum arcs, and backlash/backlash-aware spacing to gears
 
 ## Todo shapes
 - geodesic domes / goldberg polyhedra

src/sketch/mod.rs

@@ -6,8 +6,8 @@ use crate::mesh::Mesh;
 use crate::traits::CSG;
 use geo::algorithm::winding_order::Winding;
 use geo::{
-    AffineOps, AffineTransform, BooleanOps as GeoBooleanOps, BoundingRect, Coord, Geometry,
-    GeometryCollection, LineString, MultiPolygon, Orient, Polygon as GeoPolygon, Rect,
+    AffineOps, AffineTransform, BooleanOps as GeoBooleanOps, BoundingRect, Coord, CoordsIter,
+    Geometry, GeometryCollection, LineString, MultiPolygon, Orient, Polygon as GeoPolygon, Rect,
     orient::Direction,
 };
 use nalgebra::{Matrix4, Point3, partial_max, partial_min};
@@ -68,7 +68,7 @@ impl<S: Clone + Send + Sync + Debug> Sketch<S> {
         new_sketch
     }
 
-    /// Triangulate this polygon into a list of triangles, each triangle is [v0, v1, v2].
+    /// Triangulate an outer polygon and holes into a list of triangles, each triangle is [v0, v1, v2].
     pub fn triangulate_2d(
         outer: &[[Real; 2]],
         holes: &[&[[Real; 2]]],
@@ -135,6 +135,49 @@ impl<S: Clone + Send + Sync + Debug> Sketch<S> {
             result
         }
     }
+    
+    /// Triangulate all polygons in this Sketch.
+    ///
+    /// This function converts all polygons (including those from MultiPolygons) contained
+    /// in the Sketch's geometry into a list of triangles. Each triangle is represented as
+    /// a `[Point3<Real>; 3]`, where the Z-coordinate is 0.0.
+    ///
+    /// # Returns
+    ///
+    /// A `Vec<[Point3<Real>; 3]>` containing all the triangles resulting from the triangulation.
+    pub fn triangulate(&self) -> Vec<[Point3<Real>; 3]> {
+        let mut all_triangles = Vec::new();
+
+        for geom in &self.geometry {
+            match geom {
+                geo::Geometry::Polygon(poly) => {
+                    let outer: Vec<[Real; 2]> = poly.exterior().coords_iter().map(|c| [c.x, c.y]).collect();
+                    let holes: Vec<Vec<[Real; 2]>> = poly.interiors().iter()
+                        .map(|ring| ring.coords_iter().map(|c| [c.x, c.y]).collect())
+                        .collect();
+                    let hole_refs: Vec<&[[Real; 2]]> = holes.iter().map(|v| &v[..]).collect();
+                    let tris = Self::triangulate_2d(&outer, &hole_refs);
+                    all_triangles.extend(tris);
+                },
+                geo::Geometry::MultiPolygon(mp) => {
+                    for poly in &mp.0 {
+                        let outer: Vec<[Real; 2]> = poly.exterior().coords_iter().map(|c| [c.x, c.y]).collect();
+                        let holes: Vec<Vec<[Real; 2]>> = poly.interiors().iter()
+                            .map(|ring| ring.coords_iter().map(|c| [c.x, c.y]).collect())
+                            .collect();
+                        let hole_refs: Vec<&[[Real; 2]]> = holes.iter().map(|v| &v[..]).collect();
+                        let tris = Self::triangulate_2d(&outer, &hole_refs);
+                        all_triangles.extend(tris);
+                    }
+                },
+                // For other geometry types (LineString, Point, etc.), we might choose to ignore them
+                // or handle them differently if needed. Currently, ignoring them.
+                _ => {}
+            }
+        }
+
+        all_triangles
+    }
 
     /// Return a copy of this `Sketch` whose polygons are normalised so that
     /// exterior rings wind counter-clockwise and interior rings clockwise.