From 86794eeb376540ae8f6d9cc1706d65b8021284b5 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Sun, 21 May 2017 20:46:28 +0800 Subject: [PATCH] refactored --- src/shape_pie.scad | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shape_pie.scad b/src/shape_pie.scad index 19667087..e842e0ae 100644 --- a/src/shape_pie.scad +++ b/src/shape_pie.scad @@ -13,6 +13,7 @@ **/ include <__private__/__frags.scad>; +include <__private__/__ra_to_xy.scad>; function shape_pie(radius, angles) = let( @@ -24,12 +25,12 @@ function shape_pie(radius, angles) = edge_r_begin = leng / cos((m - 0.5) * a_step - angles[0]), edge_r_end = leng / cos((n + 0.5) * a_step - angles[1]), shape_pts = concat( - [[0, 0], edge_r_begin * [cos(angles[0]), sin(angles[0])]], + [[0, 0], __ra_to_xy(edge_r_begin, angles[0])], [ for(i = [m:n]) - let(a = a_step * i) - radius * [cos(a), sin(a)] + let(a = a_step * i) + __ra_to_xy(radius, a) ], - [edge_r_end * [cos(angles[1]), sin(angles[1])]] + [__ra_to_xy(edge_r_end, angles[1])] ) ) shape_pts; \ No newline at end of file