From 8475049fad0945e0238b49e64a6456e3d37160cd Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Tue, 1 Mar 2022 13:06:27 +0800 Subject: [PATCH] refactor --- src/triangle/_impl/_tri_delaunay_impl.scad | 5 ++--- src/voronoi/_impl/_convex_ct_clk_order.scad | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/triangle/_impl/_tri_delaunay_impl.scad b/src/triangle/_impl/_tri_delaunay_impl.scad index 3f98ab3b..ec350627 100644 --- a/src/triangle/_impl/_tri_delaunay_impl.scad +++ b/src/triangle/_impl/_tri_delaunay_impl.scad @@ -26,10 +26,9 @@ function _tri_circumcircle(shape_pts) = x = (d1 * v0[1] - d0 * v1[1]) / det, y = (d0 * v1[0] - d1 * v0[0]) / det, center = [x, y], - v = p0 - center, - rr = v[0] ^ 2 + v[1] ^ 2 + v = p0 - center ) - [center, rr]; + [center, v * v]; function cc_center(cc) = cc[0]; function cc_rr(cc) = cc[1]; diff --git a/src/voronoi/_impl/_convex_ct_clk_order.scad b/src/voronoi/_impl/_convex_ct_clk_order.scad index 7ef0fda5..14ef3e3e 100644 --- a/src/voronoi/_impl/_convex_ct_clk_order.scad +++ b/src/voronoi/_impl/_convex_ct_clk_order.scad @@ -4,7 +4,7 @@ use <_convex_centroid.scad>; function _convex_ct_clk_order(points) = let( cpt = _convex_centroid(points), - pts_as = [for(p = points) [p, atan2(p[1] - cpt[1], p[0] - cpt[0])]], + pts_as = [for(p = points) [p, atan2(p.y - cpt.y, p.x - cpt.x)]], sorted = sort(pts_as, by = "idx", idx = 1) ) [for(v = sorted) v[0]]; \ No newline at end of file