X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=wardrobe-hook.scad;h=959e967a78bd316ebb3345f182b8f7bcd00811d3;hp=17885e27698619efa23c51b0d853bc84f421820f;hb=464ea5bfb20555916aa523b6d2745805347b4245;hpb=79e0be459398aa3553589c731eca7296d60fb8b9;ds=sidebyside

diff --git a/wardrobe-hook.scad b/wardrobe-hook.scad
index 17885e2..959e967 100644
--- a/wardrobe-hook.scad
+++ b/wardrobe-hook.scad
@@ -1,29 +1,7 @@
 // -*- C -*-
 
 include <funcs.scad>
-
-module FArcSegment_mask(beta) {
-  for (i=[0 : 0.75 : 3]) {
-    rotate(i*beta/4)
-      polygon([[0, 0],
-	       [1, 0],
-	       [cos(beta/4), sin(beta/4)]]);
-  }
-}
-
-module FArcSegment(xc,yc,inrad,outrad,alpha,delta) {
-  translate([xc,yc]) {
-    intersection() {
-      difference() {
-	circle(r=outrad, $fn=70);
-	circle(r=inrad, $fn=70);
-      }
-      rotate(alpha) scale(outrad*2) {
-	FArcSegment_mask(delta);
-      }
-    }
-  }
-}
+include <utils.scad>
 
 tubeslop = 0.5;
 tubeheight = 30 + tubeslop;
@@ -139,37 +117,55 @@ module SElevation(){
 	   [-1,         boty]]);
 }
 
+module SElevationPlaced(){
+  rotate([0,-90,0]) translate([0,0,-100]) linear_extrude(height=200)
+    SElevation();
+}
+
 module SHookL(){ ///toplevel
   intersection(){
     linear_extrude(height=topwidth) SPlan();
-    rotate([0,-90,0]) translate([0,0,-100]) linear_extrude(height=200)
-      SElevation();
+    SElevationPlaced();
   }
 }
 
 // straight-on version, reversed, everything prefixed with t or T
 
-tjoinrad = 5;
+tjoinrad = mainoutrad * 0.7;
+tstem0leny = tuberad - tjoinrad*0.5;
 tjoinoutrad = tjoinrad + mainthick;
 
 thookcy = shookcy;
-tstem0leny = tuberad;
 
 tjoin0c = [tuberad - tjoinrad, -tstem0leny];
 tjoin1c = [0,                      thookcy];
 
 tbend_raw = tangents_intersect_beta(tjoin0c, tjoinrad,
 				    tjoin1c, -hookoutrad);
-echo(tbend_raw);
 tbend0 = angle_map_range(tbend_raw,       0);
 tbend1 = angle_map_range(tbend_raw + 180, -180);
 
+tbend0p = circle_point(tjoin0c, tjoinrad, tbend_raw);
+tbend1p = circle_point(tjoin1c, -hookoutrad, tbend_raw);
+
 module TPlan(){
   ClipPlan(0, tstem0leny);
   FArcSegment(tjoin0c[0],tjoin0c[1], tjoinrad,tjoinoutrad,
 	      tbend0, 360-tbend0);
   FArcSegment(0,shookcy, hookinrad,hookoutrad,
 	      tbend1, 270+hookcurl - tbend1);
+  translate(tbend0p) {
+    rotate(tbend_raw+180) mirror([1,0]) {
+      translate([0,-0.1]) square(size=[mainthick, dist2d(tbend0p,tbend1p)+0.2]);
+    }
+  }
+}
+
+module THookR(){ ///toplevel
+  intersection(){
+    linear_extrude(height=topwidth) TPlan();
+    SElevationPlaced();
+  }
 }
 
 // other toplevels etc.
@@ -182,9 +178,15 @@ module SHookR(){ ////toplevel
   mirror([1,0,0]) SHookL();
 }
 
+module THookL(){ ////toplevel
+  mirror([1,0,0]) THookR();
+}
+
 module Demo(){ ////toplevel
   translate([-30,tubeheight,0]) HookL();
   translate([  0,tubeheight,0]) HookR();
   translate([ 30,         0,0]) SHookL();
   translate([ 60,         0,0]) SHookR();
+  translate([ 90,         0,0]) THookL();
+  translate([120,         0,0]) THookR();
 }