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 41155efd792fd8c34ad0ca12a24fce0cd2859335..2231e3fbb3320d5ff1aac22da196725bf2866ed9 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -18,6 +18,8 @@ screw_big_len = 4.0;
 
 round_edge_rad = 2.0;
 
+round_cnr_rad = 10;
+
 interlock_dia = 10;
 interlock_fine = 0.66;
 
@@ -119,12 +121,30 @@ 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 RoundCornerAdd(this_cnr, right_cnr) {
+  bigr = round_cnr_rad - round_edge_rad;
+  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
+    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]);
+        }
     }
   }
 }
@@ -160,8 +180,7 @@ module InterlockEdgePlan(negative, nlobes, length, dosquare=true) {
 
   if (dosquare) {
     iadj = 0;
-    slotshorter = round_edge_rad + 0.1
-      + (negative ? 0 : interlock_fine_lenslop);
+    slotshorter = negative ? -0.1 : interlock_fine_lenslop;
     mirror([0, negative])
       translate([slotshorter, iadj])
       square([length - slotshorter*2, interlock_fine + iadj*2]);
@@ -215,13 +234,16 @@ module TestPiece1(){ ////toplevel
            ];
   corners = TestPiece_holes2corners(holes);
   difference(){
-    TileBase(corners[0], corners[2]);
+    union(){
+      TileBase(corners[0], corners[2]);
+      Posts(holes);
+      RoundEdge(corners[0], corners[1]);
+      RoundEdge(corners[3], corners[0]);
+    }
     InterlockEdge(corners[1], corners[2], 1, nlobes=1);
+    RoundCornerCut(corners[0], corners[1]);
   }
-  Posts(holes);
-  RoundEdge(corners[0], corners[1]);
-  RoundEdge(corners[3], corners[0]);
-  RoundLeftCorner(corners[0], corners[1]);
+  RoundCornerAdd(corners[0], corners[1]);
 }
 
 module TestPiece2(){ ////toplevel
@@ -261,14 +283,17 @@ module Tile02(){ ////toplevel
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
   difference(){
-    TileBase(c[0], c[2]);
+    union(){
+      TileBase(c[0], c[2]);
+      Posts(posts);
+      RoundEdge(c[0], c[1]);
+      RoundEdge(c[3], c[0]);
+      InterlockEdge(c[2], c[3], 0);
+    }
     InterlockEdge(c[1], c[2], 1);
+    RoundCornerCut(c[0], c[1]);
   }
-  Posts(posts);
-  RoundEdge(c[0], c[1]);
-  RoundEdge(c[3], c[0]);
-  RoundLeftCorner(c[0], c[1]);
-  InterlockEdge(c[2], c[3], 0);
+  RoundCornerAdd(c[0], c[1]);
 }
 
 module Tile12(){ ////toplevel
@@ -277,13 +302,16 @@ module Tile12(){ ////toplevel
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
   difference(){
-    TileBase(c[0], c[2]);
+    union(){
+      TileBase(c[0], c[2]);
+      RoundEdge(c[2], c[3]);
+      RoundEdge(c[3], c[0]);
+      Posts(posts);
+    }
     InterlockEdge(c[0], c[1], 1);
+    RoundCornerCut(c[2], c[3]);
   }
-  Posts(posts);
-  RoundEdge(c[2], c[3]);
-  RoundEdge(c[3], c[0]);
-  RoundLeftCorner(c[2], c[3]);
+  RoundCornerAdd(c[2], c[3]);
 }
 
 module Demo(){ ////toplevel