sealing-box: make innertube etc. m4_defines so we can use them in a function we define

[reprap-play.git] / sealing-box.scad.m4

diff --git a/sealing-box.scad.m4 b/sealing-box.scad.m4
index 6f249386b9d94c2717f212b5c97057d184bf6b3d..b821dc0caa288eceb9b4598b4e25cce99df0954a 100644 (file)
--- a/sealing-box.scad.m4
+++ b/sealing-box.scad.m4
@@ -28,7 +28,7 @@
 //  $sealingbox_cnrrad
 
 $sealingbox_cnrrad = 10;
-$sealingbox_crude = 1;
+$sealingbox_crude = false;
 
 m4_define(`BoxLocals',`
   xbox = $sealingbox_sz[0];
@@ -41,14 +41,14 @@ m4_define(`BoxLocals',`
 
   xbox_lin = xbox - cnrrad*2;
   ybox_lin = ybox - cnrrad*2;
-
-  innertube = 1.0 + 0.2;
-  lidoverlap = 1.5;
-  lidoverhang = 6;
-  tubesealrad = 2.0;
 ')
 
-m4_define(`BoxFn',`$fn=($1) / $sealingbox_crude')
+m4_define(`innertube', `(1.0 + 0.2)')
+m4_define(`lidoverlap', `1.5')
+m4_define(`lidoverhang', `6')
+m4_define(`tubesealrad', `2.0')
+
+m4_define(`BoxFn',`$fn= $sealingbox_crude ? ($2) : ($1)')
 
 m4_dnl Box_Part($1=transl_x,$2=transl_y, $3=rot_z,$4=mirror_xy)
 m4_dnl          $5=kind, $6=kindargs, $7=profile(profileargsargs))
@@ -83,7 +83,7 @@ m4_define(`BoxPart_Extrude_Arc',`
         scale(500)
         mirror([($1)<0, 0,0])
         FArcSegment_mask($2);
-      rotate_extrude(convexity=10, $fs=1, BoxFn(36))
+      rotate_extrude(convexity=10, $fs=1, BoxFn(36,8))
         mirror([($1)<0, 0,0])
         translate([+($1),0,0]){
           $3
@@ -109,7 +109,7 @@ module SealingBox_WallProfile(){
   BoxLocals
   z = zbox - innertube - tubesealrad;
   translate([0, -0.1]) square([wall, z]);
-  translate([tubesealrad, z]) circle(r=tubesealrad, BoxFn(20));
+  translate([tubesealrad, z]) circle(r=tubesealrad, BoxFn(20,6));
 }
 
 module SealingBox_FloorProfile(){
@@ -134,7 +134,7 @@ module SealingBox_LidProfile(){
                 [0, -zbox]
                 ]) {
          translate(t)
-           circle(r= tubesealrad + innertube, BoxFn(20));
+           circle(r= tubesealrad + innertube, BoxFn(20,6));
        }
     }
   }