X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=sewing-table.scad.m4;h=a407c7aaab41cae439d68b5ff2a638e4551b20f4;hb=d574dce10de527d73623586e6537a5fd37ae347b;hp=3b498f3e10d80dcf9abf17feb1758a0029280075;hpb=046c818d05c54fe0e757120a82512adce1472f97;p=reprap-play.git

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 3b498f3..a407c7a 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -241,40 +241,65 @@ m4_define(`ROUNDCORNER_VARS',`
   this_cnr = ci[0];
   right_cnr = ci[1];
   left_cnr = ci[2];
-  bigr= round_cnr_rad - round_edge_rad
+  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)
 ')
 
 module RoundCorner_selector(ci, adj) {
-  r = round_cnr_rad - round_edge_rad;
-  cube(r*2 + adj, center=true);
+  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;
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    difference(){
-      RoundCorner_selector(ci, -0.1);
-      translate([bigr, bigr, 0])
-	cylinder(center=true, h=20, r= bigr);
-    }
+  difference(){
+    RoundCorner_selector(ci, -0.1);
+    translate(concat(ctr,[0]))
+      cylinder(center=true, h=20, r= bigr);
   }
 }
 
 module RoundCornerAdd(ci) {
   ROUNDCORNER_VARS;
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    intersection(){
-      RoundCorner_selector(ci, +0.1);
-      translate([bigr, bigr, 0])
+  intersection(){
+    RoundCorner_selector(ci, +0.1);
+    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]);
-        }
+	}
+      }
     }
   }
 }
@@ -789,10 +814,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);