From 0cdc94cc0a8c7a14eb00a989c0d543aa6aae3425 Mon Sep 17 00:00:00 2001
From: Revar Desmera <revarbat@gmail.com>
Date: Fri, 10 Apr 2020 14:28:08 -0700
Subject: [PATCH] cuboid() was slightly too large with rounding.

---
 shapes.scad  | 13 ++++++-------
 version.scad |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/shapes.scad b/shapes.scad
index 92799026..aa7a64b3 100644
--- a/shapes.scad
+++ b/shapes.scad
@@ -186,7 +186,6 @@ module cuboid(
 				}
 			} else if (rounding != undef) {
 				sides = quantup(segs(rounding),4);
-				sc = 1/cos(180/sides);
 				if (edges == EDGES_ALL) {
 					if(rounding<0) {
 						cube(size, center=true);
@@ -206,12 +205,12 @@ module cuboid(
 						minkowski() {
 							cube(isize, center=true);
 							if (trimcorners) {
-								sphere(r=rounding*sc, $fn=sides);
+								sphere(r=rounding, $fn=sides);
 							} else {
 								intersection() {
-									zrot(180/sides) cylinder(r=rounding*sc, h=rounding*2, center=true, $fn=sides);
-									rotate([90,0,0]) zrot(180/sides) cylinder(r=rounding*sc, h=rounding*2, center=true, $fn=sides);
-									rotate([0,90,0]) zrot(180/sides) cylinder(r=rounding*sc, h=rounding*2, center=true, $fn=sides);
+									zrot(180/sides) cylinder(r=rounding, h=rounding*2, center=true, $fn=sides);
+									rotate([90,0,0]) zrot(180/sides) cylinder(r=rounding, h=rounding*2, center=true, $fn=sides);
+									rotate([0,90,0]) zrot(180/sides) cylinder(r=rounding, h=rounding*2, center=true, $fn=sides);
 								}
 							}
 						}
@@ -270,7 +269,7 @@ module cuboid(
 										rotate(majrots[axis]) cube([rounding*2, rounding*2, size[axis]+0.1], center=true);
 									}
 									translate(vmul(EDGE_OFFSETS[axis][i], size/2 - [1,1,1]*rounding)) {
-										rotate(majrots[axis]) zrot(180/sides) cylinder(h=size[axis]+0.2, r=rounding*sc, center=true, $fn=sides);
+										rotate(majrots[axis]) zrot(180/sides) cylinder(h=size[axis]+0.2, r=rounding, center=true, $fn=sides);
 									}
 								}
 							}
@@ -285,7 +284,7 @@ module cuboid(
 											cube(rounding*2, center=true);
 										}
 										translate(vmul([xa,ya,za], size/2-[1,1,1]*rounding)) {
-											zrot(180/sides) sphere(r=rounding*sc*sc, $fn=sides);
+											zrot(180/sides) sphere(r=rounding, $fn=sides);
 										}
 									}
 								}
diff --git a/version.scad b/version.scad
index 5cb88a35..974a17e3 100644
--- a/version.scad
+++ b/version.scad
@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////////////
 
 
-BOSL_VERSION = [2,0,259];
+BOSL_VERSION = [2,0,260];
 
 
 // Section: BOSL Library Version Functions