sewing-table: InterlockLobe*: Move negative-dependent calculations into Core (nfc)

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 2d48d82e63e661870c20e34876677caa62f05135..dd3f0f1c25afbe190e30e1220049400435f92c4e 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -139,7 +139,10 @@ module InterlockLobePlan(r, ymir) {
   }
 }
 
   }
 }
 

-module InterlockLobeCore(r, plusth, ymir) {
+module InterlockLobeCore(negative=0) {
+  r = negative ? interlock_negative_rad : interlock_rad;
+  plusth = negative * 1.0;
+  ymir = negative ? 0 : 1;

   translate([0, 0, plusth]){
     mirror([0,0,1]){
       linear_extrude(height=tile_th+plusth*2, convexity=10){
   translate([0, 0, plusth]){
     mirror([0,0,1]){
       linear_extrude(height=tile_th+plusth*2, convexity=10){


@@ -151,9 +154,7 @@ module InterlockLobeCore(r, plusth, ymir) {
 
 module InterlockLobe(this_cnr, right_cnr, negative=0) {
   INREFFRAME(this_cnr, right_cnr)
 
 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);
+    InterlockLobeCore(negative);

 }
 
 function TestPiece_holes2corners(holes) =
 }
 
 function TestPiece_holes2corners(holes) =