From 70805ecfa53db9d676b6f24cd2f2d5bd0b8219b0 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Fri, 21 May 2021 23:09:14 -0700 Subject: [PATCH 1/6] Restrict pull merge automation. --- .github/workflows/docsgen.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml index 9fa44bd..447de46 100644 --- a/.github/workflows/docsgen.yml +++ b/.github/workflows/docsgen.yml @@ -1,11 +1,13 @@ name: CI on: - push: + pull_request: branches: - master + types: [closed] jobs: GenerateDocs: + if: github.event.pull_request.merged == true runs-on: macos-10.15 steps: - name: Checkout From 9141cb6ec24355f5ad7eb7ae6693a088802ea901 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 May 2021 06:13:31 +0000 Subject: [PATCH 2/6] Bump release version. --- version.scad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.scad b/version.scad index d7b4fe1..7193cf7 100644 --- a/version.scad +++ b/version.scad @@ -6,7 +6,7 @@ ////////////////////////////////////////////////////////////////////// -BOSL_VERSION = [2,0,634]; +BOSL_VERSION = [2,0,635]; // Section: BOSL Library Version Functions From bf60136d403eb39b91a4c5294bf1a1b0d13ebc2f Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Sat, 22 May 2021 00:50:20 -0700 Subject: [PATCH 3/6] Docs typo in turtle3d() --- turtle3d.scad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/turtle3d.scad b/turtle3d.scad index 7f1e4c5..3ebad05 100644 --- a/turtle3d.scad +++ b/turtle3d.scad @@ -90,7 +90,7 @@ function _rotpart(T) = [for(i=[0:3]) [for(j=[0:3]) j<3 || i==3 ? T[i][j] : 0]]; // "xjump" | | x | Move the turtle's x position to the specified value // "yjump | | y | Move the turtle's y position to the specified value // "zjump | | y | Move the turtle's y position to the specified value -// "left" | [angle] | Turn turtle left by specified angle or default angle +// "left" | | [angle] | Turn turtle left by specified angle or default angle // "right" | | [angle] | Turn turtle to the right by specified angle or default angle // "up" | | [angle] | Turn turtle up by specified angle or default angle // "down" | | [angle] | Turn turtle down by specified angle or default angle From 650205c40267ebffbf5d7c980614d8b2a34a1e63 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 May 2021 07:53:33 +0000 Subject: [PATCH 4/6] Bump release version. --- version.scad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.scad b/version.scad index 7193cf7..6445528 100644 --- a/version.scad +++ b/version.scad @@ -6,7 +6,7 @@ ////////////////////////////////////////////////////////////////////// -BOSL_VERSION = [2,0,635]; +BOSL_VERSION = [2,0,636]; // Section: BOSL Library Version Functions From f8e829c3b7ba1ce030047f165c77d91d54d8c982 Mon Sep 17 00:00:00 2001 From: Garth Minette Date: Sat, 22 May 2021 01:41:25 -0700 Subject: [PATCH 5/6] Reformatted shapes.scad examples. --- shapes.scad | 107 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 21 deletions(-) diff --git a/shapes.scad b/shapes.scad index f485b5a..0617e86 100644 --- a/shapes.scad +++ b/shapes.scad @@ -57,17 +57,41 @@ // Example: Rounded Edges, Untrimmed Corners // cuboid([30,40,50], rounding=10, trimcorners=false); // Example: Chamferring Selected Edges -// cuboid([30,40,50], chamfer=5, edges=[TOP+FRONT,TOP+RIGHT,FRONT+RIGHT], $fn=24); +// cuboid( +// [30,40,50], chamfer=5, +// edges=[TOP+FRONT,TOP+RIGHT,FRONT+RIGHT], +// $fn=24 +// ); // Example: Rounding Selected Edges -// cuboid([30,40,50], rounding=5, edges=[TOP+FRONT,TOP+RIGHT,FRONT+RIGHT], $fn=24); +// cuboid( +// [30,40,50], rounding=5, +// edges=[TOP+FRONT,TOP+RIGHT,FRONT+RIGHT], +// $fn=24 +// ); // Example: Negative Chamferring -// cuboid([30,40,50], chamfer=-5, edges=[TOP,BOT], except_edges=RIGHT, $fn=24); +// cuboid( +// [30,40,50], chamfer=-5, +// edges=[TOP,BOT], except_edges=RIGHT, +// $fn=24 +// ); // Example: Negative Chamferring, Untrimmed Corners -// cuboid([30,40,50], chamfer=-5, edges=[TOP,BOT], except_edges=RIGHT, trimcorners=false, $fn=24); +// cuboid( +// [30,40,50], chamfer=-5, +// edges=[TOP,BOT], except_edges=RIGHT, +// trimcorners=false, $fn=24 +// ); // Example: Negative Rounding -// cuboid([30,40,50], rounding=-5, edges=[TOP,BOT], except_edges=RIGHT, $fn=24); +// cuboid( +// [30,40,50], rounding=-5, +// edges=[TOP,BOT], except_edges=RIGHT, +// $fn=24 +// ); // Example: Negative Rounding, Untrimmed Corners -// cuboid([30,40,50], rounding=-5, edges=[TOP,BOT], except_edges=RIGHT, trimcorners=false, $fn=24); +// cuboid( +// [30,40,50], rounding=-5, +// edges=[TOP,BOT], except_edges=RIGHT, +// trimcorners=false, $fn=24 +// ); // Example: Standard Connectors // cuboid(40) show_anchors(); module cuboid( @@ -417,7 +441,11 @@ function cuboid( // prismoid(100, 80, chamfer=[0,5,10,15], h=30); // Example: Mixing Chamfer and Rounding // include -// prismoid(100, 80, chamfer=[0,5,0,10], rounding=[5,0,10,0], h=30); +// prismoid( +// 100, 80, h=30, +// chamfer=[0,5,0,10], +// rounding=[5,0,10,0] +// ); // Example: Really Mixing It Up // include // prismoid( @@ -588,7 +616,11 @@ function prismoid( // rect_tube(isize=[60,80], wall=5, h=30); // rect_tube(size=[100,60], isize=[90,50], h=30); // rect_tube(size1=[100,60], size2=[70,40], wall=5, h=30); -// rect_tube(size1=[100,60], size2=[70,40], isize1=[40,20], isize2=[65,35], h=15); +// Example: +// rect_tube( +// size1=[100,60], size2=[70,40], +// isize1=[40,20], isize2=[65,35], h=15 +// ); // Example: Outer Rounding Only // include // rect_tube(size=100, wall=5, rounding=10, irounding=0, h=30); @@ -603,16 +635,30 @@ function prismoid( // rect_tube(size=100, wall=5, chamfer=10, irounding=8, h=30); // Example: Gradiant Rounding // include -// rect_tube(size1=100, size2=80, wall=5, rounding1=10, rounding2=0, irounding1=8, irounding2=0, h=30); +// rect_tube( +// size1=100, size2=80, wall=5, h=30, +// rounding1=10, rounding2=0, +// irounding1=8, irounding2=0 +// ); // Example: Per Corner Rounding // include -// rect_tube(size=100, wall=10, rounding=[0,5,10,15], irounding=0, h=30); +// rect_tube( +// size=100, wall=10, h=30, +// rounding=[0,5,10,15], irounding=0 +// ); // Example: Per Corner Chamfer // include -// rect_tube(size=100, wall=10, chamfer=[0,5,10,15], ichamfer=0, h=30); +// rect_tube( +// size=100, wall=10, h=30, +// chamfer=[0,5,10,15], ichamfer=0 +// ); // Example: Mixing Chamfer and Rounding // include -// rect_tube(size=100, wall=10, chamfer=[0,5,0,10], ichamfer=0, rounding=[5,0,10,0], irounding=0, h=30); +// rect_tube( +// size=100, wall=10, h=30, +// chamfer=[0,5,0,10], ichamfer=0, +// rounding=[5,0,10,0], irounding=0 +// ); // Example: Really Mixing It Up // include // rect_tube( @@ -838,7 +884,11 @@ function right_triangle(size=[1,1,1], center, anchor, spin=0, orient=UP) = // } // // Example: Putting it all together -// cyl(l=40, d1=25, d2=15, chamfer1=10, chamfang1=30, from_end=true, rounding2=5); +// cyl( +// l=40, d1=25, d2=15, +// chamfer1=10, chamfang1=30, +// from_end=true, rounding2=5 +// ); // // Example: External Chamfers // cyl(l=50, r=30, chamfer=-5, chamfang=30, $fa=1, $fs=1); @@ -1702,9 +1752,15 @@ module pie_slice( // // Example: // union() { -// translate([0,2,-4]) cube([20, 4, 24], anchor=BOTTOM); -// translate([0,-10,-4]) cube([20, 20, 4], anchor=BOTTOM); -// color("green") interior_fillet(l=20, r=10, spin=180, orient=RIGHT); +// translate([0,2,-4]) +// cube([20, 4, 24], anchor=BOTTOM); +// translate([0,-10,-4]) +// cube([20, 20, 4], anchor=BOTTOM); +// color("green") +// interior_fillet( +// l=20, r=10, +// spin=180, orient=RIGHT +// ); // } // // Example: @@ -1762,21 +1818,30 @@ module interior_fillet(l=1.0, r, ang=90, overlap=0.01, d, anchor=FRONT+LEFT, spi // orient = Vector to rotate top towards. See [orient](attachments.scad#orient). Default: `UP` // Example: // heightfield(size=[100,100], bottom=-20, data=[ -// for (y=[-180:4:180]) [for(x=[-180:4:180]) 10*cos(3*norm([x,y]))] +// for (y=[-180:4:180]) [ +// for(x=[-180:4:180]) +// 10*cos(3*norm([x,y])) +// ] // ]); // Example: // intersection() { // heightfield(size=[100,100], data=[ -// for (y=[-180:5:180]) [for(x=[-180:5:180]) 10+5*cos(3*x)*sin(3*y)] +// for (y=[-180:5:180]) [ +// for(x=[-180:5:180]) +// 10+5*cos(3*x)*sin(3*y) +// ] // ]); // cylinder(h=50,d=100); // } -// Example(NORENDER): Heightfield by Function +// Example: Heightfield by Function // fn = function (x,y) 10*sin(x*360)*cos(y*360); // heightfield(size=[100,100], data=fn); -// Example(NORENDER): Heightfield by Function, with Specific Ranges +// Example: Heightfield by Function, with Specific Ranges // fn = function (x,y) 2*cos(5*norm([x,y])); -// heightfield(size=[100,100], bottom=-20, data=fn, xrange=[-180:2:180], yrange=[-180:2:180]); +// heightfield( +// size=[100,100], bottom=-20, data=fn, +// xrange=[-180:2:180], yrange=[-180:2:180] +// ); module heightfield(data, size=[100,100], bottom=-20, maxz=100, xrange=[-1:0.04:1], yrange=[-1:0.04:1], style="default", convexity=10, anchor=CENTER, spin=0, orient=UP) { size = is_num(size)? [size,size] : point2d(size); From 2221a6cf097dfa68f113ee3426eb9a9e6f020854 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 22 May 2021 08:46:23 +0000 Subject: [PATCH 6/6] Bump release version. --- version.scad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.scad b/version.scad index 6445528..fb909e5 100644 --- a/version.scad +++ b/version.scad @@ -6,7 +6,7 @@ ////////////////////////////////////////////////////////////////////// -BOSL_VERSION = [2,0,636]; +BOSL_VERSION = [2,0,637]; // Section: BOSL Library Version Functions