From bc6288f5d2fef3daf1f2082d0a932f3cc03c372c Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Wed, 4 May 2022 15:00:09 +0800 Subject: [PATCH] refactor --- src/__comm__/__half_trapezium.scad | 57 +++++++++++++----------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/src/__comm__/__half_trapezium.scad b/src/__comm__/__half_trapezium.scad index 72b2f9ee..e4b61746 100644 --- a/src/__comm__/__half_trapezium.scad +++ b/src/__comm__/__half_trapezium.scad @@ -1,61 +1,54 @@ use <__frags.scad>; use <__pie_for_rounding.scad>; -function __tr__corner_t_leng_lt_zero(frags, t_sector_angle, l1, l2, h, round_r) = - let(t_height = tan(t_sector_angle) * l1 - round_r / sin(90 - t_sector_angle) - h / 2) +function __tr__corner_t_leng_lt_zero(frags, t_sector_angle, L, h, round_r) = + let(off = [0, tan(t_sector_angle) * L - round_r / sin(90 - t_sector_angle) - h / 2]) [ for(pt = __pie_for_rounding(round_r, 90 - t_sector_angle, 90, frags * t_sector_angle / 180)) - [pt.x, pt.y + t_height] + pt + off ]; function __tr_corner_t_leng_gt_or_eq_zero(frags, t_sector_angle, t_leng, h, round_r) = - let(offset_y = h / 2 - round_r) + let(off = [t_leng, h / 2 - round_r]) [ for(pt = __pie_for_rounding(round_r, 90 - t_sector_angle, 90, frags * t_sector_angle / 360)) - [pt.x + t_leng, pt.y + offset_y] + pt + off ]; -function __tr_corner(frags, b_ang, l1, l2, h, round_r) = - let(t_leng = l2 - round_r * tan(b_ang / 2)) +function __tr_corner(frags, b_ang, L01, h, round_r) = + let(t_leng = L01[1] - round_r * tan(b_ang / 2)) t_leng >= 0 ? __tr_corner_t_leng_gt_or_eq_zero(frags, b_ang, t_leng, h, round_r) : - __tr__corner_t_leng_lt_zero(frags, b_ang, l1, l2, h, round_r); + __tr__corner_t_leng_lt_zero(frags, b_ang, L01[0], h, round_r); -function __tr__corner_b_leng_lt_zero(frags, b_sector_angle, l1, l2, h, round_r) = - let( - reversed = __tr__corner_t_leng_lt_zero(frags, b_sector_angle, l2, l1, h, round_r), - leng = len(reversed) - ) +function __tr__corner_b_leng_lt_zero(frags, b_sector_a, L, h, round_r) = + let(reversed = __tr__corner_t_leng_lt_zero(frags, b_sector_a, L, h, round_r)) [ - for(i = [0:leng - 1]) - let(pt = reversed[leng - 1 - i]) - [pt.x, -pt.y] + for(i = len(reversed) - 1; i > -1; i = i - 1) + let(pt = reversed[i]) + [pt.x, -pt.y] ]; -function __br_corner_b_leng_gt_or_eq_zero(frags, b_sector_angle, l1, l2, b_leng, h, round_r) = - let(half_h = h / 2) +function __br_corner_b_leng_gt_or_eq_zero(frags, b_sector_a, b_leng, h, round_r) = + let(off = [b_leng, round_r - h / 2]) [ - for(pt = __pie_for_rounding(round_r, -90, -90 + b_sector_angle, frags * b_sector_angle / 360)) - [pt.x + b_leng, pt.y + round_r - half_h] + for(pt = __pie_for_rounding(round_r, -90, -90 + b_sector_a, frags * b_sector_a / 360)) + pt + off ]; -function __br_corner(frags, b_ang, l1, l2, h, round_r) = - let(b_leng = l1 - round_r / tan(b_ang / 2)) +function __br_corner(frags, b_ang, L01, h, round_r) = + let(b_leng = L01[0] - round_r / tan(b_ang / 2), b_sector_a = 180 - b_ang) b_leng >= 0 ? - __br_corner_b_leng_gt_or_eq_zero(frags, 180 - b_ang, l1, l2, b_leng, h, round_r) : - __tr__corner_b_leng_lt_zero(frags, 180 - b_ang, l1, l2, h, round_r); + __br_corner_b_leng_gt_or_eq_zero(frags, b_sector_a, b_leng, h, round_r) : + __tr__corner_b_leng_lt_zero(frags, b_sector_a, L01[1], h, round_r); function __half_trapezium(length, h, round_r) = let( - is_flt = is_num(length), - l1 = is_flt ? length : length[0], - l2 = is_flt ? length : length[1], + L01 = is_num(length) ? [length, length] : length, frags = __frags(round_r), - b_ang = atan2(h, l1 - l2), - br_corner = __br_corner(frags, b_ang, l1, l2, h, round_r), - tr_corner = __tr_corner(frags, b_ang, l1, l2, h, round_r) + b_ang = atan2(h, L01[0] - L01[1]) ) concat( - br_corner, - tr_corner + __br_corner(frags, b_ang, L01, h, round_r), + __tr_corner(frags, b_ang, L01, h, round_r) ); \ No newline at end of file