Adapt to OCADml (v0.5.0) triangular Mesh update

OCADml · Apr 20, 2023 · 76d5525 · 76d5525
1 parent 7dae78e
commit 76d5525
Show file tree

Hide file tree

Showing 39 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## v0.2.2
+
+- adapt to OCADml Mesh breaking change (polygonal -> triangular)
+
 ## v0.2.1
 
 - make odoc manual compatible with odig

diff --git a/dune-project b/dune-project
@@ -36,4 +36,4 @@
   (cairo2
    (>= 0.6.2))
   (OCADml
-   (>= 0.4.0))))
+   (>= 0.5.0))))
diff --git a/examples/pngs/arc_points_2d.png b/examples/pngs/arc_points_2d.png
diff --git a/examples/pngs/arc_points_3d.png b/examples/pngs/arc_points_3d.png
diff --git a/examples/pngs/arc_wedge_2d.png b/examples/pngs/arc_wedge_2d.png
diff --git a/examples/pngs/axial_chalice.png b/examples/pngs/axial_chalice.png
diff --git a/examples/pngs/bezier_spline_path.png b/examples/pngs/bezier_spline_path.png
diff --git a/examples/pngs/cartesian_gravity_well.png b/examples/pngs/cartesian_gravity_well.png
diff --git a/examples/pngs/chamfered_loop.png b/examples/pngs/chamfered_loop.png
diff --git a/examples/pngs/chamfered_square_with_holes.png b/examples/pngs/chamfered_square_with_holes.png
diff --git a/examples/pngs/circular_rounding.png b/examples/pngs/circular_rounding.png
diff --git a/examples/pngs/eased_morph.png b/examples/pngs/eased_morph.png
diff --git a/examples/pngs/elbow.png b/examples/pngs/elbow.png
diff --git a/examples/pngs/helix_extrude.png b/examples/pngs/helix_extrude.png
diff --git a/examples/pngs/helix_path_points.png b/examples/pngs/helix_path_points.png
diff --git a/examples/pngs/incl_eased_morph.png b/examples/pngs/incl_eased_morph.png
diff --git a/examples/pngs/incl_polar_rose.png b/examples/pngs/incl_polar_rose.png
diff --git a/examples/pngs/offset_poly.png b/examples/pngs/offset_poly.png
diff --git a/examples/pngs/polar_rose.png b/examples/pngs/polar_rose.png
diff --git a/examples/pngs/polyholes.png b/examples/pngs/polyholes.png
diff --git a/examples/pngs/resampled_path.png b/examples/pngs/resampled_path.png
diff --git a/examples/pngs/rounded_polyhole_sweep.png b/examples/pngs/rounded_polyhole_sweep.png
diff --git a/examples/pngs/rounded_prism_star.png b/examples/pngs/rounded_prism_star.png
diff --git a/examples/pngs/rounded_prism_tunnel.png b/examples/pngs/rounded_prism_tunnel.png
diff --git a/examples/pngs/rounded_text.png b/examples/pngs/rounded_text.png
diff --git a/examples/pngs/scaling_twister_extrude.png b/examples/pngs/scaling_twister_extrude.png
diff --git a/examples/pngs/spiral.png b/examples/pngs/spiral.png
diff --git a/examples/pngs/spline.png b/examples/pngs/spline.png
diff --git a/examples/pngs/sweep_path_default.png b/examples/pngs/sweep_path_default.png
diff --git a/examples/pngs/sweep_path_euler.png b/examples/pngs/sweep_path_euler.png
diff --git a/examples/pngs/sweep_starburst_default.png b/examples/pngs/sweep_starburst_default.png
diff --git a/examples/pngs/sweep_starburst_euler.png b/examples/pngs/sweep_starburst_euler.png
diff --git a/examples/pngs/tangent_morph_sweep.png b/examples/pngs/tangent_morph_sweep.png
diff --git a/examples/pngs/tangent_skin_test.png b/examples/pngs/tangent_skin_test.png
diff --git a/examples/pngs/test_hull_3d.png b/examples/pngs/test_hull_3d.png
diff --git a/examples/pngs/vaccum_connector.png b/examples/pngs/vaccum_connector.png
diff --git a/examples/pngs/vaccum_connector_points.png b/examples/pngs/vaccum_connector_points.png
diff --git a/examples/pngs/wave_cylinder.png b/examples/pngs/wave_cylinder.png
diff --git a/lib/scad.ml b/lib/scad.ml
@@ -345,7 +345,10 @@ let of_poly2 ?convexity poly =
     in
     polygon ?convexity ~paths:(List.rev paths) (List.rev points)
 
-let of_mesh ?convexity m = polyhedron ?convexity (Mesh.points m) (Mesh.faces m)
+let of_mesh ?convexity m =
+  let faces = List.map (fun (a, b, c) -> [ a; b; c ]) (Mesh.faces m) in
+  polyhedron ?convexity (Mesh.points m) faces
+
 let[@inline] of_poly3 ?convexity t = of_mesh ?convexity @@ Mesh.of_poly3 t
 
 let to_string t =
@@ -425,7 +428,7 @@ let to_string t =
         indent
         (Buffer.contents @@ buf_of_list buf_add_vec2 points)
         ( Option.map (fun ps -> Buffer.contents @@ buf_of_list buf_add_idxs ps) paths
-        |> maybe_fmt ", paths=%s" )
+          |> maybe_fmt ", paths=%s" )
         convexity
     | Text { text; size; font; halign; valign; spacing; direction; language; script; fn }
       ->