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=30a8d1db0f9588795e8f5485ef58103810f053a6;hp=68ec6ed8e5facfadee538ad33712589bb859b4d6;hb=b827aa24397af374e46f228e15b9f0584e970c95;hpb=f1fc47e81b133da0b15d078550d3fe3e0bc05fae

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 68ec6ed..30a8d1d 100644
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -241,21 +241,47 @@ 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);
+  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 )
 ')
 
 module RoundCorner_selector(ci, adj) {
   ROUNDCORNER_VARS;
-  cube(bigr*2 + adj, center=true);
+  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);
+  difference(){
+    RoundCorner_selector(ci, -0.1);
+    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
       translate([bigr, bigr, 0])
 	cylinder(center=true, h=20, r= bigr);
     }
@@ -264,9 +290,9 @@ module RoundCornerCut(ci) {
 
 module RoundCornerAdd(ci) {
   ROUNDCORNER_VARS;
-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    intersection(){
-      RoundCorner_selector(ci, +0.1);
+  intersection(){
+    RoundCorner_selector(ci, +0.1);
+    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
       translate([bigr, bigr, 0])
 	rotate_extrude(convexity=10, $fn=50)
 	translate([bigr, 0])
@@ -789,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);