grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed all *gon() 2D shapes to support attachments.

Browse source
This commit is contained in:
Revar Desmera 2019-11-03 19:01:14 -08:00
parent 25256f78ad
commit a947ec2476
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
shapes2d.scad
View file

@ -330,7 +330,7 @@ function _normal_segment(p1,p2) =
function trapezoid(h, w1, w2, anchor=CENTER, spin=0) = function trapezoid(h, w1, w2, anchor=CENTER, spin=0) =
let( let(
s = anchor.y>0? [w2,h] : anchor.y<0? [w1,h] : [(w1+w2)/2,h], s = anchor.y>0? [w2,h] : anchor.y<0? [w1,h] : [(w1+w2)/2,h],
path = [[-w1/2,-h/2], [-w2/2,h/2], [w2/2,h/2], [w1/2,-h/2]] path = [[w1/2,-h/2], [-w1/2,-h/2], [-w2/2,h/2], [w2/2,h/2]]
) rot(spin, p=move(-vmul(anchor,s/2), p=path)); ) rot(spin, p=move(-vmul(anchor,s/2), p=path));
@ -375,13 +375,18 @@ function regular_ngon(n=6, r, d, or, od, ir, id, side, realign=false, anchor=CEN
let( let(
sc = 1/cos(180/n), sc = 1/cos(180/n),
r = get_radius(r1=ir*sc, r2=or, r=r, d1=id*sc, d2=od, d=d, dflt=side/2/sin(180/n)), r = get_radius(r1=ir*sc, r2=or, r=r, d1=id*sc, d2=od, d=d, dflt=side/2/sin(180/n)),
offset = 90 + (realign? (180/n) : 0), path = circle(r=r, realign=realign, spin=90, $fn=n)
path = [for (a=[0:360/n:360-EPSILON]) r*[cos(a+offset),sin(a+offset)]]
) rot(spin, p=move(-r*normalize(anchor), p=path)); ) rot(spin, p=move(-r*normalize(anchor), p=path));
module regular_ngon(n=6, r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0) module regular_ngon(n=6, r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0) {
polygon(regular_ngon(n=n,r=r,d=d,or=or,od=od,ir=ir,id=id,side=side,realign=realign, anchor=anchor, spin=spin)); sc = 1/cos(180/n);
r = get_radius(r1=ir*sc, r2=or, r=r, d1=id*sc, d2=od, d=d, dflt=side/2/sin(180/n));
orient_and_anchor([2*r,2*r,0], UP, anchor, spin=spin, geometry="cylinder", two_d=true, chain=true) {
polygon(circle(r=r, realign=realign, spin=90, $fn=n));
children();
}
}
// Function&Module: pentagon() // Function&Module: pentagon()
@ -420,7 +425,7 @@ function pentagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin
module pentagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0) module pentagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0)
polygon(pentagon(r=r, d=d, or=or, od=od, ir=ir, id=id, side=side, realign=realign, anchor=anchor, spin=spin)); regular_ngon(n=5, r=r, d=d, or=or, od=od, ir=ir, id=id, side=side, realign=realign, anchor=anchor, spin=spin) children();
// Function&Module: hexagon() // Function&Module: hexagon()
@ -457,7 +462,7 @@ function hexagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=
module hexagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0) module hexagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0)
polygon(hexagon(r=r, d=d, or=or, od=od, ir=ir, id=id, side=side, realign=realign, anchor=anchor, spin=spin)); regular_ngon(n=6, r=r, d=d, or=or, od=od, ir=ir, id=id, side=side, realign=realign, anchor=anchor, spin=spin) children();
// Function&Module: octagon() // Function&Module: octagon()
@ -494,7 +499,7 @@ function octagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=
module octagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0) module octagon(r, d, or, od, ir, id, side, realign=false, anchor=CENTER, spin=0)
polygon(octagon(r=r, d=d, or=or, od=od, ir=ir, id=id, side=side, realign=realign, anchor=anchor, spin=spin)); regular_ngon(n=8, r=r, d=d, or=or, od=od, ir=ir, id=id, side=side, realign=realign, anchor=anchor, spin=spin) children();
// Function&Module: glued_circles() // Function&Module: glued_circles()