sewing-table: new front profile wip

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 3e317e00b0d35802d7ab1ef7ad2959bfe1199736..64f144bce908fa5eec60b873cf500b54d725f599 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -205,6 +205,19 @@ module TileBase(botleft, topright){
   }
 }
 
+m4_dnl   R_EDGE(c,ix)
+m4_dnl        c is from Rectangle_corners and
+m4_dnl        ix is a corner number
+m4_dnl    expands to two comma-separated corners:
+m4_dnl    that denoted by ix, and the next one anticlockwise
+m4_define(`R_EDGE',`$1[$2], $1[(($2)+1)%4]')
+
+m4_dnl   R_CNR(c,ix)
+m4_dnl        c is from Rectangle_corners and
+m4_dnl        ix is a corner number
+m4_dnl    expands to an array of corners as for RoundCorner
+m4_define(`R_CNR',`[ $1[$2], $1[(($2)+1)%4], $1[(($2)+3)%4] ]')
+
 m4_dnl  INREFFRAME(left_cnr, right_cnr, morevars) { body; }
 m4_define(`INREFFRAME',`
   length_vec = ($2) - ($1);
@@ -237,43 +250,68 @@ module RoundEdge(left_cnr, right_cnr) {
   }
 }
 
+m4_define(`ROUNDCORNER_VARS',`
+  this_cnr = ci[0];
+  right_cnr = ci[1];
+  left_cnr = ci[2];
+  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) {
-  r = round_cnr_rad - round_edge_rad;
-  cube(r*2 + adj, center=true);
+  ROUNDCORNER_VARS;
+  intersection(){
+    union(){
+      INREFFRAME(ctr3,concat(lp1,[4])){
+       translate([0,0,-bigr]) linear_extrude(height=bigr*2) {
+         translate([-bigr*2 + adj, -bigr])
+           square([bigr*2, bigr*3]);
+       }
+      }
+    }
+    union(){
+      INREFFRAME(ctr3,concat(lp4,[0])){
+       translate([0,0,-bigr]) linear_extrude(height=bigr*2) {
+         translate([-bigr*2, -bigr*2])
+           square([bigr*2 + adj, bigr*3]);
+       }
+      }
+    }
+  }
 }
 
 module RoundCornerCut(ci) {
   // 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(){
-      RoundCorner_selector(ci, -0.1);
-      translate([offr, offr, 0])
-       cylinder(center=true, h=20, r= offr);
-    }
+  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(){
-      RoundCorner_selector(ci, +0.1);
-      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]);
-        }
+       }
+      }
     }
   }
 }
@@ -362,7 +400,7 @@ module TestPiece1(){ ////toplevel
            [   0, 0]
            ];
   corners = TestPiece_holes2corners(holes);
-  rcs = [corners[0], corners[1]];
+  rcs = R_CNR(corners,0);
   difference(){
     union(){
       TileBase(corners[0], corners[2]);
@@ -572,13 +610,6 @@ module Rectangle_TileBase(c) { TileBase(c[0], c[2]); }
 
 function Posts_interpolate_one(c0,c1) = [c0, (c0+c1)/2, c1];
 
-m4_dnl   R_EDGE(c,ix)
-m4_dnl        c is from Rectangle_corners and
-m4_dnl        ix is a corner number
-m4_dnl    expands to two comma-separated corners:
-m4_dnl    that denoted by ix, and the next one anticlockwise
-m4_define(`R_EDGE',`$1[$2],$1[(($2)+1)%4]')
-
 module FitTest_general(c0,sz, dobrace=false){
   c = Rectangle_corners(c0, sz);
   brace = [7,7,9];
@@ -613,7 +644,7 @@ module Tile02(){ ////toplevel
   c0 = tile02_tr + -sz;
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
-  rcs = [R_EDGE(c,0)];
+  rcs = R_CNR(c,0);
   difference(){
     union(){
       Rectangle_TileBase(c);
@@ -633,7 +664,7 @@ module Tile12(){ ////toplevel
   c0 = tile02_tr + [-sz[0], 0];
   c = Rectangle_corners(c0, sz);
   posts = Rectangle_corners2posts(c);
-  rcs = [R_EDGE(c,3)];
+  rcs = R_CNR(c,3);
   difference(){
     union(){
       Rectangle_TileBase(c);
@@ -713,7 +744,7 @@ module Tile10(){ ////toplevel
            cnr_posts[1] + [ 0,                             rcy ],
            cnr_posts[2],
            cnr_posts[3] ];
-  rcs = [R_EDGE(c,2)];
+  rcs = R_CNR(c,2);
   difference(){
     union(){
       Rectangle_TileBase(c);
@@ -748,7 +779,8 @@ module Tile00(){ ////toplevel
            cnr_posts[2] + [ -sz[0] + rearedge_len - cutout_l_end_x, -cty ],
            cnr_posts[3] + [ 0,                             -cty ]
            ];
-  rcs = [R_EDGE(c,1)];
+  rcs = R_CNR(c,1);
+  rc2 = [c1bis,c2bis,c[1]];
   difference(){
     union(){
       difference(){
@@ -767,9 +799,10 @@ module Tile00(){ ////toplevel
       RoundEdge(c1bis, c2bis);
     }
     Machine();
+    RoundCornerCut(rc2);
   }
   RoundCornerAdd(rcs);
-  RoundCornerAdd([c1bis,c2bis,c[1]]);
+  RoundCornerAdd(rc2);
 }
 
 module FitTest_FrontCurve(){ ////toplevel
@@ -788,10 +821,11 @@ module RoundCornerDemo_plat(cnr){
 }
 
 module RoundCornerDemo(){ ////toplevel
-  cnr = [ [0,0], [15,0], [-10,10] ];
+  cnr = [ [-2,-3], [13,-3], [-12,9] ];
   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);