another: adjust and prettify $fn calculations

1 files changed, 31 insertions, 30 deletions

diff --git a/another.scad b/another.scad
index 302e314..872ff33 100644
--- a/another.scad
+++ b/another.scad
@@ -63,2 +63,4 @@ module the_extruder(
 ) {
+ fnd = 2*PI; fnr = 2*fnd;
+
  lever_shell = mount_screwhead_h+0.5;
@@ -88,6 +90,6 @@ module the_extruder(
    rr = depth+hh;
-   translate([0,0,hh]) sphere(r=rr,$fn=2*PI*rr);
+   translate([0,0,hh]) sphere(r=rr,$fn=fnr*rr);
   }else if(r) {
    hh=sqrt(pow(r,2)-pow(d,2)/4);
-   translate([0,0,hh]) sphere(r=r,$fn=2*PI*r);
+   translate([0,0,hh]) sphere(r=r,$fn=fnr*r);
   }
@@ -160,3 +162,3 @@ module the_extruder(
      translate([0,0,lever_thickness/2-mount_screwhead_h]) 
-     cylinder(d=mount_screwhead_d,h=mount_screwhead_h+1,$fn=2*PI*mount_screwhead_d);
+     cylinder(d=mount_screwhead_d,h=mount_screwhead_h+1,$fn=fnd*mount_screwhead_d);
     }
@@ -164,3 +166,3 @@ module the_extruder(
     translate([mount_d/2,0,0])
-    cylinder(d=mount_screw_d+mount_screw_d_tolerance,h=lever_thickness+2,center=true,$fn=2*PI*mount_screw_d);
+    cylinder(d=mount_screw_d+mount_screw_d_tolerance,h=lever_thickness+2,center=true,$fn=fnd*mount_screw_d);
     
@@ -172,4 +174,4 @@ module the_extruder(
      difference() {
-      cylinder(d=spring_d+spring_d_clearance,h=lsd,$fn=2*PI*spring_d);
-      sphere(d=spring_d*3/4,$fn=PI*spring_d);
+      cylinder(d=spring_d+spring_d_clearance,h=lsd,$fn=fnd*(spring_d+spring_d_clearance));
+      sphere(d=spring_d*3/4,$fn=fnd*spring_d*3/4);
      }
@@ -188,3 +190,3 @@ module the_extruder(
    union() {
-   cylinder(d=gearbox_d,h=body_h,$fn=2*PI*gearbox_d);
+   cylinder(d=gearbox_d,h=body_h,$fn=fnd*gearbox_d);
     // finger and spring support
@@ -196,3 +198,3 @@ module the_extruder(
        rotate([0,90,0])
-       cylinder(d=max(lever_thickness,spring_d+spring_d_clearance+2*extrusion_width),h=fsw,$fn=2*PI*lever_thickness);
+       cylinder(d=lever_thickness,h=fsw,$fn=fnd*lever_thickness);
        hh=body_h-ls_z;
@@ -213,3 +215,3 @@ module the_extruder(
 	cylinder(d=st_nut_d,h=st_nut_h,$fn=6);
-	translate([0,0,-1]) cylinder(d=st_screw_d,h=fsw+2,$fn=st_screw_d*PI*2);
+	translate([0,0,-1]) cylinder(d=st_screw_d,h=fsw+2,$fn=fnd*st_screw_d);
 	bigd = spring_d+spring_d_clearance;
@@ -218,5 +220,5 @@ module the_extruder(
 	cylinder(d1=st_screw_d,d2=bigd,
-	 h=hf+epsilon, $fn=bigd*PI*2 );
+	 h=hf+epsilon, $fn=fnd*bigd);
 	translate([0,0,st_shell+st_nut_h+st_shell+hf-epsilon])
-	cylinder(d=bigd,h=fsw+1,$fn=bigd*PI*2);
+	cylinder(d=bigd,h=fsw+1,$fn=fnd*bigd);
        }
@@ -235,3 +237,3 @@ module the_extruder(
    translate([0,0,-1])
-   cylinder(d=protrusion_d+protrusion_tolerance_h,h=protrusion_h+protrusion_tolerance_v+1,$fn=2*PI*protrusion_d);
+   cylinder(d=protrusion_d+protrusion_tolerance_h,h=protrusion_h+protrusion_tolerance_v+1,$fn=fnd*(protrusion_d+protrusion_tolerance_h));
    // mount screw holes
@@ -242,5 +244,5 @@ module the_extruder(
              h=mount_screw_l-mounthole_depth/2-layer_height+1,
-	     $fn=2*PI*mount_screw_d);
+	     $fn=fnd*(mount_screw_d+mount_screw_d_tolerance));
     translate([0,0,mount_screw_l-mounthole_depth/2])
-    cylinder(d=mount_screwhead_d,h=body_h+1,$fn=2*PI*mount_screwhead_d);
+    cylinder(d=mount_screwhead_d,h=body_h+1,$fn=fnd*mount_screwhead_d);
    }//for
@@ -253,3 +255,3 @@ module the_extruder(
     pushfit(pf);
-    cylinder(d=filament_guide_d,h=gearbox_d,center=true,$fn=2*PI*filament_guide_d);
+    cylinder(d=filament_guide_d,h=gearbox_d,center=true,$fn=fnd*filament_guide_d);
     translate([0,-filament_guide_d/2/sqrt(2),0])
@@ -259,3 +261,3 @@ module the_extruder(
    // pulley
-   cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=2*PI*(pulley_d+pulley_clearance));
+   cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_clearance));
    // leverspace
@@ -264,3 +266,3 @@ module the_extruder(
    translate([x,0,ls_z-ls_h/2])
-   cylinder(d=idler_d+idler_clearance,h=ls_h,$fn=2*PI*idler_d);
+   cylinder(d=idler_d+idler_clearance,h=ls_h,$fn=fnd*(idler_d+idler_clearance));
    
@@ -287,5 +289,4 @@ module the_extruder(
    rotate([0,-90,0]) difference() {
-    cylinder(d=spring_d+spring_d_clearance,h=spring_lc+spring_dl,$fn=PI*spring_d);
-    translate([0,0,spring_lc+spring_dl]) sphere(d=spring_d*3/4,$fn=PI*spring_d);
-   }
+    cylinder(d=spring_d+spring_d_clearance,h=spring_lc+spring_dl,$fn=fnd*(spring_d+spring_d_clearance));
+    translate([0,0,spring_lc+spring_dl]) sphere(d=spring_d*3/4,$fn=fnd*spring_d*3/4);
    }
@@ -297,4 +298,4 @@ module the_extruder(
     translate([0,0,ls_z-ls_h/2-epsilon])
-    cylinder(d=gearbox_d,h=ls_h+2*epsilon,$fn=2*PI*gearbox_d);
-    cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=2*PI*(pulley_d+pulley_clearance));
+    cylinder(d=gearbox_d,h=ls_h+2*epsilon,$fn=fnd*gearbox_d);
+    cylinder(d=pulley_d+pulley_clearance,h=body_h+1,$fn=fnd*(pulley_d+pulley_clearance));
    }
@@ -322,8 +323,8 @@ module the_extruder(
    union() {
-    cylinder(d1=smalld,d2=bigd,h=hf,$fn=bigd*PI*2);
+    cylinder(d1=smalld,d2=bigd,h=hf,$fn=fnd*bigd);
     translate([0,0,hf-epsilon])
-    cylinder(d=bigd,h=hf*2,$fn=bigd*PI*2);
+    cylinder(d=bigd,h=hf*2,$fn=fnd*bigd);
    }
    translate([0,0,-epsilon])
-   cylinder(d=st_screw_d,h=2*hf+epsilon,$fn=st_screw_d*PI*2);
+   cylinder(d=st_screw_d,h=2*hf+epsilon,$fn=fnd*st_screw_d);
   }
@@ -336,3 +337,3 @@ module the_extruder(
     difference() {
-     cylinder(d=pulley_d,h=knob_bore_l,$fn=pulley_d*PI*2);
+     cylinder(d=pulley_d,h=knob_bore_l,$fn=fnd*pulley_d);
      translate([0,0,-1]) difference() {
@@ -346,7 +347,7 @@ module the_extruder(
     union() {
-     cylinder(d1=gearbox_d-2*ch,d2=gearbox_d,h=ch+epsilon,$fn=PI*gearbox_d*2);
+     cylinder(d1=gearbox_d-2*ch,d2=gearbox_d,h=ch+epsilon,$fn=fnd*gearbox_d);
      translate([0,0,ch])
-     cylinder(d=gearbox_d,h=knob_h-2*ch+epsilon,$fn=PI*gearbox_d*2);
+     cylinder(d=gearbox_d,h=knob_h-2*ch+epsilon,$fn=fnd*gearbox_d);
      translate([0,0,knob_h-ch])
-     cylinder(d1=gearbox_d,d2=gearbox_d-2*ch,h=ch,$fn=PI*gearbox_d*2);
+     cylinder(d1=gearbox_d,d2=gearbox_d-2*ch,h=ch,$fn=fnd*gearbox_d);
     }
@@ -354,3 +355,3 @@ module the_extruder(
      translate([0,gearbox_d/2,-1])
-     cylinder(d=knob_indent_d,h=knob_h+2,$fn=knob_indent_d*PI*2);
+     cylinder(d=knob_indent_d,h=knob_h+2,$fn=fnd*knob_indent_d);
    }