fairphone-case: ButtonPlan: move bigger and d_D1_y calculations into ButtonPlan ...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/fairphone-case.scad b/fairphone-case.scad
index f0de5d9a390753e2c801652eef38be31dc70f08f..3a3cf1d99af08299e9cee582fcd43ee5a67e4818 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -138,7 +138,14 @@ module ButtonCoverProfile(){
   }
 }
 
-module ButtonPlan(l, bigger, d_D1_y){
+module ButtonPlan(l, deep, cut){
+  bigger =
+    (deep ? lid_buttoncover_overlap : 0) +
+    (cut  ? lid_buttoncover_gap     : 0);
+
+  d_D1_y =
+    (cut  ? 0 : lid_buttoncover_gap);
+
   C = [0,0]; // by definition
   T = [ 0, epp4[1] ];
   G = T + [0,10];
@@ -347,13 +354,10 @@ module Keeper(){ ////toplevel
     OneKeeper();
 }
 
-module ButtonPlanForDemo(colour, z, gap, overlap){
+module ButtonPlanForDemo(colour, z, cut, deep){
   color(colour)
     translate([0,0,z])
-    ButtonPlan(8,
-              lid_buttoncover_gap * gap +
-              lid_buttoncover_overlap * overlap,
-              lid_buttoncover_gap * (1-gap));
+    ButtonPlan(8, deep, cut);
 }
 
 module DemoProfiles(){ ////toplevel