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 7e6afbf7b3f378371e4d7b06ef7d1aefbf2ddd6e..2231e3fbb3320d5ff1aac22da196725bf2866ed9 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -18,9 +18,12 @@ screw_big_len = 4.0;
 
 round_edge_rad = 2.0;
 
+round_cnr_rad = 10;
+
 interlock_dia = 10;
 interlock_fine = 0.66;
 
+interlock_fine_slope = 1.0;
 interlock_fine_lenslop = 1.0;
 
 demo_slop = 0.1;
@@ -118,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]);
+        }
     }
   }
 }
@@ -149,7 +170,7 @@ module InterlockLobePlan(negative) {
   }
 }
 
-module InterlockEdgePlan(negative, nlobes, length) {
+module InterlockEdgePlan(negative, nlobes, length, dosquare=true) {
   for (lobei = [ 0 : nlobes-1 ]) {
     lobex = (length - thehd[0]*2) * (lobei ? lobei / (nlobes-1) : 0);
     translate([lobex, 0, 0]) {
@@ -157,23 +178,46 @@ module InterlockEdgePlan(negative, nlobes, length) {
     }
   }
 
-  iadj = interlock_sq_adj;
-  slotshorter = negative ? 0 : interlock_fine_lenslop;
-  mirror([0, negative])
-    translate([slotshorter, iadj])
-    square([length - slotshorter*2, interlock_fine + iadj*2]);
+  if (dosquare) {
+    iadj = 0;
+    slotshorter = negative ? -0.1 : interlock_fine_lenslop;
+    mirror([0, negative])
+      translate([slotshorter, iadj])
+      square([length - slotshorter*2, interlock_fine + iadj*2]);
+  }
 }
 
 module InterlockEdge(left_cnr, right_cnr, negative=0, nlobes=2) {
   plusth = negative * 1.0;
+  protr = interlock_fine + interlock_sq_adj;
+
+  z2 = -tile_th/2;
+  z1 = -tile_th/2 - protr / interlock_fine_slope;
+  z3 = -tile_th/2 + protr / interlock_fine_slope;
+
+  negsign = negative ? -1 : +1;
+  yprotr = negsign * protr;
 
   INREFFRAME(left_cnr, right_cnr) {
-    translate([0, 0, plusth]){
-      mirror([0,0,1]){
-       linear_extrude(height=tile_th+plusth*2, convexity=10){
-         InterlockEdgePlan(negative, nlobes, length);
-       }
-      }
+    for (vsect = [ // zs0            zs1      ys0,            ys1
+                 [ -tile_th-plusth, plusth,  0,              0],
+                 [ z1,              z2,      0, yprotr],
+                 [ z2,              z3,      yprotr, 0],
+                 ]) {
+      zs0 = vsect[0];
+      zs1 = vsect[1];
+      zsd = zs1-zs0;
+      ys0 = vsect[2];
+      ys1 = vsect[3];
+      ysd = ys1-ys0;
+      sl = ysd/zsd;
+      m = [ [ 1,0,   0,    0 ],
+           [ 0,1, -sl, -ys0 + negsign*interlock_sq_adj ],
+           [ 0,0,   1,  zs0 ],
+           [ 0,0,   0,    1 ] ];
+      multmatrix(m)
+       linear_extrude(height=zsd, convexity=10)
+       InterlockEdgePlan(negative, nlobes, length, !!ysd);
     }
   }
 }
@@ -190,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
@@ -236,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
@@ -252,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