Clifford Wolf:

	Many cleanups



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

1 files changed, 27 insertions, 49 deletions

diff --git a/example.scad b/example.scad
index e37956c..7df8277 100644
--- a/example.scad
+++ b/example.scad
@@ -4,88 +4,66 @@ module test001()
 	function r_from_dia(d) = d / 2;
 
 	module rotcy(rot, r, h) {
-		rot(rot) cylinder(r = r, h = h);
+		rotate(90, rot) cylinder(r = r, h = h, center = true);
 	}
 
 	difference() {
 		sphere(r = r_from_dia(size));
-		rotcy([ 0  0 0], cy_r, cy_h);
-		rotcy([90  0 0], cy_r, cy_h);
-		rotcy([ 0 90 0], cy_r, cy_h);
+		rotcy([0  0 0], cy_r, cy_h);
+		rotcy([1  0 0], cy_r, cy_h);
+		rotcy([ 0 1 0], cy_r, cy_h);
 	}
 
-	size = 10;
-	hole = 2;
+	size = 50;
+	hole = 25;
 
 	cy_r = r_from_dia(hole);
-	cy_h = r_from_dia(size * 1.5);
+	cy_h = r_from_dia(size * 2.5);
 }
 
 module test002()
 {
-	difference() {
-		cube([2 2 0.5], true);
-		cube([0.5 0.5 2], true);
-	}
-}
-
-module test003()
-{
 	intersection() {
 		difference() {
 			union() {
-				cube([3 3 3], center = true);
-				trans([0 0 -2.5]) cube([1.5 1.5 5], center = true);
+				cube([30 30 30], center = true);
+				translate([0 0 -25])
+					cube([15 15 50], center = true);
 			}
 			union() {
-				cube([5 1 1], center = true);
-				cube([1 5 1], center = true);
-				cube([1 1 5], center = true);
+				cube([50 10 10], center = true);
+				cube([10 50 10], center = true);
+				cube([10 10 50], center = true);
 			}
 		}
-		trans([0 0 0.5])
-			cylinder(h = 5, r1 = 2, r2 = 0.5, center = true);
+		translate([0 0 5])
+			cylinder(h = 50, r1 = 20, r2 = 5, center = true);
 	}
 }
 
-module test004()
-{
-	intersection() {
-		difference() {
-			cylinder(h = 5, r1 = 2, r2 = 0.5, center = true);
-			cylinder(h = 6, r1 = 0.7, r2 = 0.7, center = true);
-		}
-		cube(3);
-	}
-}
-
-module test005()
+module test003()
 {
 	difference() {
 		union() {
-			cube([3 3 3], center = true);
-			cube([4 1.5 1.5], center = true);
-			cube([1.5 4 1.5], center = true);
-			cube([1.5 1.5 4], center = true);
+			cube([30 30 30], center = true);
+			cube([40 15 15], center = true);
+			cube([15 40 15], center = true);
+			cube([15 15 40], center = true);
 		}
 		union() {
-			cube([5 1 1], center = true);
-			cube([1 5 1], center = true);
-			cube([1 1 5], center = true);
+			cube([50 10 10], center = true);
+			cube([10 50 10], center = true);
+			cube([10 10 50], center = true);
 		}
 	}
 }
 
-module test006()
+module test004()
 {
 	difference() {
-		cube(8, center = true);
-		sphere(5);
+		cube(30, center = true);
+		sphere(20);
 	}
 }
 
-test006();
-
-// cylinder(h=5, r1=3, r2 = 10, center = true);
-// cube(10, center = true);
-// sphere(5);
+test001();