From fc64bd31c78aa00eb2492e809bb8de7d04dbbfbf Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Fri, 16 Apr 2021 14:24:11 +0800 Subject: [PATCH] update ret --- src/experimental/demo/tri_delaunay_demo.scad | 2 +- src/experimental/tri_delaunay.scad | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/experimental/demo/tri_delaunay_demo.scad b/src/experimental/demo/tri_delaunay_demo.scad index 45baf7c7..826af429 100644 --- a/src/experimental/demo/tri_delaunay_demo.scad +++ b/src/experimental/demo/tri_delaunay_demo.scad @@ -10,7 +10,7 @@ module drawTris(pointsOfTriangles) { } } -drawTris2(points, tri_delaunay(points, ret = "INDICES")); +drawTris2(points, tri_delaunay(points, ret = "TRI_INDICES")); module drawTris2(points, indices) { pointsOfTriangles = [for(i = indices) [points[i[0]], points[i[1]], points[i[2]]]]; %for(t = pointsOfTriangles) { diff --git a/src/experimental/tri_delaunay.scad b/src/experimental/tri_delaunay.scad index ea1823df..f92dd818 100644 --- a/src/experimental/tri_delaunay.scad +++ b/src/experimental/tri_delaunay.scad @@ -1,8 +1,9 @@ use; -// ret: "SHAPES", "INDICES", "DELAUNAY" -function tri_delaunay(points, ret = "SHAPES") = +// ret: "TRI_SHAPES", "TRI_INDICES", "DELAUNAY" +// todo: "VORONOI_SHAPES" +function tri_delaunay(points, ret = "TRI_SHAPES") = let(d = _tri_delaunay(delaunay_init(points), points, len(points))) - ret == "SHAPES" ? tri_delaunay_shapes(d) : - ret == "INDICES" ? tri_delaunay_indices(d) : + ret == "TRI_SHAPES" ? tri_delaunay_shapes(d) : + ret == "TRI_INDICES" ? tri_delaunay_indices(d) : d; // [coords(list), triangles(hashmap), circles(hashmap)] \ No newline at end of file