dualism: output

1 files changed, 28 insertions, 1 deletions

diff --git a/fanduct.scad b/fanduct.scad
index b9689c9..0cd89f7 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -203,25 +203,52 @@ module fanduct(type=type,ductshape=ductshape,dual=dual) {
      }
     }
     if(what=="in") {
      translate([0,0,-fanduct_elevation-2+epsilon])
      cylinder(r=fanduct_ir+fanduct_shell*2+fanduct_w+1,h=fanduct_elevation+2);
      translate([0,0,-hotend_clearance])
      rotate([0,0,30])
      cylinder(r1=hotend_clearance*2,r2=0,h=hotend_clearance*2,$fn=6);
     }
    }
   }
 
-  if(type=="circular") circus(what);
+  module dual(what=what) {
+   module hulls(spots=dual_spots) {
+    for(my=[0,1]) mirror([0,my,0]) for(pn=[0:1:len(spots)-2]) hull() {
+     for(p=[spots[pn],spots[pn+1]]) translate(p) children(0);
+     children([1:$children-1]);
+    }
+   }
+   if(what=="in") {
+    difference() {
+     hulls() {
+      cylinder(d=fanduct_w+2*fanduct_shell,h=2*fanduct_shell+fanduct_h/2);
+      translate([0,-nozzles_apart/2,-fanduct_elevation-fanduct_blowtarget]) sphere(d=.1);
+     }
+     translate([0,0,epsilon]) hull() for(my=[0:1]) mirror([0,my,0]) for(s=dual_spots) translate(s)
+      mirror([0,0,1]) cylinder(d=fanduct_w+2*fanduct_shell+2,h=fanduct_elevation-fanduct_blowtarget+1);
+     for(s=[-1,1]) translate([0,s*nozzles_apart/2,-1])
+      cylinder(r=hotend_clearance,h=fanduct_h+2*fanduct_shell+2,$fn=smooth_f);
+    }
+   }else if(what=="out") {
+    hulls() {
+     translate([0,0,fanduct_shell]) cylinder(d=fanduct_w,h=fanduct_h/2-fanduct_shell/2);
+     translate([0,-nozzles_apart/2,-fanduct_elevation+fanduct_blowtarget]) sphere(d=.1);
+    }
+   }
+  }
+
+  if(dual) dual(what);
+  else if(type=="circular") circus(what);
   else if(type=="3jets") jets(what);
  }
 
  //	***	air intake
  module intake(what) {
   module placeit() {
    translate([-fanduct_ir-2*fanduct_shell-fanduct_w-inlet_away,0,fanduct_shell])
    rotate([0,-90,0])
    children();
   }
   if(what=="in") {
    placeit() translate([0,-inlet_w/2,0]) {