diff --git a/examples/voronoi/voronoi_sphere.scad b/examples/voronoi/voronoi_sphere.scad index 36ac057c..36e1e6d4 100644 --- a/examples/voronoi/voronoi_sphere.scad +++ b/examples/voronoi/voronoi_sphere.scad @@ -2,7 +2,7 @@ use ; use ; use ; use ; -use ; +use ; use ; n = 60; @@ -23,7 +23,7 @@ module voronoi_sphere(pts, region_hollow, region_offset, region_height) { for(i = [0:len(cells) - 1]) { cell = cells[i]; - cell_cp = convex_center_p(cell); + cell_cp = convex_centroid(cell); cell_inner = [ for(p = cell) let( @@ -44,7 +44,7 @@ module voronoi_sphere(pts, region_hollow, region_offset, region_height) { ]; if(region_hollow) { - cell2_cp = convex_center_p(cell2); + cell2_cp = convex_centroid(cell2); cell2_inner = [ for(p = cell2) let( diff --git a/src/experimental/convex_center_p.scad b/src/experimental/convex_center_p.scad deleted file mode 100644 index 27c36689..00000000 --- a/src/experimental/convex_center_p.scad +++ /dev/null @@ -1,3 +0,0 @@ -use ; - -function convex_center_p(points) = sum(points) / len(points); \ No newline at end of file diff --git a/src/experimental/convex_centroid.scad b/src/experimental/convex_centroid.scad new file mode 100644 index 00000000..f51e782b --- /dev/null +++ b/src/experimental/convex_centroid.scad @@ -0,0 +1,3 @@ +use ; + +function convex_centroid(points) = sum(points) / len(points); \ No newline at end of file diff --git a/src/experimental/convex_ct_clk_order.scad b/src/experimental/convex_ct_clk_order.scad index f9b7c11a..d7b24489 100644 --- a/src/experimental/convex_ct_clk_order.scad +++ b/src/experimental/convex_ct_clk_order.scad @@ -1,9 +1,9 @@ use ; -use ; +use ; function convex_ct_clk_order(points) = let( - cpt = convex_center_p(points), + cpt = convex_centroid(points), pts_as = [for(p = points) [p, atan2(p[1] - cpt[1], p[0] - cpt[0])]], sorted = sort(pts_as, by = "idx", idx = 1) ) diff --git a/src/experimental/tri_bisectors.scad b/src/experimental/tri_bisectors.scad index 36e48a5a..9a2b2de5 100644 --- a/src/experimental/tri_bisectors.scad +++ b/src/experimental/tri_bisectors.scad @@ -1,8 +1,8 @@ -use ; +use ; function tri_bisectors(points) = let( - orthocentre = convex_center_p(points), + orthocentre = convex_centroid(points), m1 = (points[0] + points[1]) / 2, m2 = (points[1] + points[2]) / 2, m3 = (points[2] + points[0]) / 2 diff --git a/src/voronoi/_impl/_convex_center_p.scad b/src/voronoi/_impl/_convex_center_p.scad deleted file mode 100644 index 62c7c3a2..00000000 --- a/src/voronoi/_impl/_convex_center_p.scad +++ /dev/null @@ -1,3 +0,0 @@ -use <../../util/sum.scad>; - -function _convex_center_p(points) = sum(points) / len(points); \ No newline at end of file diff --git a/src/voronoi/_impl/_convex_centroid.scad b/src/voronoi/_impl/_convex_centroid.scad new file mode 100644 index 00000000..bab41acc --- /dev/null +++ b/src/voronoi/_impl/_convex_centroid.scad @@ -0,0 +1,3 @@ +use <../../util/sum.scad>; + +function _convex_centroid(points) = sum(points) / len(points); \ No newline at end of file diff --git a/src/voronoi/_impl/_convex_ct_clk_order.scad b/src/voronoi/_impl/_convex_ct_clk_order.scad index 481a6c9a..7ef0fda5 100644 --- a/src/voronoi/_impl/_convex_ct_clk_order.scad +++ b/src/voronoi/_impl/_convex_ct_clk_order.scad @@ -1,9 +1,9 @@ use <../../util/sort.scad>; -use <_convex_center_p.scad>; +use <_convex_centroid.scad>; function _convex_ct_clk_order(points) = let( - cpt = _convex_center_p(points), + cpt = _convex_centroid(points), pts_as = [for(p = points) [p, atan2(p[1] - cpt[1], p[0] - cpt[0])]], sorted = sort(pts_as, by = "idx", idx = 1) )