sewing-table: Tile00: try to use round corner for RH polygon (may want to revert?)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index ca06e6b926084b69233123584ca9c93f8df5a293..f89859cb197796621aecc9bfd1c17e612da27a8c 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -238,10 +238,11 @@ module RoundEdge(left_cnr, right_cnr) {
 }
 
 module RoundCornerCut(ci) {
-  // ci should be [this_cnr, right_cnr]
+  // ci should be [this_cnr, right_cnr, left_cnr]
   // where right_cnr is to the right (ie, anticlockwise)
   this_cnr = ci[0];
   right_cnr = ci[1];
+  left_cnr = ci[2];
   offr= round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     difference(){
@@ -255,6 +256,7 @@ module RoundCornerCut(ci) {
 module RoundCornerAdd(ci) {
   this_cnr = ci[0];
   right_cnr = ci[1];
+  left_cnr = ci[2];
   bigr = round_cnr_rad - round_edge_rad;
   INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
     intersection(){
@@ -744,19 +746,25 @@ 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