sewing-table: RoundCorner rework: introduce ctr3 (nfc)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index e7ff1e9634820fc6b68c104a02048424b66d94a5..57f9f3d978d6d3aba91548d8dfd9957d9c5666ea 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -237,36 +237,70 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
-module RoundCornerCut(ci) {
-  // ci should be [this_cnr, right_cnr]
-  // where right_cnr is to the right (ie, anticlockwise)
+m4_define(`ROUNDCORNER_VARS',`
   this_cnr = ci[0];
   right_cnr = ci[1];
-  offr= round_cnr_rad - round_edge_rad;
-  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);
+  left_cnr = ci[2];
+  bigr= round_cnr_rad - round_edge_rad;
+  l_uvec = unitvector2d(left_cnr - this_cnr);
+  r_uvec = unitvector2d(right_cnr - this_cnr);
+  lp1 = left_cnr  + clockwise2d(l_uvec) * bigr;
+  lp2 = this_cnr  + clockwise2d(l_uvec) * bigr;
+  lp3 = this_cnr  - clockwise2d(r_uvec) * bigr;
+  lp4 = right_cnr - clockwise2d(r_uvec) * bigr;
+  ctr = line_intersection_2d(lp1,lp2,lp3,lp4);
+  ctr3 = concat(ctr,[0])
+')
+
+module RoundCorner_selector(ci, adj) {
+  ROUNDCORNER_VARS;
+  echo("RCS",l_uvec,ctr);
+  union(){
+    INREFFRAME(this_cnr, right_cnr) {
+      cube(bigr*2 + adj, center=true);
+    }
+  }
+  %translate(concat(ctr,[0])) circle(1);
+  if(0){
+  union(){
+    INREFFRAME(this_cnr, right_cnr) {
+//      %translate([ -bigr,-bigr,0 ])
+//     cube([bigr*2 + adj, bigr*3, bigr*2]);
     }
   }
+  union(){
+    INREFFRAME(this_cnr, left_cnr) {
+      %translate([ -bigr,-bigr,0 ])
+      cube(bigr*2 + adj);
+    }
+  }}
+}
+
+module RoundCornerCut(ci) {
+  // ci should be [this_cnr, right_cnr, left_cnr]
+  // where right_cnr is to the right (ie, anticlockwise)
+  ROUNDCORNER_VARS;
+  difference(){
+    RoundCorner_selector(ci, -0.1);
+    translate(ctr3)
+      cylinder(center=true, h=20, r= bigr);
+  }
 }
 
 module RoundCornerAdd(ci) {
-  this_cnr = ci[0];
-  right_cnr = ci[1];
-  bigr = round_cnr_rad - round_edge_rad;
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    intersection(){
-      cube(bigr*2 + 0.1, center=true);
-      translate([bigr, bigr, 0])
+  ROUNDCORNER_VARS;
+  intersection(){
+    RoundCorner_selector(ci, +0.1);
+    INREFFRAME_EDGE {
+      translate(ctr3){
        rotate_extrude(convexity=10, $fn=50)
-       translate([bigr, 0])
-       difference(){
+         translate([bigr, 0])
+         difference(){
          circle(r= round_edge_rad, $fn=50);
          mirror([1,1])
            square([20,20]);
-        }
+       }
+      }
     }
   }
 }
@@ -601,10 +635,6 @@ module FitTest_RearCurve(){ ////toplevel
   FitTest_general([110,0], [170,100]);
 }
 
-module FitTest_FrontCurve(){ ////toplevel
-  FitTest_general([110,-80], [170,80]);
-}
-
 module Tile02(){ ////toplevel
   sz = [100,170];
   c0 = tile02_tr + -sz;
@@ -748,19 +778,53 @@ module Tile00(){ ////toplevel
   rcs = [R_EDGE(c,1)];
   difference(){
     union(){
-      Rectangle_TileBase(c);
-      Posts(posts);
-      RoundEdge(R_EDGE(c,0));
-      RoundEdge(R_EDGE(c,1));
-      InterlockEdge(tile_01_00_cnr, c[0]);
+      difference(){
+       union(){
+         Rectangle_TileBase(c);
+         Posts(posts);
+         RoundEdge(R_EDGE(c,0));
+         RoundEdge(c[1], c1bis);
+         InterlockEdge(tile_01_00_cnr, c[0]);
+       }
+       RoundCornerCut(rcs);
+       translate([0,0,-20]) linear_extrude(height=40) {
+         polygon([ c1bis, c1bis + [50,0], c2bis + [50,0], c2bis ]);
+       }
+      }
+      RoundEdge(c1bis, c2bis);
     }
-    RoundCornerCut(rcs);
     Machine();
-    translate([0,0,-20]) linear_extrude(height=40) {
-      polygon([ c1bis, c1bis + [50,0], c2bis + [50,0], c2bis ]);
-    }
   }
   RoundCornerAdd(rcs);
+  RoundCornerAdd([c1bis,c2bis,c[1]]);
+}
+
+module FitTest_FrontCurve(){ ////toplevel
+  p0 = [110,-80];
+  sz = [170,80];
+  intersection() {
+    Tile00();
+    translate([0,0,-8]) linear_extrude(height=18) {
+      translate(p0) square(sz);
+    }
+  }
+}
+
+module RoundCornerDemo_plat(cnr){
+  mirror([0,0,1]) linear_extrude(height=1) polygon(cnr);
+}
+
+module RoundCornerDemo(){ ////toplevel
+  cnr = [ [0,0], [15,0], [-10,12] ];
+  translate([0,25,0]) RoundCornerDemo_plat(cnr);
+  translate([25,0,0]) RoundCornerAdd(cnr);
+  translate([-25,0,0]) RoundCornerCut(cnr);
+  translate([0,-25,0]) RoundCorner_selector(cnr, 0);
+  difference(){
+    RoundCornerDemo_plat(cnr);
+    RoundCornerCut(cnr);
+  }
+  RoundCornerAdd(cnr);
 }
 
 module Demo(){ ////toplevel