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
@@ -125,3 +125,5 @@ module fanduct(type=type) {
    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]) {
@@ -129,5 +131,7 @@ module fanduct(type=type) {
       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);
@@ -136,5 +140,7 @@ module fanduct(type=type) {
       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);