sewing-table: RoundCorner rework: introduce ctr3 (nfc)

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

diff --git a/sewing-table.scad.m4 b/sewing-table.scad.m4
index 4befae1df03c4003c787e3f9f587f348e8fce5a7..57f9f3d978d6d3aba91548d8dfd9957d9c5666ea 100644 (file)
--- a/sewing-table.scad.m4
+++ b/sewing-table.scad.m4
@@ -241,14 +241,39 @@ m4_define(`ROUNDCORNER_VARS',`
   this_cnr = ci[0];
   right_cnr = ci[1];
   left_cnr = ci[2];
   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);
+  ctr3 = concat(ctr,[0])

 ')
 
 module RoundCorner_selector(ci, adj) {
   ROUNDCORNER_VARS;
 ')
 
 module RoundCorner_selector(ci, adj) {
   ROUNDCORNER_VARS;

-  INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-    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) {
 }
 
 module RoundCornerCut(ci) {


@@ -257,10 +282,8 @@ module RoundCornerCut(ci) {
   ROUNDCORNER_VARS;
   difference(){
     RoundCorner_selector(ci, -0.1);
   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(ctr3)
+      cylinder(center=true, h=20, r= bigr);

   }
 }
 
   }
 }
 


@@ -268,15 +291,16 @@ module RoundCornerAdd(ci) {
   ROUNDCORNER_VARS;
   intersection(){
     RoundCorner_selector(ci, +0.1);
   ROUNDCORNER_VARS;
   intersection(){
     RoundCorner_selector(ci, +0.1);

-    INREFFRAME(this_cnr, right_cnr) INREFFRAME_EDGE {
-      translate([bigr, bigr, 0])
+    INREFFRAME_EDGE {
+      translate(ctr3){

        rotate_extrude(convexity=10, $fn=50)
        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]);
          circle(r= round_edge_rad, $fn=50);
          mirror([1,1])
            square([20,20]);

-        }
+       }
+      }

     }
   }
 }
     }
   }
 }


@@ -791,10 +815,11 @@ module RoundCornerDemo_plat(cnr){
 }
 
 module RoundCornerDemo(){ ////toplevel
 }
 
 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]) 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);
   difference(){
     RoundCornerDemo_plat(cnr);
     RoundCornerCut(cnr);