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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index fe32ca5..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,12 +74,12 @@ 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]]);
   }
 }
 
-m4_dnl  INREFFRAME(left_post, right_post, morevars) { body; }
+m4_dnl  INREFFRAME(left_cnr, right_cnr, morevars) { body; }
 m4_define(`INREFFRAME',`
   length_vec = ($2) - ($1);
   length = dist2d([0,0], length_vec);
@@ -94,27 +93,26 @@ m4_define(`INREFFRAME',`
   multmatrix(m)
 ')
 
-m4_dnl  INREFFRAME(left_post, right_post, morevars)
+m4_dnl  INREFFRAME(left_cnr, right_cnr, morevars)
 m4_dnl    INREFFRAME_EDGE { body; }
 m4_define(`INREFFRAME_EDGE',`
-  translate(concat(-thehd, [-round_edge_rad]))
+  translate([0,0, -round_edge_rad])
 ')
 
-module RoundEdge(left_post, right_post) {
-  INREFFRAME(left_post, right_post,
-	      `tlength = length + thehd[0] * 2;') m4_dnl '
+module RoundEdge(left_cnr, right_cnr) {
+  INREFFRAME(left_cnr, right_cnr)
     INREFFRAME_EDGE {
     difference(){
       rotate([0,90,0])
-	cylinder(r= round_edge_rad, h= tlength, $fn=50);
+	cylinder(r= round_edge_rad, h= length, $fn=50);
       translate([-1, 0, -20])
-	cube([tlength+2, 20, 20]);
+	cube([length+2, 20, 20]);
     }
   }
 }
 
-module RoundLeftCorner(this_post, right_post) {
-  INREFFRAME(this_post, right_post) INREFFRAME_EDGE {
+module RoundLeftCorner(this_cnr, right_cnr) {
+  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
       sphere(r= round_edge_rad, $fn=60);
       translate([0,0, -20])
@@ -123,43 +121,46 @@ module RoundLeftCorner(this_post, right_post) {
   }
 }
 
-module InterlockCore(r, plusth, ymir) {
+module InterlockLobePlan(r, ymir) {
   dx = sqrt(3) * r;
   $fn= 80;
-  translate([0, -thehd[1], 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_post, right_post) {
-  INREFFRAME(this_post, right_post)
-    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_post, right_post) {
-  INREFFRAME(this_post, right_post)
-    InterlockCore(interlock_rad, 0, 1);
+module InterlockLobe(this_cnr, right_cnr, negative=0) {
+  INREFFRAME(this_cnr, right_cnr)
+    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],
@@ -167,13 +168,13 @@ module TestPiece1(){ ////toplevel
 	    ];
   corners = TestPiece_holes2corners(holes);
   difference(){
-    TileBase(corners[0], corners[3]);
-    InterlockNegative(holes[1], holes[1] + [0,1]);
+    TileBase(corners[0], corners[2]);
+    InterlockLobe(corners[1], corners[2], 1);
   }
   Posts(holes);
-  RoundEdge(holes[0], holes[1]);
-  RoundEdge(holes[0] + [ 0, 0.1 ], holes[0]);
-  RoundLeftCorner(holes[0], holes[1]);
+  RoundEdge(corners[0], corners[1]);
+  RoundEdge(corners[3], corners[0]);
+  RoundLeftCorner(corners[0], corners[1]);
 }
 
 module TestPiece2(){ ////toplevel
@@ -181,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(holes[0], holes[1]);
-  Interlock(holes[0], holes[0] + [0, -1]);
+  RoundEdge(corners[0], corners[1]);
+  InterlockLobe(corners[3], corners[0]);
 }
 
 module Demo(){ ////toplevel