jets going deeper inside

that may be a bit more accurate, but damn freaking slow

1 files changed, 13 insertions, 7 deletions

diff --git a/fanduct.scad b/fanduct.scad
index 72143e2..a843023 100644
--- a/fanduct.scad
+++ b/fanduct.scad
@@ -114,38 +114,44 @@ module fanduct(type=type) {
       }
       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;
-   difference() {
+   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() {
-       translate([fanduct_ir+od/2,0,od/2])
-       rotate([90,0,0])
-       cylinder(d=od,h=2*(fanduct_ir+fanduct_shell+fanduct_w/2)*sin(jet_angle/2)-3,center=true,$fn=36);
+       render(convexity=4) intersection() {
+	translate([md-fanduct_shell-fanduct_w/2,-jww/2,0])
+	cube(size=[fanduct_shell+fanduct_w/2,jww,od]);
+	duct(what=what);
+       }
        translate([0,0,-fanduct_elevation]) sphere(r=.5);
       }
      }else if(what=="out") {
       hull() {
-       translate([fanduct_ir+od/2,0,od/2])
-       rotate([90,0,0])
-       cylinder(d=od-2*fanduct_shell,h=2*(fanduct_ir+fanduct_shell+fanduct_w/2)*sin(jet_angle/2)-3-2*fanduct_shell,center=true);
+       render(convexity=4) intersection() {
+	translate([md-fanduct_w/2-fanduct_shell,-jww/2+fanduct_shell,fanduct_shell])
+	cube(size=[fanduct_w/2+fanduct_shell,jww-2*fanduct_shell,od-2*fanduct_shell]);
+	duct(what=what);
+       }
        translate([0,0,-fanduct_elevation]) sphere(r=.2);
       }
      }
     }
     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);
     }
    }