X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=41155efd792fd8c34ad0ca12a24fce0cd2859335;hb=00c389cec126d9eb193a44797465c874d6dd0692;hp=9382c3950043f0279aed1a733ecb8fd750e6921b;hpb=9b94833dacd9a3f254cc20ec4ef8dccca0f748d6;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 9382c39..41155ef 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -19,6 +19,12 @@ screw_big_len = 4.0;
 round_edge_rad = 2.0;
 
 interlock_dia = 10;
+interlock_fine = 0.66;
+
+interlock_fine_slope = 1.0;
+interlock_fine_lenslop = 1.0;
+
+demo_slop = 0.1;
 
 // calculated
 
@@ -44,6 +50,8 @@ thehd_br = -thehd_tl;
 interlock_rad = interlock_dia/2;
 interlock_negative_rad = interlock_rad + 0.125;
 
+interlock_sq_adj = 0.2; // arbitrary
+
 module Post(){
   mirror([0,0,1]) {
     difference(){
@@ -121,11 +129,14 @@ module RoundLeftCorner(this_cnr, right_cnr) {
   }
 }
 
-module InterlockLobePlan(r, ymir) {
+module InterlockLobePlan(negative) {
+  r = negative ? interlock_negative_rad : interlock_rad;
+  ymir = negative ? 0 : 1;
+
   dx = sqrt(3) * r;
   $fn= 80;
   translate([thehd[0], 0]){
-    mirror([0,ymir,0]){
+    mirror([0,ymir]){
       circle(r=r);
       difference(){
 	translate([-dx, -0.1])
@@ -139,30 +150,55 @@ module InterlockLobePlan(r, ymir) {
   }
 }
 
-module InterlockLobeCore(negative=0) {
-  r = negative ? interlock_negative_rad : interlock_rad;
-  plusth = negative * 1.0;
-  ymir = negative ? 0 : 1;
-  translate([0, 0, plusth]){
-    mirror([0,0,1]){
-      linear_extrude(height=tile_th+plusth*2, convexity=10){
-	InterlockLobePlan(r, ymir);
-      }
+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]) {
+      InterlockLobePlan(negative);
     }
   }
-}
 
-module InterlockLobe(this_cnr, right_cnr, negative=0) {
-  INREFFRAME(this_cnr, right_cnr)
-    InterlockLobeCore(negative);
+  if (dosquare) {
+    iadj = 0;
+    slotshorter = round_edge_rad + 0.1
+      + (negative ? 0 : 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) {
-    for (lobei = [ 0 : nlobes-1 ]) {
-      lobex = (length - thehd[0]*2) * (lobei ? lobei / (nlobes-1) : 0);
-      translate([lobex, 0, 0])
-	InterlockLobeCore(negative);
+    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);
     }
   }
 }
@@ -203,7 +239,7 @@ module TestDemo(){ ////toplevel
   translate([ -thehd[0], 0 ])
     color("blue")
     TestPiece1();
-  translate([ +thehd[0], 0 ])
+  translate([ +thehd[0] + demo_slop, 0 ])
     TestPiece2();
 }
   
@@ -226,12 +262,13 @@ module Tile02(){ ////toplevel
   posts = Rectangle_corners2posts(c);
   difference(){
     TileBase(c[0], c[2]);
+    InterlockEdge(c[1], c[2], 1);
   }
   Posts(posts);
   RoundEdge(c[0], c[1]);
   RoundEdge(c[3], c[0]);
   RoundLeftCorner(c[0], c[1]);
-  InterlockEdge(c[2], c[3], 0, 2);
+  InterlockEdge(c[2], c[3], 0);
 }
 
 module Tile12(){ ////toplevel
@@ -241,6 +278,7 @@ module Tile12(){ ////toplevel
   posts = Rectangle_corners2posts(c);
   difference(){
     TileBase(c[0], c[2]);
+    InterlockEdge(c[0], c[1], 1);
   }
   Posts(posts);
   RoundEdge(c[2], c[3]);
@@ -249,8 +287,8 @@ module Tile12(){ ////toplevel
 }
 
 module Demo(){ ////toplevel
-  color("blue") Tile12();
-  color("red")  Tile02();
+  translate(demo_slop*[-2,1]) color("blue") Tile12();
+  translate(demo_slop*[-2,0]) color("red")  Tile02();
 }
   
 //TestPiece1();