From 82fa532c1c5284777adc6b247cb9d3c127515f33 Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Fri, 29 May 2020 10:24:41 -0400
Subject: [PATCH] Ready to render v3

---
 100ft_v3/gnal_100ft.scad | 11 +++++------
 libraries/gnal_v3.scad   | 15 +++++++++++----
 scripts/v3.sh            |  7 ++++++-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/100ft_v3/gnal_100ft.scad b/100ft_v3/gnal_100ft.scad
index 2f573a1..6b76b83 100644
--- a/100ft_v3/gnal_100ft.scad
+++ b/100ft_v3/gnal_100ft.scad
@@ -3,7 +3,6 @@
 include <../libraries/gnal_v3.scad>;
 
 SPOKE_COUNT = 24;
-PART="";
 
 module gnal_100ft_spiral (spiral_count = 60, od = 298.75) {
     outer_d = 299;
@@ -109,15 +108,15 @@ module gnal_100ft_spiral (spiral_count = 60, od = 298.75) {
                 }
                 for (i = [0 : SPOKE_COUNT * 2]) {
                     rotate([0, 0, (i + 0.5) * (360 / (SPOKE_COUNT * 2)) ]) {
-                       translate([(258 / 2) - (spoke_2_len / 2) + 1 , 0, -3.6]) triangle_void_2(); 
+                       translate([(258 / 2) - (spoke_2_len / 2) + 1 , 0, -3.6 ]) triangle_void_2(i); 
                     }
                 }
                 for (i = [0 : SPOKE_COUNT * 4]) {
                     rotate([0, 0, (i + 0.5) * (360 / (SPOKE_COUNT * 4)) ]) {
                         if (i % 2 == 0) {
-                       translate([(outer_d / 2) - (spoke_3_len / 2) + 1 , 0.3, -3.6]) triangle_void_3(); 
+                            translate([(outer_d / 2) - (spoke_3_len / 2) + 1 , 0.3, -3.6]) triangle_void_3(i); 
                         } else {
-                            translate([(outer_d / 2) - (spoke_3_len / 2) + 1, -0.3, -3.6]) triangle_void_3();
+                            translate([(outer_d / 2) - (spoke_3_len / 2) + 1 , -0.3, -3.6]) triangle_void_3(i); 
                         }
                     }
                 }
@@ -230,13 +229,13 @@ module gnal_100ft_top () {
     }    
 }
 
-
-
 module film_guide (rotations = 60, id = 45.55, spacing = 2.075) {
     $fn = 200;
 	spiral(rotations, id, spacing, $fn);
 }
 
+PART="spiral";
+
 if (PART == "spiral") {
     gnal_100ft_spiral();
 } else if (PART == "top") {
diff --git a/libraries/gnal_v3.scad b/libraries/gnal_v3.scad
index 07f8898..03a4392 100644
--- a/libraries/gnal_v3.scad
+++ b/libraries/gnal_v3.scad
@@ -381,7 +381,7 @@ module triangle_void () {
 }
 
 module triangle_void_2 (i) {
-    length = 43 - 8 + 10;
+    length = 43 - 8 + 12;
     width = 12;
     height = 4.5 + 2.7;
     ANGLE_A = 34.8;
@@ -401,22 +401,29 @@ module triangle_void_2 (i) {
         } else {
             translate([-(length / 2) - 7, 0, 0]) rotate([0, 0, ANGLE_C]) cube([10, width * 2, height + 1], center = true);
         }
+        translate([(length / 2) + 1, 0, 0]) rotate([0, 0, -ANGLE_C]) cube([10, width * 2, height + 1], center = true);;
     }  
 }
 
-module triangle_void_3 () {
-    length = 32;
+module triangle_void_3 (i) {
+    length = 32 + 10;
     width = 10;
     height = 4.5 + 2.7;
     ANGLE_A = 31;
     ANGLE_B = 45 / SPOKE_COUNT;
+    ANGLE_C = 20;
     angle_w = 7.8;
     difference () {
-        translate([-1, 0, 0]) cube([length, width, height], center = true);
+        translate([-3, 0, 0]) cube([length, width, height], center = true);
         translate([0, angle_w, 0]) rotate([0, 0, ANGLE_B]) cube([length *2, width, height * 10], center = true);   
         translate([0, -angle_w, 0]) rotate([0, 0, -ANGLE_B]) cube([length *2, width, height * 10], center = true);
 
         translate([0, angle_w, -.7]) rotate([ANGLE_A, 0, 0]) cube([length *2, width, height * 10], center = true);   
         translate([0, -angle_w, -.7]) rotate([-ANGLE_A, 0, 0]) cube([length *2, width, height * 10], center = true);
+        if (i % 2 == 0) {
+            translate([-(length / 2) - 7, 0, 0]) rotate([0, 0, -ANGLE_C]) cube([10, width * 2, height + 1], center = true);
+        } else {
+            translate([-(length / 2) - 5, 0, 0]) rotate([0, 0, -ANGLE_C]) cube([10, width * 2, height + 1], center = true);
+        }
     }  
 }
\ No newline at end of file
diff --git a/scripts/v3.sh b/scripts/v3.sh
index 3d64905..fc63939 100644
--- a/scripts/v3.sh
+++ b/scripts/v3.sh
@@ -32,7 +32,12 @@ do
 	    png="${IMG}/gnal_${SIZE}_${V}_${FILE}.png"
 	    echo "${scad} - ${FILE}"
 	    start=`date +%s`
-		openscad -o "$stl" -D "PART=\"${FILE}\"" "${scad}"
+	    if [ "${SIZE}" -eq "100ft"]; then
+	    	openscad -o "$stl" -D "PART=\"${FILE}\"" -D "FN=800" "${scad}"
+	    else
+	    	openscad -o "$stl" -D "PART=\"${FILE}\"" -D "FN=600" "${scad}"
+	    fi
+		
 		end=`date +%s`
 		runtime=$((end-start))
 		hash=`sha256sum "$stl" | awk '{ print $1 }'`