fairphone-case: wip prop profile, fixes

[reprap-play.git] / fairphone-case.scad

diff --git a/fairphone-case.scad b/fairphone-case.scad
index c321dbec7f66965c9455d091f470b61251eb5348..5013bc16b9419ecab103d21408677346ac31ef85 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -121,7 +121,7 @@ prop_main_width = 3;
 prop_side_gap = 0.75; // each side
 prop_lidrecess_behind = 0.75;
 prop_caserecess_behind = 0.75;
-prop_caserecess_taper = 0.35; // one side only
+prop_caserecess_taper = 0.45; // one side only
 prop_prop_gap = 0.5;
 prop_prong_heel_slope = 0.5;
 
@@ -636,7 +636,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
 
   theta = 90 - alpha;
   beta = 180 - alpha - gamma;
-  psi = 90 - beta + atan(prop_caserecess_taper);
+  psi = 90 - beta;
 
   echo("abc", a,b,c);
 
@@ -654,7 +654,7 @@ module PropProfile(gamma, cut=0){ ////toplevel
   prpp3 = prpp1 +
     v1[0] * -prp_r1 +
     v1[1] * ((prcp2[1] - prcp1[1]) - prop_prop_gap);
-  prpp12 = prpp3 + [1,0] *
+  prpp12 = prpp3 + v1[0] *
     (prop_end_dia + prop_caserecess_taper * (prpp1[1] - prpp3[1]));
   prp_r8 = prop_main_th;
   prpp4 = [ prop_main_th/2, prpp3[1] ];
@@ -666,23 +666,24 @@ module PropProfile(gamma, cut=0){ ////toplevel
   prpp8 = prpp4 + [0,-1] * prp_r8;
   prpp9 = prpp8 + [-1,0] * prp_r8;
 
-  //#circleat(prpp5,1);
+  //#circleat(prpp3,1);
+  //#circleat(prpp12,1);
 
   if (!cut) {
     hull(){
       translate(prpp8)
        intersection(){
          circle(prp_r8);
-         rectfromto([-20,-0], [20,20]);
+         polygon([[-20,-0], [0,0], [20,20]]);
         }
       rectfromto(prpp6, prpp9);
       translate(prpp5) intersection(){
        circle(prp_r5);
-       rectfromto([-10,-10], [10,0]);
+       polygon([[-10,-10], [0,0], [10,0]]);
       }
       rectfromto(prpp12 + [0,-0.1], prpp3);
     }
-    %hull(){
+    hull(){
       circleat(prpp1, prp_r1);
       rectfromto(prpp12 + [0,-0.1], prpp3);
     }
@@ -1113,7 +1114,7 @@ module DemoProfiles(){ ////toplevel
        //PropProfile(10, 1);
     }
     translate(prlp10)
-      PropProfile(15, 0);
+      PropProfile(45, 0);
   }
 }