kaan/MCAD-Library
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

regular_shapes: Simplify hexagon modules

Browse source 
- Alleviate the hexagon_prism module by letting 'hexagon' do the
selection between the inputs.

 - Aggregate input selection to avoid overwriting other inputs.
This commit is contained in:
Rock Storm 2018-10-18 18:55:32 +01:00
parent 23dc11bc5f
commit 0b34bf6834
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
regular_shapes.scad
View file

@ -43,9 +43,7 @@ module pentagon(radius)
module hexagon(radius, diameter, across_flats) module hexagon(radius, diameter, across_flats)
{ {
r = radius; r = across_flats ? across_flats/2/cos(30) : diameter ? diameter/2 : radius;
r = diameter ? diameter/2 : radius;
r = across_flats ? across_flats/2/cos(30) : radius;
reg_polygon(6,r); reg_polygon(6,r);
} }
@ -159,9 +157,8 @@ module pentagon_tube(height,radius,wall)
module hexagon_prism(height, radius, across_flats) module hexagon_prism(height, radius, across_flats)
{ {
r = radius; linear_extrude(height=height)
r = across_flats ? across_flats/2/cos(30) : radius; hexagon(radius=radius, across_flats=across_flats);
linear_extrude(height=height) hexagon(r);
} }
module hexagon_tube(height,radius,wall) module hexagon_tube(height,radius,wall)