From 00bbdedd47adf2aa3840ff854325833c58b29667 Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Wed, 29 Jan 2020 18:04:29 -0800 Subject: [PATCH] Tweak to rounded_prismoid() to use new square() with rounding. --- shapes.scad | 9 +++------ version.scad | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/shapes.scad b/shapes.scad index f910db4..525aa56 100644 --- a/shapes.scad +++ b/shapes.scad @@ -410,6 +410,7 @@ module prismoid( module rounded_prismoid( size1, size2, h, shift=[0,0], r=undef, r1=undef, r2=undef, + edges=EDGES_ALL, anchor=BOTTOM, spin=0, orient=UP ) { eps = 0.001; @@ -422,16 +423,12 @@ module rounded_prismoid( down(h/2) { hull() { linear_extrude(height=eps, center=false, convexity=2) { - offset(r=rr1) { - square([max(eps, size1[0]-2*rr1), max(eps, size1[1]-2*rr1)], center=true); - } + square([max(eps, size1[0]-2*rr1), max(eps, size1[1]-2*rr1)], rounding=rr1, center=true); } up(h-0.01) { translate(shiftby) { linear_extrude(height=eps, center=false, convexity=2) { - offset(r=rr2) { - square([max(eps, size2[0]-2*rr2), max(eps, size2[1]-2*rr2)], center=true); - } + square([max(eps, size2[0]-2*rr2), max(eps, size2[1]-2*rr2)], rounding=rr2, center=true); } } } diff --git a/version.scad b/version.scad index 10eb732..b10488b 100644 --- a/version.scad +++ b/version.scad @@ -8,7 +8,7 @@ ////////////////////////////////////////////////////////////////////// -BOSL_VERSION = [2,0,101]; +BOSL_VERSION = [2,0,102]; // Section: BOSL Library Version Functions