sewing-table: RoundCorner: introduce ROUNDCORNER_VARS (nfc)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index f89859cb197796621aecc9bfd1c17e612da27a8c..3b498f3e10d80dcf9abf17feb1758a0029280075 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -237,30 +237,36 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
-module RoundCornerCut(ci) {
-  // ci should be [this_cnr, right_cnr, left_cnr]
-  // where right_cnr is to the right (ie, anticlockwise)
+m4_define(`ROUNDCORNER_VARS',`
   this_cnr = ci[0];
   right_cnr = ci[1];
   left_cnr = ci[2];
-  offr= round_cnr_rad - round_edge_rad;
+  bigr= round_cnr_rad - round_edge_rad
+')
+
+module RoundCorner_selector(ci, adj) {
+  r = round_cnr_rad - round_edge_rad;
+  cube(r*2 + adj, center=true);
+}
+
+module RoundCornerCut(ci) {
+  // ci should be [this_cnr, right_cnr, left_cnr]
+  // where right_cnr is to the right (ie, anticlockwise)
+  ROUNDCORNER_VARS;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
-      cube(offr*2 - 0.1, center=true);
-      translate([offr, offr, 0])
-       cylinder(center=true, h=20, r= offr);
+      RoundCorner_selector(ci, -0.1);
+      translate([bigr, bigr, 0])
+       cylinder(center=true, h=20, r= bigr);
     }
   }
 }
 
 module RoundCornerAdd(ci) {
-  this_cnr = ci[0];
-  right_cnr = ci[1];
-  left_cnr = ci[2];
-  bigr = round_cnr_rad - round_edge_rad;
+  ROUNDCORNER_VARS;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     intersection(){
-      cube(bigr*2 + 0.1, center=true);
+      RoundCorner_selector(ci, +0.1);
       translate([bigr, bigr, 0])
        rotate_extrude(convexity=10, $fn=50)
        translate([bigr, 0])
@@ -778,6 +784,22 @@ module FitTest_FrontCurve(){ ////toplevel
   }
 }
 
+module RoundCornerDemo_plat(cnr){
+  mirror([0,0,1]) linear_extrude(height=1) polygon(cnr);
+}
+
+module RoundCornerDemo(){ ////toplevel
+  cnr = [ [0,0], [15,0], [-10,10] ];
+  translate([0,25,0]) RoundCornerDemo_plat(cnr);
+  translate([25,0,0]) RoundCornerAdd(cnr);
+  translate([-25,0,0]) RoundCornerCut(cnr);
+  difference(){
+    RoundCornerDemo_plat(cnr);
+    RoundCornerCut(cnr);
+  }
+  RoundCornerAdd(cnr);
+}
+
 module Demo(){ ////toplevel
   translate(demo_slop*[-2,1]) color("blue") Tile12();
   translate(demo_slop*[-2,0]) color("red")  Tile02();