wardrobe-hook: TPlan: fix not-quite-overlapping square

[reprap-play.git] / wardrobe-hook.scad

diff --git a/wardrobe-hook.scad b/wardrobe-hook.scad
index b746a1f8e03e8a213241675f61fb1f6debd68c4a..bf5b63e357be1d9a1e3d3924ae75823cd83b13c8 100644 (file)
--- a/wardrobe-hook.scad
+++ b/wardrobe-hook.scad
@@ -139,11 +139,48 @@ 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 = mainoutrad * 0.7;
+tstem0leny = tuberad - tjoinrad*0.5;
+tjoinoutrad = tjoinrad + mainthick;
+
+thookcy = shookcy;
+
+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]);
+    }
   }
 }