rounder -> boxes and added sidesonly parameter

git-svn-id: http://svn.clifford.at/openscad/trunk@463 b57f626f-c46c-0410-a088-ec61d464b74c

2 files changed, 43 insertions, 31 deletions

diff --git a/libraries/boxes.scad b/libraries/boxes.scad
new file mode 100644
index 0000000..86bc099
--- /dev/null
+++ b/libraries/boxes.scad
@@ -0,0 +1,43 @@
+// Library: boxes.scad
+// Version: 1.0
+// Author: Marius Kintel
+// Copyright: 2010
+// License: BSD
+
+// roundedBox([width, height, depth], float radius, bool sidesonly);
+
+// EXAMPLE USAGE:
+// roundedBox([20, 30, 40], 5, true);
+
+// size is a vector [w, h, d]
+module roundedBox(size, radius, sidesonly)
+{
+  rot = [ [0,0,0], [90,0,90], [90,90,0] ];
+  if (sidesonly) {
+    cube(size - [2*radius,0,0], true);
+    cube(size - [0,2*radius,0], true);
+    for (x = [radius-size[0]/2, -radius+size[0]/2],
+           y = [radius-size[1]/2, -radius+size[1]/2]) {
+      translate([x,y,0]) cylinder(r=radius, h=size[2], center=true);
+    }
+  }
+  else {
+    cube([size[0], size[1]-radius*2, size[2]-radius*2], center=true);
+    cube([size[0]-radius*2, size[1], size[2]-radius*2], center=true);
+    cube([size[0]-radius*2, size[1]-radius*2, size[2]], center=true);
+
+    for (axis = [0:2]) {
+      for (x = [radius-size[axis]/2, -radius+size[axis]/2],
+             y = [radius-size[(axis+1)%3]/2, -radius+size[(axis+1)%3]/2]) {
+        rotate(rot[axis]) 
+          translate([x,y,0]) 
+          cylinder(h=size[(axis+2)%3]-2*radius, r=radius, center=true);
+      }
+    }
+    for (x = [radius-size[0]/2, -radius+size[0]/2],
+           y = [radius-size[1]/2, -radius+size[1]/2],
+           z = [radius-size[2]/2, -radius+size[2]/2]) {
+      translate([x,y,z]) sphere(radius);
+    }
+  }
+}
diff --git a/libraries/rounder.scad b/libraries/rounder.scad
deleted file mode 100644
index 1eb080c..0000000
--- a/libraries/rounder.scad
+++ /dev/null
@@ -1,31 +0,0 @@
-// Library: rounder.scad
-// Version: 1.1
-// Author: Marius Kintel (Idea by Zach Hoeken)
-// Copyright: 2010
-// License: BSD
-
-// EXAMPLE USAGE:
-// roundedBox(20, 30, 40, 5);
-
-// size is a vector [w, h, d]
-module roundedBox(size, radius)
-{
-  cube([size[0], size[1]-radius*2, size[2]-radius*2], center=true);
-  cube([size[0]-radius*2, size[1], size[2]-radius*2], center=true);
-  cube([size[0]-radius*2, size[1]-radius*2, size[2]], center=true);
-
-  rot = [ [0,0,0], [90,0,90], [90,90,0] ];
-  for (axis = [0:2]) {
-    for (x = [radius-size[axis]/2, -radius+size[axis]/2],
-         y = [radius-size[(axis+1)%3]/2, -radius+size[(axis+1)%3]/2]) {
-      rotate(rot[axis]) 
-        translate([x,y,0]) 
-          cylinder(h=size[(axis+2)%3]-2*radius, r=radius, center=true);
-    }
-  }
-  for (x = [radius-size[0]/2, -radius+size[0]/2],
-       y = [radius-size[1]/2, -radius+size[1]/2],
-       z = [radius-size[2]/2, -radius+size[2]/2]) {
-    translate([x,y,z]) sphere(radius);
-  }
-}