sewing-table: RoundCorner rework: use new centres

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 30a8d1db0f9588795e8f5485ef58103810f053a6..a407c7aaab41cae439d68b5ff2a638e4551b20f4 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -244,11 +244,11 @@ m4_define(`ROUNDCORNER_VARS',`
   bigr= round_cnr_rad - round_edge_rad;
   l_uvec = unitvector2d(left_cnr - this_cnr);
   r_uvec = unitvector2d(right_cnr - this_cnr);
-  ctr = line_intersection_2d(
-      left_cnr  - clockwise2d(r_uvec) * round_cnr_rad,
-      this_cnr  - clockwise2d(r_uvec) * round_cnr_rad,
-      this_cnr  + clockwise2d(l_uvec) * round_cnr_rad,
-      right_cnr + clockwise2d(l_uvec) * round_cnr_rad )
+  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)
 ')
 
 module RoundCorner_selector(ci, adj) {
@@ -281,10 +281,8 @@ module RoundCornerCut(ci) {
   ROUNDCORNER_VARS;
   difference(){
     RoundCorner_selector(ci, -0.1);
-    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-      translate([bigr, bigr, 0])
-       cylinder(center=true, h=20, r= bigr);
-    }
+    translate(concat(ctr,[0]))
+      cylinder(center=true, h=20, r= bigr);
   }
 }
 
@@ -292,15 +290,16 @@ module RoundCornerAdd(ci) {
   ROUNDCORNER_VARS;
   intersection(){
     RoundCorner_selector(ci, +0.1);
-    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-      translate([bigr, bigr, 0])
+    INREFFRAME_EDGE {
+      translate(concat(ctr,[0])){
        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]);
-        }
+       }
+      }
     }
   }
 }