X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=sewing-table.scad.m4;h=40ec1be2524399e6d80c9f0546707406d848ed0f;hp=018ab450147296532ace1785f73d0c34b81cd304;hb=4982e66d15e9dcc3aec326dfe480cdec31aaaf91;hpb=88c2b61b1c55801655d043dca12dd39c8d8f860a

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 018ab45..40ec1be 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -66,8 +66,7 @@ module Posts(posts) {
 module TileBase(botleft, topright){
   size = topright - botleft;
   botleft_post = botleft + thehd_tr;
-  topright_post = topright - thehd_bl;
-  echo(botleft_post, topright_post);
+  topright_post = topright + thehd_bl;
   difference(){
     mirror([0,0,1])
       translate(concat(botleft, [0]))
@@ -75,8 +74,8 @@ module TileBase(botleft, topright){
     translate( concat(botleft_post, [-tile_th])
 	       + 0.5 * [ post_dia, post_dia, 0 ] )
       Commitid_BestCount_M( topright_post-botleft_post
-			    + [0, thehd[1] ]
-			    + [-post_dia,-post_dia] );
+			    + [-post_dia,-post_dia]
+			    + [0, thehd[1]]);
   }
 }
 
@@ -122,43 +121,46 @@ module RoundLeftCorner(this_cnr, right_cnr) {
   }
 }
 
-module InterlockCore(r, plusth, ymir) {
+module InterlockLobePlan(r, ymir) {
   dx = sqrt(3) * r;
   $fn= 80;
-  translate([thehd[0], 0, plusth]){
+  translate([thehd[0], 0]){
     mirror([0,ymir,0]){
-      mirror([0,0,1]){
-	linear_extrude(height=tile_th+plusth*2, convexity=10){
-	  circle(r=r);
-	  difference(){
-	    translate([-dx, -0.1])
-	      square([ dx*2, r/2 + 0.1 ]);
-	    for (xi = [-1, 1]) {
-	      translate([ xi*dx, r ])
-		circle(r=r);
-	    }
-	  }
+      circle(r=r);
+      difference(){
+	translate([-dx, -0.1])
+	  square([ dx*2, r/2 + 0.1 ]);
+	for (xi = [-1, 1]) {
+	  translate([ xi*dx, r ])
+	    circle(r=r);
 	}
       }
     }
   }
 }
 
-module InterlockNegative(this_cnr, right_cnr) {
-  INREFFRAME(this_cnr, right_cnr)
-    InterlockCore(interlock_negative_rad, 1, 0);
+module InterlockLobeCore(r, plusth, ymir) {
+  translate([0, 0, plusth]){
+    mirror([0,0,1]){
+      linear_extrude(height=tile_th+plusth*2, convexity=10){
+	InterlockLobePlan(r, ymir);
+      }
+    }
+  }
 }
 
-module Interlock(this_cnr, right_cnr) {
+module InterlockLobe(this_cnr, right_cnr, negative=0) {
   INREFFRAME(this_cnr, right_cnr)
-    InterlockCore(interlock_rad, 0, 1);
+    InterlockLobeCore(negative ? interlock_negative_rad : interlock_rad,
+		  negative ? 1 : 0,
+		  negative ? 0 : 1);
 }
 
 function TestPiece_holes2corners(holes) =
   [ holes[0] + thehd_bl,
     holes[1] + thehd_br,
-    holes[0] + thehd_tl,
-    holes[1] + thehd_tr ];
+    holes[1] + thehd_tr,
+    holes[0] + thehd_tl ];
 
 module TestPiece1(){ ////toplevel
   holes = [ [-100, 0],
@@ -166,12 +168,12 @@ module TestPiece1(){ ////toplevel
 	    ];
   corners = TestPiece_holes2corners(holes);
   difference(){
-    TileBase(corners[0], corners[3]);
-    InterlockNegative(corners[1], corners[3]);
+    TileBase(corners[0], corners[2]);
+    InterlockLobe(corners[1], corners[2], 1);
   }
   Posts(holes);
   RoundEdge(corners[0], corners[1]);
-  RoundEdge(corners[2], corners[0]);
+  RoundEdge(corners[3], corners[0]);
   RoundLeftCorner(corners[0], corners[1]);
 }
 
@@ -180,10 +182,10 @@ module TestPiece2(){ ////toplevel
 	    [  50, 0]
 	    ];
   corners = TestPiece_holes2corners(holes);
-  TileBase(corners[0], corners[3]);
+  TileBase(corners[0], corners[2]);
   Posts(holes);
   RoundEdge(corners[0], corners[1]);
-  Interlock(corners[2], corners[0]);
+  InterlockLobe(corners[3], corners[0]);
 }
 
 module Demo(){ ////toplevel