openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-01-16 21:58:27 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix for malformed teardrop2d()

Browse Source
This commit is contained in:
Garth Minette 2020-12-31 16:33:09 -08:00
parent b8f655e43c
commit d1fe384f95
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shapes2d.scad
View File

@ -1321,21 +1321,22 @@ module teardrop2d(r, d, ang=45, cap_h, anchor=CENTER, spin=0)
function teardrop2d(r, d, ang=45, cap_h, anchor=CENTER, spin=0) = function teardrop2d(r, d, ang=45, cap_h, anchor=CENTER, spin=0) =
let( let(
r = get_radius(r=r, d=d, dflt=1), r = get_radius(r=r, d=d, dflt=1),
cord = 2 * r * cos(ang), tanpt = polar_to_xy(r, ang),
cord_h = r * sin(ang), tip_y = adj_ang_to_hyp(r, 90-ang),
tip_y = (cord/2)/tan(ang), cap_h = min(default(cap_h,tip_y), tip_y),
cap_h = min((!is_undef(cap_h)? cap_h : tip_y+cord_h), tip_y+cord_h), cap_w = tanpt.y >= cap_h
cap_w = cord * (1 - (cap_h - cord_h)/tip_y), ? hyp_opp_to_adj(r, cap_h)
ang = min(ang,asin(cap_h/r)), : adj_ang_to_opp(tip_y-cap_h, ang),
sa = 180 - ang, ang2 = min(ang,atan2(cap_h,cap_w)),
ea = 360 + ang, sa = 180 - ang2,
ea = 360 + ang2,
steps = segs(r)*(ea-sa)/360, steps = segs(r)*(ea-sa)/360,
step = (ea-sa)/steps, step = (ea-sa)/steps,
path = deduplicate( path = deduplicate(
[ [
[ cap_w/2,cap_h], [ cap_w,cap_h],
for (i=[0:1:steps]) let(a=ea-i*step) r*[cos(a),sin(a)], for (i=[0:1:steps]) let(a=ea-i*step) r*[cos(a),sin(a)],
[-cap_w/2,cap_h] [-cap_w,cap_h]
], closed=true ], closed=true
), ),
maxx_idx = max_index(subindex(path,0)), maxx_idx = max_index(subindex(path,0)),

2
version.scad
View File

@ -8,7 +8,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,499]; BOSL_VERSION = [2,0,500];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions