sewing-table: make corners be cycles (nfc)

[reprap-play.git] / sewing-table.scad.m4

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 018ab450147296532ace1785f73d0c34b81cd304..b5ee987370ca4272e9687b97106b90797b7d8483 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -122,28 +122,34 @@ module RoundLeftCorner(this_cnr, right_cnr) {
   }
 }
 
-module InterlockCore(r, plusth, ymir) {
+module InterlockPlan(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 InterlockCore(r, plusth, ymir) {
+  translate([0, 0, plusth]){
+    mirror([0,0,1]){
+      linear_extrude(height=tile_th+plusth*2, convexity=10){
+       InterlockPlan(r, ymir);
+      }
+    }
+  }
+}
+
 module InterlockNegative(this_cnr, right_cnr) {
   INREFFRAME(this_cnr, right_cnr)
     InterlockCore(interlock_negative_rad, 1, 0);
@@ -157,8 +163,8 @@ module Interlock(this_cnr, right_cnr) {
 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 +172,12 @@ module TestPiece1(){ ////toplevel
            ];
   corners = TestPiece_holes2corners(holes);
   difference(){
-    TileBase(corners[0], corners[3]);
-    InterlockNegative(corners[1], corners[3]);
+    TileBase(corners[0], corners[2]);
+    InterlockNegative(corners[1], corners[2]);
   }
   Posts(holes);
   RoundEdge(corners[0], corners[1]);
-  RoundEdge(corners[2], corners[0]);
+  RoundEdge(corners[3], corners[0]);
   RoundLeftCorner(corners[0], corners[1]);
 }
 
@@ -180,10 +186,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]);
+  Interlock(corners[3], corners[0]);
 }
 
 module Demo(){ ////toplevel