openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-01-17 06:08:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixed named attachments for teardrop()

Browse Source
This commit is contained in:
Garth Minette 2021-04-12 00:40:09 -07:00
parent 2225257f09
commit 95f19276ab
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shapes.scad
View File

@ -1527,9 +1527,10 @@ module teardrop(h, r, ang=45, cap_h, d, l, anchor=CENTER, spin=0, orient=UP)
{ {
r = get_radius(r=r, d=d, dflt=1); r = get_radius(r=r, d=d, dflt=1);
l = first_defined([l, h, 1]); l = first_defined([l, h, 1]);
maxd = 3*r/tan(ang); tip_y = adj_ang_to_hyp(r, 90-ang);
cap_h = min(default(cap_h,tip_y), tip_y);
anchors = [ anchors = [
["cap", [0,0,default(cap_h,maxd)], UP, 0] ["cap", [0,0,cap_h], UP, 0]
]; ];
attachable(anchor,spin,orient, r=r, l=l, axis=BACK, anchors=anchors) { attachable(anchor,spin,orient, r=r, l=l, axis=BACK, anchors=anchors) {
rot(from=UP,to=FWD) { rot(from=UP,to=FWD) {
@ -1578,15 +1579,16 @@ module teardrop(h, r, ang=45, cap_h, d, l, anchor=CENTER, spin=0, orient=UP)
module onion(r, ang=45, cap_h, d, anchor=CENTER, spin=0, orient=UP) module onion(r, ang=45, cap_h, d, anchor=CENTER, spin=0, orient=UP)
{ {
r = get_radius(r=r, d=d, dflt=1); r = get_radius(r=r, d=d, dflt=1);
maxd = 3*r/tan(ang); tip_y = adj_ang_to_hyp(r, 90-ang);
cap_h = min(default(cap_h,tip_y), tip_y);
anchors = [ anchors = [
["cap", [0,0,default(cap_h,maxd)], UP, 0] ["cap", [0,0,cap_h], UP, 0]
]; ];
attachable(anchor,spin,orient, r=r, anchors=anchors) { attachable(anchor,spin,orient, r=r, anchors=anchors) {
rotate_extrude(convexity=2) { rotate_extrude(convexity=2) {
difference() { difference() {
teardrop2d(r=r, ang=ang, cap_h=cap_h); teardrop2d(r=r, ang=ang, cap_h=cap_h);
left(r) square(size=[2*r,maxd], center=true); left(r) square(size=[2*r,2*cap_h], center=true);
} }
} }
children(); children();