fairphone-case: refactor to put loops inside flips (nfc)

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

diff --git a/fairphone-case.scad b/fairphone-case.scad
index 47d92f0d23b15c519b65dc043aed94999ecd8849..577f76b52ba71e4564d0a47cfefac7e580a0e1b4 100644 (file)
--- a/fairphone-case.scad
+++ b/fairphone-case.scad
@@ -56,52 +56,50 @@ module EdgeProfile(){
   }
 }
 
-module CaseBase_rhsflip(rhs) {
-  translate([phone_width/2, 0, 0])
-    mirror([rhs,0,0])
-    translate([-phone_width/2, 0, 0])
-    children();
+module CaseBase_rhsflip() {
+  for (rhs=[0,1]) {
+    translate([phone_width/2, 0, 0])
+      mirror([rhs,0,0])
+      translate([-phone_width/2, 0, 0])
+      children();
+  }
 }
 
-module CaseBase_botflip(bot) {
-  translate([0, -phone_height/2, 0])
-    mirror([0, bot, 0])
-    translate([0, phone_height/2, 0])
-    children();
+module CaseBase_botflip() {
+  for (bot=[0,1]) {
+    translate([0, -phone_height/2, 0])
+      mirror([0, bot, 0])
+      translate([0, phone_height/2, 0])
+      children();
+  }
 }  
 
 module CaseBase(){
-  for (rhs=[0,1]) {
-    CaseBase_rhsflip(rhs){
-      translate([0, -phone_cnr_rad, 0])
-       rotate([90,0,0])
-       linear_extrude(height = phone_height - phone_cnr_rad*2)
-       EdgeProfile();
-    }
+  CaseBase_rhsflip(){
+    translate([0, -phone_cnr_rad, 0])
+      rotate([90,0,0])
+      linear_extrude(height = phone_height - phone_cnr_rad*2)
+      EdgeProfile();
   }
-  for (rhs=[0,1]) {
-    CaseBase_rhsflip(rhs){
-      translate([+1,-1] * phone_cnr_rad)
-       intersection(){
-         rotate_extrude()
-           intersection(){
-             mirror([1,0,0])
-               translate([-1,0] * phone_cnr_rad)
-               EdgeProfile();
-             rectfromto([0,-20],[10,20]);
-           }
-         translate([-10, 0, -20] + 0.01 * [+1,-1, 0] )
-           cube([10,10,40]);
-        }
-    }
+  CaseBase_rhsflip(){
+    translate([+1,-1] * phone_cnr_rad)
+      intersection(){
+       rotate_extrude()
+         intersection(){
+           mirror([1,0,0])
+             translate([-1,0] * phone_cnr_rad)
+             EdgeProfile();
+           rectfromto([0,-20],[10,20]);
+         }
+       translate([-10, 0, -20] + 0.01 * [+1,-1, 0] )
+         cube([10,10,40]);
+      }
   }
-  for (bot=[0,1]) {
-    CaseBase_botflip(bot){
-      translate([ phone_width - phone_cnr_rad, 0,0 ])
-       rotate([90,0,-90])
-       linear_extrude(height = phone_width - phone_cnr_rad*2)
-       EdgeProfile();
-    }
+  CaseBase_botflip(){
+    translate([ phone_width - phone_cnr_rad, 0,0 ])
+      rotate([90,0,-90])
+      linear_extrude(height = phone_width - phone_cnr_rad*2)
+      EdgeProfile();
   }
 }