grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-03-04 00:19:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from revarbat/revarbat_dev

Browse source 
Bugfix for malformed teardrop2d()
This commit is contained in:
Revar Desmera 2020-12-31 16:36:27 -08:00 committed by GitHub
commit 2726227ddd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions

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) =
let(
r = get_radius(r=r, d=d, dflt=1),
cord = 2 * r * cos(ang),
cord_h = r * sin(ang),
tip_y = (cord/2)/tan(ang),
cap_h = min((!is_undef(cap_h)? cap_h : tip_y+cord_h), tip_y+cord_h),
cap_w = cord * (1 - (cap_h - cord_h)/tip_y),
ang = min(ang,asin(cap_h/r)),
sa = 180 - ang,
ea = 360 + ang,
tanpt = polar_to_xy(r, ang),
tip_y = adj_ang_to_hyp(r, 90-ang),
cap_h = min(default(cap_h,tip_y), tip_y),
cap_w = tanpt.y >= cap_h
? hyp_opp_to_adj(r, cap_h)
: adj_ang_to_opp(tip_y-cap_h, ang),
ang2 = min(ang,atan2(cap_h,cap_w)),
sa = 180 - ang2,
ea = 360 + ang2,
steps = segs(r)*(ea-sa)/360,
step = (ea-sa)/steps,
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)],
[-cap_w/2,cap_h]
[-cap_w,cap_h]
], closed=true
),
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