From 5ba4a37089d7f5ef74bdb5f9c7cae5c4597fc2b7 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Sat, 17 Apr 2021 18:04:04 +0800 Subject: [PATCH] refactor --- src/experimental/_impl/_tri_delaunay_comm_impl.scad | 3 +++ src/experimental/_impl/_tri_delaunay_impl.scad | 5 +---- src/experimental/_impl/_tri_delaunay_voronoi_impl.scad | 4 ---- src/experimental/tri_delaunay_voronoi.scad | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 src/experimental/_impl/_tri_delaunay_comm_impl.scad diff --git a/src/experimental/_impl/_tri_delaunay_comm_impl.scad b/src/experimental/_impl/_tri_delaunay_comm_impl.scad new file mode 100644 index 00000000..38b0831e --- /dev/null +++ b/src/experimental/_impl/_tri_delaunay_comm_impl.scad @@ -0,0 +1,3 @@ +function delaunay_coords(d) = d[0]; +function delaunay_triangles(d) = d[1]; +function delaunay_circles(d) = d[2]; \ No newline at end of file diff --git a/src/experimental/_impl/_tri_delaunay_impl.scad b/src/experimental/_impl/_tri_delaunay_impl.scad index abfb4bde..c7ef7029 100644 --- a/src/experimental/_impl/_tri_delaunay_impl.scad +++ b/src/experimental/_impl/_tri_delaunay_impl.scad @@ -1,3 +1,4 @@ +use <_tri_delaunay_comm_impl.scad>; use ; use ; use ; @@ -35,10 +36,6 @@ function delaunay_init(center, width, height) = ) ) [coords, triangles, circles]; - -function delaunay_coords(d) = d[0]; -function delaunay_triangles(d) = d[1]; -function delaunay_circles(d) = d[2]; function delaunay_addpoint(d, p) = let( diff --git a/src/experimental/_impl/_tri_delaunay_voronoi_impl.scad b/src/experimental/_impl/_tri_delaunay_voronoi_impl.scad index 799ccf88..f598fa67 100644 --- a/src/experimental/_impl/_tri_delaunay_voronoi_impl.scad +++ b/src/experimental/_impl/_tri_delaunay_voronoi_impl.scad @@ -2,10 +2,6 @@ use ; use ; use ; -function delaunay_coords(d) = d[0]; -function delaunay_triangles(d) = d[1]; -function delaunay_circles(d) = d[2]; - function indicesOfCell(iTris, triIndices) = let( vi = iTris[0][0], diff --git a/src/experimental/tri_delaunay_voronoi.scad b/src/experimental/tri_delaunay_voronoi.scad index 90046c68..6a12d719 100644 --- a/src/experimental/tri_delaunay_voronoi.scad +++ b/src/experimental/tri_delaunay_voronoi.scad @@ -1,4 +1,5 @@ -use ; +use <_impl/_tri_delaunay_comm_impl.scad>; +use <_impl/_tri_delaunay_voronoi_impl.scad>; use ; use ; use ;