diff --git a/examples/taiwan/voronoi_taiwan.scad b/examples/taiwan/voronoi_taiwan.scad index 3d30106e..7749ec82 100644 --- a/examples/taiwan/voronoi_taiwan.scad +++ b/examples/taiwan/voronoi_taiwan.scad @@ -1,4 +1,4 @@ -use ; +use ; use ; use ; use ; diff --git a/src/experimental/_impl/_tri_delaunay_comm_impl.scad b/src/triangle/_impl/_tri_delaunay_comm_impl.scad similarity index 100% rename from src/experimental/_impl/_tri_delaunay_comm_impl.scad rename to src/triangle/_impl/_tri_delaunay_comm_impl.scad diff --git a/src/experimental/_impl/_tri_delaunay_impl.scad b/src/triangle/_impl/_tri_delaunay_impl.scad similarity index 94% rename from src/experimental/_impl/_tri_delaunay_impl.scad rename to src/triangle/_impl/_tri_delaunay_impl.scad index da0fe25b..618ce50b 100644 --- a/src/experimental/_impl/_tri_delaunay_impl.scad +++ b/src/triangle/_impl/_tri_delaunay_impl.scad @@ -1,13 +1,13 @@ use <_tri_delaunay_comm_impl.scad>; -use ; -use ; -use ; -use ; -use ; -use ; -use ; -use ; -use ; +use <../tri_circumcircle.scad>; +use <../../util/map/hashmap.scad>; +use <../../util/map/hashmap_get.scad>; +use <../../util/map/hashmap_del.scad>; +use <../../util/map/hashmap_keys.scad>; +use <../../util/map/hashmap_put.scad>; +use <../../util/some.scad>; +use <../../util/has.scad>; +use <../../util/find_index.scad>; function cc_center(cc) = cc[0]; function cc_rr(cc) = cc[2]; diff --git a/src/experimental/_impl/_tri_delaunay_voronoi_impl.scad b/src/triangle/_impl/_tri_delaunay_voronoi_impl.scad similarity index 81% rename from src/experimental/_impl/_tri_delaunay_voronoi_impl.scad rename to src/triangle/_impl/_tri_delaunay_voronoi_impl.scad index f598fa67..9b91bb91 100644 --- a/src/experimental/_impl/_tri_delaunay_voronoi_impl.scad +++ b/src/triangle/_impl/_tri_delaunay_voronoi_impl.scad @@ -1,6 +1,6 @@ -use ; -use ; -use ; +use <../tri_delaunay.scad>; +use <../../util/map/hashmap_get.scad>; +use <../../util/find_index.scad>; function indicesOfCell(iTris, triIndices) = let( diff --git a/src/experimental/_impl/_tri_ear_clipping_impl.scad b/src/triangle/_impl/_tri_ear_clipping_impl.scad similarity index 100% rename from src/experimental/_impl/_tri_ear_clipping_impl.scad rename to src/triangle/_impl/_tri_ear_clipping_impl.scad diff --git a/src/experimental/tri_circumcircle.scad b/src/triangle/tri_circumcircle.scad similarity index 100% rename from src/experimental/tri_circumcircle.scad rename to src/triangle/tri_circumcircle.scad diff --git a/src/experimental/tri_delaunay.scad b/src/triangle/tri_delaunay.scad similarity index 100% rename from src/experimental/tri_delaunay.scad rename to src/triangle/tri_delaunay.scad diff --git a/src/experimental/tri_delaunay_indices.scad b/src/triangle/tri_delaunay_indices.scad similarity index 86% rename from src/experimental/tri_delaunay_indices.scad rename to src/triangle/tri_delaunay_indices.scad index d4b0b51d..6845fbad 100644 --- a/src/experimental/tri_delaunay_indices.scad +++ b/src/triangle/tri_delaunay_indices.scad @@ -1,5 +1,5 @@ use <_impl/_tri_delaunay_comm_impl.scad>; -use ; +use <../util/map/hashmap_keys.scad>; function tri_delaunay_indices(d) = [ for(tri = hashmap_keys(delaunay_triangles(d))) diff --git a/src/experimental/tri_delaunay_shapes.scad b/src/triangle/tri_delaunay_shapes.scad similarity index 88% rename from src/experimental/tri_delaunay_shapes.scad rename to src/triangle/tri_delaunay_shapes.scad index b5ee06de..e6dc1eb2 100644 --- a/src/experimental/tri_delaunay_shapes.scad +++ b/src/triangle/tri_delaunay_shapes.scad @@ -1,5 +1,5 @@ use <_impl/_tri_delaunay_comm_impl.scad>; -use ; +use <../util/map/hashmap_keys.scad>; function tri_delaunay_shapes(d) = let(coords = delaunay_coords(d)) diff --git a/src/experimental/tri_delaunay_voronoi.scad b/src/triangle/tri_delaunay_voronoi.scad similarity index 89% rename from src/experimental/tri_delaunay_voronoi.scad rename to src/triangle/tri_delaunay_voronoi.scad index 36a6436b..ec897436 100644 --- a/src/experimental/tri_delaunay_voronoi.scad +++ b/src/triangle/tri_delaunay_voronoi.scad @@ -1,9 +1,9 @@ use <_impl/_tri_delaunay_comm_impl.scad>; use <_impl/_tri_delaunay_voronoi_impl.scad>; -use ; -use ; -use ; -use ; +use <../util/map/hashmap.scad>; +use <../util/map/hashmap_keys.scad>; +use <../util/map/hashmap_get.scad>; +use <../util/reverse.scad>; function tri_delaunay_voronoi(d) = let( diff --git a/src/experimental/tri_ear_clipping.scad b/src/triangle/tri_ear_clipping.scad similarity index 86% rename from src/experimental/tri_ear_clipping.scad rename to src/triangle/tri_ear_clipping.scad index cc0dea56..27ad18cf 100644 --- a/src/experimental/tri_ear_clipping.scad +++ b/src/triangle/tri_ear_clipping.scad @@ -2,7 +2,7 @@ copy from triangulate.scad, would move into triangle category **/ -use ; +use <_impl/_tri_ear_clipping_impl.scad>; // ret: "TRI_SHAPES", "TRI_INDICES" function tri_ear_clipping(shape_pts, ret = "TRI_INDICES", epsilon = 0.0001) =