openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-07-31 09:30:25 +02:00
Code Issues Projects Releases Wiki Activity

Fixed cylinder() where r1=0

Browse Source
This commit is contained in:
Revar Desmera
2019-06-11 21:47:48 -07:00
parent 4d72a09444
commit 14c5847743
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
primitives.scad
View File

@@ -176,11 +176,12 @@ module cylinder(r=undef, d=undef, r1=undef, r2=undef, d1=undef, d2=undef, h=unde
r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=1); r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=1);
r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=1); r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=1);
l = first_defined([h, l]); l = first_defined([h, l]);
hh = h/2;
sides = segs(max(r1,r2)); sides = segs(max(r1,r2));
size = [r1*2, r1*2, l]; size = [r1*2, r1*2, l];
orient_and_anchor(size, orient, anchor, center, spin=spin, size2=[r2*2,r2*2], noncentered=BOTTOM, geometry="cylinder", chain=true) { orient_and_anchor(size, orient, anchor, center, spin=spin, size2=[r2*2,r2*2], noncentered=BOTTOM, geometry="cylinder", chain=true) {
linear_extrude(height=l, scale=r2/r1, convexity=2, center=true) { rotate_extrude(convexity=2, $fn=sides) {
circle(r=r1, $fn=sides); polygon([[0,hh],[r2,hh],[r1,-hh],[0,-hh]]);
} }
children(); children();
} }