From 251c119d76892013843c0da3ad963e6d3be73c4a Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Fri, 19 May 2017 08:22:36 +0800 Subject: [PATCH] refactored --- src/__private__/__angy_angz.scad | 8 ++++++++ src/bezier_smooth.scad | 14 +++----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 src/__private__/__angy_angz.scad diff --git a/src/__private__/__angy_angz.scad b/src/__private__/__angy_angz.scad new file mode 100644 index 00000000..9f3faf4a --- /dev/null +++ b/src/__private__/__angy_angz.scad @@ -0,0 +1,8 @@ +function __angy_angz(p1, p2) = + let( + dx = p2[0] - p1[0], + dy = p2[1] - p1[1], + dz = p2[2] - p1[2], + za = atan2(dy, dx), + ya = atan2(dz, sqrt(pow(dx, 2) + pow(dy, 2))) + ) [ya, za]; \ No newline at end of file diff --git a/src/bezier_smooth.scad b/src/bezier_smooth.scad index 95398999..4d144436 100644 --- a/src/bezier_smooth.scad +++ b/src/bezier_smooth.scad @@ -12,20 +12,12 @@ include <__private__/__to3d.scad>; include <__private__/__to2d.scad>; +include <__private__/__angy_angz.scad>; -function _ya_za(p1, p2) = - let( - dx = p2[0] - p1[0], - dy = p2[1] - p1[1], - dz = p2[2] - p1[2], - za = atan2(dy, dx), - ya = atan2(dz, sqrt(pow(dx, 2) + pow(dy, 2))) - ) [ya, za]; - function _corner_ctrl_pts(round_d, p1, p2, p3) = let( - _ya_za_1 = _ya_za(p1, p2), - _ya_za_2 = _ya_za(p3, p2), + _ya_za_1 = __angy_angz(p1, p2), + _ya_za_2 = __angy_angz(p3, p2), dz1 = sin(_ya_za_1[0]) * round_d, dxy1 = cos(_ya_za_1[0]) * round_d,