Merge branch 'master' of chiark:/u/ianmdlvl/reprap/play

[reprap-play.git] / fire-blanket-wall-mushroom.scad

diff --git a/fire-blanket-wall-mushroom.scad b/fire-blanket-wall-mushroom.scad
index 0ccd95f152c940e56e6b0dfc68a3ec877dd5ee09..dae4769632bcd53660ebb44c61acbf52feae66c7 100644 (file)
--- a/fire-blanket-wall-mushroom.scad
+++ b/fire-blanket-wall-mushroom.scad
@@ -1,16 +1,15 @@
 // -*- C -*-
 
-screwrad = 4.3 / 2 + 0.30;
-shaftrad = 7.5 / 2 - 0.30;
+fudge=0.15;
 
-diskrad = 12.0 / 2 - 0.25;
+screwrad = 4.5 / 2 + fudge; // xxx check
+shaftrad = 7.5 / 2 - fudge;
 
-csinkpart = 0.5;
+diskrad = 12.0 / 2 - fudge;
 
-csinkdepth = 3.4 * csinkpart;
-screwheadrad = (8.1 * csinkpart + screwrad * (1-csinkpart)) / 2 + 0.30;
+csinkpart = 0.5;
 
-shaftlen = 4;
+shaftlen = 8; // xxx check
 
 diskthick = 1.5;
 
@@ -21,17 +20,21 @@ disktaperratio = 2;
 disktaperrad = diskrad - diskthick / disktaperratio;
 totallen = shaftlen + diskthick;
 
-echo(disktaperrad, screwheadrad);
-echo(diskrad, disktaperrad, shaftrad, screwheadrad, screwrad);
-
 module SidePlan(){
-  polygon([[-screwheadrad, 0],
+  polygon([[-screwrad, 0],
           [-disktaperrad, 0],
           [-diskrad, -diskthick],
           [-shaftrad, -diskthick],
           [-shaftrad, -totallen],
-          [-screwrad, -totallen],
-          [-screwrad, -csinkdepth]]);
+          [-screwrad, -totallen]]);
+}
+
+module Bush(){
+  rotate_extrude($fn=25, convexity=3){
+    SidePlan();
+  }
 }
 
-SidePlan();
+//SidePlan();
+rotate([0,180,0])
+  Bush();