sewing-table: RoundCorner: Introduce selector (nfc)

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 27fb69ccacfe6f147f4cb483cc898c8582d51fee..3e317e00b0d35802d7ab1ef7ad2959bfe1199736 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -237,6 +237,11 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
   }
 }
 

+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)
 module RoundCornerCut(ci) {
   // ci should be [this_cnr, right_cnr, left_cnr]
   // where right_cnr is to the right (ie, anticlockwise)


@@ -246,7 +251,7 @@ module RoundCornerCut(ci) {
   offr= round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
   offr= round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){

-      cube(offr*2 - 0.1, center=true);
+      RoundCorner_selector(ci, -0.1);

       translate([offr, offr, 0])
        cylinder(center=true, h=20, r= offr);
     }
       translate([offr, offr, 0])
        cylinder(center=true, h=20, r= offr);
     }


@@ -260,7 +265,7 @@ module RoundCornerAdd(ci) {
   bigr = round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     intersection(){
   bigr = round_cnr_rad - round_edge_rad;
   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])
       translate([bigr, bigr, 0])
        rotate_extrude(convexity=10, $fn=50)
        translate([bigr, 0])