earring-stand: fix r1

[reprap-play.git] / earring-stand.scad

diff --git a/earring-stand.scad b/earring-stand.scad
index e87f1509fe3adb2850a72822f524158958932d70..2cfb8dc8dcf1c096c393ae189f974248c3a5de46 100644 (file)
--- a/earring-stand.scad
+++ b/earring-stand.scad
@@ -9,6 +9,9 @@ eclip_inner_xstrt = 0.5;
 eclip_ult_angle = 44;
 eclip_base_epsilon = 0.5;
 
+test_alpha = 10;
+test_main_th = 1.5;
+
 // calculated
 
 include <utils.scad>
@@ -16,10 +19,12 @@ include <utils.scad>
 eclip_inner_strt = eclip_outer_strt + eclip_inner_xstrt;
 
 r0 = eclip_inner_rad;
-r1 = r0 + eclip_inner_rad;
+r1 = r0 + eclip_gap_rad;
 r2 = r1 + eclip_prong_th;
 r2e = r1 + eclip_base_epsilon;
 
+ppxl = -(r0 / sqrt(2)) + (eclip_inner_strt / sqrt(2));
+
 $fn=70;
 
 module EclipLPlanCore(alpha){
@@ -42,12 +47,17 @@ module EclipLPlan(alpha){
   rotate(alpha) EclipLPlanCore(alpha);
 }
 
-module EclipPPlanCore(){
-  hull(){
-    circle(r0);
-    rotate(45) square([r0,r0]);
+module EclipPPlan(main_th){
+  intersection(){
+    hull(){
+      circle(r0);
+      rotate(90-eclip_ult_angle) square([r0,r0]);
+    }
+    translate([-(r0+.1), -(r0+.1)])
+      square([(r0+.1) + main_th + ppxl, r2*2]);
   }
+  translate([ppxl, 0]) square([main_th, r2]);
 }
 
-color("red") EclipLPlanCore(10);
-color("blue") EclipPPlanCore(10);
+color("red") EclipLPlan(test_alpha);
+color("blue") rotate(test_alpha) EclipPPlan(test_main_th);