planter4 fix

diff --git a/openscad/planter4.scad b/openscad/planter4.scad
index 0ac34dc5bca3ee01b557eaf03a4081a0fd5446c3..1fb3ddf2a5dda8ccfc7245a00dd11fea67f6a511 100644 (file)
--- a/openscad/planter4.scad
+++ b/openscad/planter4.scad
@@ -1,24 +1,27 @@
 module planter_cavity(void=0, da=70, db=83) {
        translate([0,0,15]) difference() {
-               cylinder(d1=da, d2=db, h=83, $fn=12);
-               if(void) translate([0,0,void/2]) cylinder(d1=da-void, d2=db-void, h=83, $fn=12);
+               intersection() {
+                       cylinder(d1=da, d2=db, h=83, $fn=12);
+                       cylinder(d1=da-5, d2=db*2, h=83, $fn=12);
+               }
+               if(void) translate([0,0,-15+1.5]) scale([0.95,0.95,1]) planter_cavity();
        }
 }
 
 module planter() {
        difference() {
                union() {
-               translate([0,0,15]) for (h = [0 : 1 : 2] ){
-                       translate([0,0,h*31.5])
-                       for (r = [0 : 40 : 360] ){
-                               rotate([90,90,r+20*(h%2)])
-                               difference() {
-                                       translate([0,0,40]) cylinder(d2=35, d1=66, h=10, $fn=6);
-                                       translate([0,0,49.2]) cylinder(d1=20, d2=100, h=10, $fn=6);
+                       translate([0,0,15]) for (h = [0 : 1 : 2] ){
+                               translate([0,0,h*31.5])
+                               for (r = [0 : 40 : 360] ){
+                                       rotate([90,90,r+20*(h%2)])
+                                       difference() {
+                                               translate([0,0,40]) cylinder(d2=35, d1=66, h=10, $fn=6);
+                                               translate([0,0,49.2]) cylinder(d1=20, d2=100, h=10, $fn=6);
+                                       }
                                }
                        }
-               }
-               cylinder(d=90, h=94);
+                       cylinder(d=90, h=94);
            }
 
                translate([0,0,-50]) cylinder(d=140, h=50);
@@ -34,7 +37,7 @@ difference() {
                //translate([0,0,0.1]) cylinder(d=110, h=100);
                translate([0,0,90]) cylinder(d=103, h=7);
                translate([0,0,0.001]) rotate([0,0,90])
-                       scale([1.04,1.04,1.001]) planter();
+                       scale([1.03,1.03,1.001]) planter();
                translate([-60,0,97/2]) cube([3,7,97], center=true);
                translate([ 60,0,97/2]) cube([3,7,97], center=true);
                translate([  0,0,97/2]) cube([120,4,96.99], center=true);