X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=fairphone-case.scad;h=5da56cfc67249d818ce2208a3292dcd279960b7f;hb=29b27557a1a213096b515fafba33e2cf15fff5e0;hp=7bd4f3f2fb89eaaa154d8e0a42bc47535c78f45d;hpb=8ef9d91f0d8a958a8829bdcae86637df2b52179a;p=reprap-play.git

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 7bd4f3f..5da56cf 100644
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -277,10 +277,10 @@ prlp10 = lpp10 + [1,1] * prl_r10o
 
 // prop
 
-prpp10 = [0,0];
-prpp11 = [0, prop_taper_len];
+$prpp10 = [0,0];
+$prpp11 = [0, prop_taper_len];
 
-prp_r10 = prl_r10;
+$prp_r10 = prl_r10;
 
 // ---------- modules ----------
 
@@ -624,19 +624,19 @@ module CaseBase(){
 
 function prop_x(gamma) = hp_k / (2 * sin(gamma/2)) - hppT[0];
 
-module PropProfile(gamma, cut=0, rot=0){ ////toplevel
+module PropProfileAssignments(gamma){
   // https://en.wikipedia.org/wiki/Solution_of_triangles#Two_sides_and_the_included_angle_given_(SAS)
   x = prop_x(gamma);
   p = phone_height - prlp10[0] - hppB[0];
   b = p + x;
 
-  q = phone_height - hppT[0]; // prpp7[0] is 0 by definition
+  q = phone_height - hppT[0]; // $prpp7[0] is 0 by definition
   a = q + x;
   c = sqrt(a*a + b*b - 2*a*b*cos(gamma));
-  alpha = acos( (b*b + c*c - a*a) / (2*b*c) );
+  $prp_alpha = acos( (b*b + c*c - a*a) / (2*b*c) );
 
-  theta = 90 - alpha;
-  beta = 180 - alpha - gamma;
+  $prp_theta = 90 - $prp_alpha;
+  beta = 180 - $prp_alpha - gamma;
   psi = 90 - beta;
 
   //echo("abc", a,b,c);
@@ -644,58 +644,65 @@ module PropProfile(gamma, cut=0, rot=0){ ////toplevel
   v1 = [ [ cos(psi), -sin(psi) ],    // x
 	 [ sin(psi),  cos(psi) ] ];  // y
 
-  prpp7 = [0, c + (lpp13[1] - prpp10[1]) ];
+  $prpp7 = [0, c + (lpp13[1] - $prpp10[1] - hp_k) ];
 
-  prp_r1 = prc_r1;
-  prp_r11 = prop_main_th/2;
+  $prp_r1 = prc_r1;
+  $prp_r11 = prop_main_th/2;
 
-  prpp1 = prpp7 + [1,0] *
+  $prpp1 = $prpp7 + [1,0] *
     // this is approximate, but will do
     (prop_main_th/2 + prop_prop_gap + prcp1[0] - epp4[0]);
-  prpp3 = prpp1 +
-    v1[0] * -prp_r1 +
+  $prpp3 = $prpp1 +
+    v1[0] * -$prp_r1 +
     v1[1] * ((prcp2[1] - prcp1[1]) - prop_prop_gap);
-  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] ];
-  prp_r5 = prp_r8;
-  prpp5 = [ prpp12[0] - prp_r5,
-	    prpp3[1] - prop_prong_h + prp_r5 ];
-  prpp6 = prpp4 + [0,-1] * (prop_prong_h +
-         prop_prong_heel_slope * (prpp5[0] - prpp4[0]));
-  prpp8 = prpp4 + [0,-1] * prp_r8;
-  prpp9 = prpp8 + [-1,0] * prp_r8;
-
-  //#circleat(prpp3,1);
-  //#circleat(prpp12,1);
-
-  if (!cut) {
-    hull(){
-      translate(prpp8)
-	intersection(){
-	  circle(prp_r8);
-	  polygon([[-20,-0], [0,0], [20,20]]);
-        }
-      rectfromto(prpp6, prpp9);
-      translate(prpp5) intersection(){
-	circle(prp_r5);
-	polygon([[-10,-10], [0,0], [10,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] ];
+  $prp_r5 = $prp_r8;
+  $prpp5 = [ $prpp12[0] - $prp_r5,
+	    $prpp3[1] - prop_prong_h + $prp_r5 ];
+  $prpp6 = $prpp4 + [0,-1] * (prop_prong_h +
+         prop_prong_heel_slope * ($prpp5[0] - $prpp4[0]));
+  $prpp8 = $prpp4 + [0,-1] * $prp_r8;
+  $prpp9 = $prpp8 + [-1,0] * $prp_r8;
+
+  children();
+}
+
+module PropProfile(gamma, cut=0, rot=0){ ////toplevel
+  PropProfileAssignments(gamma){
+
+    //#circleat($prpp3,1);
+    //#circleat($prpp12,1);
+
+    if (!cut) {
+      hull(){
+	translate($prpp8)
+	  intersection(){
+	    circle($prp_r8);
+	    polygon([[-20,-0], [0,0], [20,20]]);
+	  }
+	rectfromto($prpp6, $prpp9);
+	translate($prpp5) intersection(){
+	  circle($prp_r5);
+	  polygon([[-10,-10], [0,0], [10,0]]);
+	}
+	rectfromto($prpp12 + [0,-0.1], $prpp3);
+      }
+      hull(){
+	circleat($prpp1, $prp_r1);
+	rectfromto($prpp12 + [0,-0.1], $prpp3);
       }
-      rectfromto(prpp12 + [0,-0.1], prpp3);
-    }
-    hull(){
-      circleat(prpp1, prp_r1);
-      rectfromto(prpp12 + [0,-0.1], prpp3);
     }
-  }
-  // main shaft
-  rotate([0,0, rot*-theta]){
-    hull(){
-      extra = cut ? prop_recess_slop : 0;
-      rectfromto(prpp6, prpp9);
-      circleat(prpp11, prp_r11 + extra);
-      circleat(prpp10, prp_r10 + extra);
+    // main shaft
+    rotate([0,0, rot*-$prp_theta]){
+      hull(){
+	extra = cut ? prop_recess_slop : 0;
+	rectfromto($prpp6, $prpp9);
+	circleat($prpp11, $prp_r11 + extra);
+	circleat($prpp10, $prp_r10 + extra);
+      }
     }
   }
 }
@@ -1070,16 +1077,24 @@ module DemoPropAngle(ang){
 
       color("orange")
 	translate([prop_x_pos, -prcp1[0], prcp1[1]])
-	rotate([90,0,-90])
-	Prop();
+	PropProfileAssignments(ang) {
+          echo($prpp1);
+	  rotate([-$prp_theta, 0, 0])
+	  translate([0, $prpp1[0], -$prpp1[1]])
+	  rotate([90,0,-90])
+	  Prop();
+        }
     }
 
   translate([0,0, -hp_k*2])
-    DemoPropAngleSelect("blue") Lid();
+    DemoPropAngleSelect("blue")
+    Lid();
 }
 
 module DemoPropAngles(){ ////toplevel
-  DemoPropAngle(15);
+  for (i=[0 : len(prop_angles)-1])
+    translate(i * [0, -100, 100])
+    DemoPropAngle(prop_angles[i]);
 }
 
 module DemoFrame(){ ////toplevel