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

Added od and or to star(). Documented support for r and d in various polygons.

Browse Source
This commit is contained in:
Adrian Mariano 2019-08-04 09:48:13 -04:00
parent 6c48c27baf
commit 22dc6474da
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shapes2d.scad
View File

@ -342,7 +342,7 @@ module trapezoid(h, w1, w2, anchor=CENTER, spin=0)
// Function&Module: regular_ngon() // Function&Module: regular_ngon()
// Usage: // Usage:
// regular_ngon(n, or|od, [realign]); // regular_ngon(n, r|d|or|od, [realign]);
// regular_ngon(n, ir|id, [realign]); // regular_ngon(n, ir|id, [realign]);
// regular_ngon(n, side, [realign]); // regular_ngon(n, side, [realign]);
// Description: // Description:
@ -351,7 +351,9 @@ module trapezoid(h, w1, w2, anchor=CENTER, spin=0)
// Arguments: // Arguments:
// n = The number of sides. // n = The number of sides.
// or = Outside radius, at points. // or = Outside radius, at points.
// r = Same as or
// od = Outside diameter, at points. // od = Outside diameter, at points.
// d = Same as od
// ir = Inside radius, at center of sides. // ir = Inside radius, at center of sides.
// id = Inside diameter, at center of sides. // id = Inside diameter, at center of sides.
// side = Length of each side. // side = Length of each side.
@ -393,7 +395,9 @@ module regular_ngon(n=6, r, d, or, od, ir, id, side, realign=false, anchor=CENTE
// When called as a module, creates a 2D regular pentagon. // When called as a module, creates a 2D regular pentagon.
// Arguments: // Arguments:
// or = Outside radius, at points. // or = Outside radius, at points.
// r = Same as or.
// od = Outside diameter, at points. // od = Outside diameter, at points.
// d = Same as od.
// ir = Inside radius, at center of sides. // ir = Inside radius, at center of sides.
// id = Inside diameter, at center of sides. // id = Inside diameter, at center of sides.
// side = Length of each side. // side = Length of each side.
@ -428,7 +432,9 @@ module pentagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0
// When called as a module, creates a 2D regular hexagon. // When called as a module, creates a 2D regular hexagon.
// Arguments: // Arguments:
// or = Outside radius, at points. // or = Outside radius, at points.
// r = Same as or
// od = Outside diameter, at points. // od = Outside diameter, at points.
// d = Same as od
// ir = Inside radius, at center of sides. // ir = Inside radius, at center of sides.
// id = Inside diameter, at center of sides. // id = Inside diameter, at center of sides.
// side = Length of each side. // side = Length of each side.
@ -463,7 +469,9 @@ module hexagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0)
// When called as a module, creates a 2D regular octagon. // When called as a module, creates a 2D regular octagon.
// Arguments: // Arguments:
// or = Outside radius, at points. // or = Outside radius, at points.
// r = Same as or
// od = Outside diameter, at points. // od = Outside diameter, at points.
// d = Same as od
// ir = Inside radius, at center of sides. // ir = Inside radius, at center of sides.
// id = Inside diameter, at center of sides. // id = Inside diameter, at center of sides.
// side = Length of each side. // side = Length of each side.
@ -542,14 +550,16 @@ module glued_circles(r, d, spread=10, tangent=30, anchor=CENTER, spin=0)
// Function&Module: star() // Function&Module: star()
// Usage: // Usage:
// star(n, r|d, ir|id|step, [realign]); // star(n, r|d|or|od, ir|id|step, [realign]);
// Description: // Description:
// When called as a function, returns the path needed to create a star polygon with N points. // When called as a function, returns the path needed to create a star polygon with N points.
// When called as a module, creates a star polygon with N points. // When called as a module, creates a star polygon with N points.
// Arguments: // Arguments:
// n = The number of stellate tips on the star. // n = The number of stellate tips on the star.
// r = The radius to the tips of the star. // r = The radius to the tips of the star.
// or = Same as r
// d = The diameter to the tips of the star. // d = The diameter to the tips of the star.
// od = Same as d
// ir = The radius to the inner corners of the star. // ir = The radius to the inner corners of the star.
// id = The diameter to the inner corners of the star. // id = The diameter to the inner corners of the star.
// step = Calculates the radius of the inner star corners by virtually drawing a straight line `step` tips around the star. 2 <= step < n/2 // step = Calculates the radius of the inner star corners by virtually drawing a straight line `step` tips around the star. 2 <= step < n/2
@ -565,12 +575,13 @@ module glued_circles(r, d, spread=10, tangent=30, anchor=CENTER, spin=0)
// star(n=7, r=50, step=3, realign=true); // star(n=7, r=50, step=3, realign=true);
// Example(2D): Called as Function // Example(2D): Called as Function
// stroke(closed=true, star(n=5, r=50, ir=25)); // stroke(closed=true, star(n=5, r=50, ir=25));
function star(n, r, d, ir, id, step, realign=false, anchor=CENTER, spin=0) = function star(n, r, d, or, od, ir, id, step, realign=false, anchor=CENTER, spin=0) =
let( let(
r = get_radius(r=r, d=d), r = get_radius(r1=or, d1=od, r=r, d=d),
count = num_defined([ir,id,step]), count = num_defined([ir,id,step]),
stepOK = is_undef(step) || (step>1 && step<n/2) stepOK = is_undef(step) || (step>1 && step<n/2)
) )
assert(is_def(n), "Must specify number of points, n")
assert(count==1, "Must specify exactly one of ir, id, step") assert(count==1, "Must specify exactly one of ir, id, step")
assert(stepOK, str("Parameter 'step' must be between 2 and ",floor(n/2)," for ",n," point star")) assert(stepOK, str("Parameter 'step' must be between 2 and ",floor(n/2)," for ",n," point star"))
let( let(
@ -581,8 +592,8 @@ function star(n, r, d, ir, id, step, realign=false, anchor=CENTER, spin=0) =
) rot(spin, p=move(-r*normalize(anchor), p=path)); ) rot(spin, p=move(-r*normalize(anchor), p=path));
module star(n, r, d, ir, id, step, realign=false, anchor=CENTER, spin=0) module star(n, r, d, or, od, ir, id, step, realign=false, anchor=CENTER, spin=0)
polygon(star(n=n, r=r, d=d, ir=ir, id=id, step=step, realign=realign, anchor=anchor, spin=spin)); polygon(star(n=n, r=r, d=d, od=od, or=or, ir=ir, id=id, step=step, realign=realign, anchor=anchor, spin=spin));
function _superformula(theta,m1,m2,n1,n2=1,n3=1,a=1,b=1) = function _superformula(theta,m1,m2,n1,n2=1,n3=1,a=1,b=1) =