X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=sewing-table.scad.m4;h=57f9f3d978d6d3aba91548d8dfd9957d9c5666ea;hp=27fb69ccacfe6f147f4cb483cc898c8582d51fee;hb=53c1920a14c52f41dea136b9dee91bdf91d0ceb5;hpb=a74531273748849560c97d4d3ac1690fa0e07525

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 27fb69c..57f9f3d 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -237,38 +237,70 @@ 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;
-  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);
+  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];
-  left_cnr = ci[2];
-  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]);
-        }
+	}
+      }
     }
   }
 }
@@ -783,10 +815,11 @@ module RoundCornerDemo_plat(cnr){
 }
 
 module RoundCornerDemo(){ ////toplevel
-  cnr = [ [0,0], [15,0], [-10,10] ];
+  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);