1 files changed, 12 insertions, 10 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 541a037..b8994d4 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -63,73 +63,70 @@ module fanduct(type=type) {
      }
   }
  }
 
          //     ***output
  module output(what,type=type) {
   module guideline(xyxy) {
    module pin(xy) {
     translate([xy[0],xy[1],0])
     cylinder(d=2*extrusion_width,h=2*fanduct_shell+inlet_h,$fn=6);
    }
    xyxyxy=concat(xyxy,[[0,0]]);
    for(i=[0:1:len(xyxyxy)-2])
     hull() for(j=[i,i+1]) pin(xyxyxy[j]);
   }
 
   module circus(what) {
    if(what=="in") {
     difference() {
      rotate_extrude($fn=smooth_f)
       polygon([
        [0,-fanduct_elevation],
        [fanduct_ir+fanduct_shell,fanduct_shell+fanduct_h/2],
        [fanduct_ir+fanduct_shell+fanduct_w/2,0],
        [0,-fanduct_elevation-.1]]);
      translate([0,0,-1])
      cylinder(r=hotend_clearance,h=fanduct_h+2*fanduct_shell+2,$fn=smooth_f);
      mirror([0,0,1])
      translate([0,0,-epsilon])
      cylinder(r=fanduct_ir+fanduct_shell+1,h=fanduct_elevation+.1+2);
     }
    }else if(what=="out") {
-    difference() {
-     rotate_extrude($fn=smooth_f)
-     polygon([
-      [0,-fanduct_elevation],
-      [fanduct_ir+fanduct_shell+1,fanduct_h/2],
-      [fanduct_ir+fanduct_w/2+fanduct_shell+1,fanduct_shell],
-      [0,-fanduct_elevation-.1]]);
-     circus("airguides");
-    }
+    rotate_extrude($fn=smooth_f)
+    polygon([
+     [0,-fanduct_elevation],
+     [fanduct_ir+fanduct_shell+1,fanduct_h/2],
+     [fanduct_ir+fanduct_w/2+fanduct_shell+1,fanduct_shell],
+     [0,-fanduct_elevation-.1]]);
    }else if(what=="airguides") {
     inr = fanduct_ir+fanduct_shell; our = inr+fanduct_w;
     union() {
      for(my=[0,1]) mirror([0,my,0]) {
       guideline([
        [-our,inlet_w/6],
        [-inr*sin(60),inr*cos(60)]
       ]);
       a0=30; as=15; a1=180;
       for(a=[a0+as:as:a1]) {
        f = as/(a1-a+as);
        rotate([0,0,a]) guideline([[-inr-fanduct_w*f,0]]);
       }
       guideline([
        [-our+fanduct_w*cos(30)*3/4,fanduct_w*sin(30)*3/4],
        [-inr*cos(10),inr*sin(10)]
       ]);
      }
     }/*union*/
    }/*airguides*/
   }
 
   module jets(what) {
    od = fanduct_h/2+fanduct_shell;
    md = fanduct_ir+fanduct_shell+fanduct_w/2;
    jww = 2*md*sin(jet_angle/2);
    render(convexity=8) difference() {
     for(a=[0:120:359]) rotate([0,0,a]) {
      if(what=="in") {
       hull() {
        render(convexity=4) intersection() {
         translate([md-fanduct_shell-fanduct_w/2,-jww/2,0])
@@ -198,53 +195,58 @@ module fanduct(type=type) {
     translate([-fanduct_ir-fanduct_shell-fanduct_w/2,0,fanduct_shell])
     translate([0,-inlet_w/2+fanduct_shell,0])
     cube(size=[1,inlet_w-2*fanduct_shell,fanduct_h]);
    }
   }
  }
 
          //     ***DUCT TAILS!!! WOO-OO! (every day they're out there making duct tails…)
  module tails(what) {
   if(what=="in") {
    for(mx=[0,1]) mirror([mx,0,0])
    translate([fanduct_ir+fanduct_shell+fanduct_w/2,0,fanduct_shell+fanduct_h/2])
    rotate([90,0,90])
    translate([0,0,-snapper_d/2])
    snapper(d=snapper_d,o=snapper_overlap,side=0,l=fanduct_h*3/2+fanduct_shell);
   }
  }
 
  module parts(what) {
   union() {
    duct(what);
    marks(what);
    output(what);
    intake(what);
    tails(what);
   }
  }
 
  difference() {
   parts("in");
   parts("out");
  }
- 
+ intersection() {
+  output("airguides");
+  union() {
+   duct("in"); output("in"); intake("in");
+  }
+ }
 }
 
 view="full"; // hcut|vcut|*
 
 hinfinity=4*(fanduct_ir+fanduct_shell*2+fanduct_w+inlet_away);
 vinfinity=2*(fanduct_shell*2+fanduct_h+inlet_h);
 if(view=="hcut") {
  difference() {
   fanduct();
   translate([-hinfinity/2,-hinfinity/2,fanduct_shell+fanduct_h/2])
   cube(size=[hinfinity,hinfinity,vinfinity]);
  }
 }else if(view=="vcut") {
  difference() {
   fanduct();
   translate([-hinfinity/2,0,-vinfinity/2])
   cube(size=[hinfinity,hinfinity,vinfinity]);
  }
 }else fanduct();
 /* vim:set sw=1 ai: */