X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=32d69b6978ed785b0792d70368fed428d630c6af;hb=0824b374676ae3b469557f964412c5488fa26472;hp=0d1e813cdeece80975517fb9663e23cb94ad1e43;hpb=378396c125ba134a2fa950bcf0c25b89a40ecb28;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 0d1e813..32d69b6 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -47,7 +47,7 @@ module Post(){
 
 module Posts(posts) {
   for (p= posts) {
-    translate([p[0], p[1], 0])
+    translate(concat(p, [0]))
       Post();
   }
 }
@@ -57,12 +57,12 @@ module TileBase(botleft_post, topright_post){
   size = topright_post - botleft_post + thehd * 2;
   difference(){
     mirror([0,0,1])
-      translate([botleft[0], botleft[1], 0])
-      cube([size[0], size[1], tile_th]);
-    translate( [ botleft_post[0], botleft_post[1], -tile_th ]
+      translate(concat(botleft, [0]))
+      cube(concat(size, [tile_th]));
+    translate( concat(botleft_post, [-tile_th])
 	       + 0.5 * [ post_dia, post_dia, 0 ] )
       Commitid_BestCount_M( topright_post-botleft_post
-			    + [0, thehd[0] ]
+			    + [0, thehd[1] ]
 			    + [-post_dia,-post_dia] );
   }
 }
@@ -84,12 +84,12 @@ m4_define(`INREFFRAME',`
 m4_dnl  INREFFRAME(left_post, right_post, morevars)
 m4_dnl    INREFFRAME_EDGE { body; }
 m4_define(`INREFFRAME_EDGE',`
-  translate([-thehd[1], -thehd[0], -round_edge_rad])
+  translate(concat(-thehd, [-round_edge_rad]))
 ')
 
 module RoundEdge(left_post, right_post) {
   INREFFRAME(left_post, right_post,
-	      `tlength = length + thehd[1] * 2;') m4_dnl '
+	      `tlength = length + thehd[0] * 2;') m4_dnl '
     INREFFRAME_EDGE {
     difference(){
       rotate([0,90,0])
@@ -113,7 +113,7 @@ module RoundLeftCorner(this_post, right_post) {
 module InterlockCore(r, plusth, ymir) {
   dx = sqrt(3) * r;
   $fn= 80;
-  translate([0, -thehd[0], plusth]){
+  translate([0, -thehd[1], plusth]){
     mirror([0,ymir,0]){
       mirror([0,0,1]){
 	linear_extrude(height=tile_th+plusth*2, convexity=10){
@@ -165,12 +165,12 @@ module TestPiece2(){ ////toplevel
   RoundEdge(holes[0], holes[1]);
   Interlock(holes[0], holes[0] + [0, -1]);
 }
- 
+
 module Demo(){
-  translate([ -thehd[1], 0 ])
+  translate([ -thehd[0], 0 ])
     color("blue")
     TestPiece1();
-  translate([ +thehd[1], 0 ])
+  translate([ +thehd[0], 0 ])
     TestPiece2();
 }