From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 1 Jan 2017 22:10:56 +0000 (+0000)
Subject: sewing-table: wip change to edge referent (holes =>: corners (nfc)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=88c2b61b1c55801655d043dca12dd39c8d8f860a

sewing-table: wip change to edge referent (holes =>: corners (nfc)

Change RoundEdge, RoundLeftCorner and Interlock arguments
---

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index fe32ca5..018ab45 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -80,7 +80,7 @@ module TileBase(botleft, topright){
   }
 }
 
-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 +94,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])
@@ -126,7 +125,7 @@ module RoundLeftCorner(this_post, right_post) {
 module InterlockCore(r, plusth, ymir) {
   dx = sqrt(3) * r;
   $fn= 80;
-  translate([0, -thehd[1], plusth]){
+  translate([thehd[0], 0, plusth]){
     mirror([0,ymir,0]){
       mirror([0,0,1]){
 	linear_extrude(height=tile_th+plusth*2, convexity=10){
@@ -145,13 +144,13 @@ module InterlockCore(r, plusth, ymir) {
   }
 }
 
-module InterlockNegative(this_post, right_post) {
-  INREFFRAME(this_post, right_post)
+module InterlockNegative(this_cnr, right_cnr) {
+  INREFFRAME(this_cnr, right_cnr)
     InterlockCore(interlock_negative_rad, 1, 0);
 }
 
-module Interlock(this_post, right_post) {
-  INREFFRAME(this_post, right_post)
+module Interlock(this_cnr, right_cnr) {
+  INREFFRAME(this_cnr, right_cnr)
     InterlockCore(interlock_rad, 0, 1);
 }
 
@@ -168,12 +167,12 @@ module TestPiece1(){ ////toplevel
   corners = TestPiece_holes2corners(holes);
   difference(){
     TileBase(corners[0], corners[3]);
-    InterlockNegative(holes[1], holes[1] + [0,1]);
+    InterlockNegative(corners[1], corners[3]);
   }
   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[2], corners[0]);
+  RoundLeftCorner(corners[0], corners[1]);
 }
 
 module TestPiece2(){ ////toplevel
@@ -183,8 +182,8 @@ module TestPiece2(){ ////toplevel
   corners = TestPiece_holes2corners(holes);
   TileBase(corners[0], corners[3]);
   Posts(holes);
-  RoundEdge(holes[0], holes[1]);
-  Interlock(holes[0], holes[0] + [0, -1]);
+  RoundEdge(corners[0], corners[1]);
+  Interlock(corners[2], corners[0]);
 }
 
 module Demo(){ ////toplevel