sewing-table: Use RoundCornerAdd/Cut in Tile12 too

[reprap-play.git] / sewing-table.scad.m4

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 8499366ca5f40f74d820a91e7707491f7894b634..2231e3fbb3320d5ff1aac22da196725bf2866ed9 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -121,29 +121,31 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
-module RoundLeftCorner(this_cnr, right_cnr) {
+module RoundCornerCut(this_cnr, right_cnr) {
+  offr= round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
-      sphere(r= round_edge_rad, $fn=60);
-      translate([0,0, -20])
-       cube([20,20,20]);
+      cube(offr*2 - 0.1, center=true);
+      translate([offr, offr, 0])
+       cylinder(center=true, h=20, r= offr);
     }
   }
 }
 
-module RoundCornerCut(this_cnr, right_cnr) {
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    cube(round_cnr_rad*2, center=true);
-  }
-}
-
 module RoundCornerAdd(this_cnr, right_cnr) {
   bigr = round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    translate([bigr, bigr, 0])
-      rotate_extrude(convexity=10)
-      translate([bigr, 0])
-      circle(r= round_edge_rad);
+    intersection(){
+      cube(bigr*2 + 0.1, center=true);
+      translate([bigr, bigr, 0])
+       rotate_extrude(convexity=10, $fn=50)
+       translate([bigr, 0])
+       difference(){
+         circle(r= round_edge_rad, $fn=50);
+         mirror([1,1])
+           square([20,20]);
+        }
+    }
   }
 }
 
@@ -286,11 +288,12 @@ module Tile02(){ ////toplevel
       Posts(posts);
       RoundEdge(c[0], c[1]);
       RoundEdge(c[3], c[0]);
-      RoundLeftCorner(c[0], c[1]);
       InterlockEdge(c[2], c[3], 0);
     }
     InterlockEdge(c[1], c[2], 1);
+    RoundCornerCut(c[0], c[1]);
   }
+  RoundCornerAdd(c[0], c[1]);
 }
 
 module Tile12(){ ////toplevel
@@ -303,11 +306,12 @@ module Tile12(){ ////toplevel
       TileBase(c[0], c[2]);
       RoundEdge(c[2], c[3]);
       RoundEdge(c[3], c[0]);
-      RoundLeftCorner(c[2], c[3]);
       Posts(posts);
     }
     InterlockEdge(c[0], c[1], 1);
+    RoundCornerCut(c[2], c[3]);
   }
+  RoundCornerAdd(c[2], c[3]);
 }
 
 module Demo(){ ////toplevel