From d350362c470464a152292306108a475a011ef842 Mon Sep 17 00:00:00 2001
From: Justin Lin <justin.sdk@gmail.com>
Date: Wed, 11 Aug 2021 08:28:57 +0800
Subject: [PATCH] refactor

---
 src/experimental/tile_penrose3.scad | 98 +++++++++++++++--------------
 1 file changed, 50 insertions(+), 48 deletions(-)

diff --git a/src/experimental/tile_penrose3.scad b/src/experimental/tile_penrose3.scad
index 2918b62c..8ad7ee34 100644
--- a/src/experimental/tile_penrose3.scad
+++ b/src/experimental/tile_penrose3.scad
@@ -1,73 +1,75 @@
 use <ptf/ptf_rotate.scad>;
 use <hull_polyline2d.scad>;
-	
-module tile_penrose3(radius, fn, n) {
-	// triangle: [type, pa, pb pc], c: false(36) or true(108)
-	PHI = 1.618033988749895; // golden ratio
 
-
-	function _subdivide(triangles) = 
-		[
-			for(tri = triangles)
-			let(
-				type = tri[0],
-				a = tri[1],
-				b = tri[2],
-				c = tri[3]
-			)
-			each (type ? _sub_a1(a, b, c) : _sub_a0(a, b, c))
-		];
-
-	function _sub_a0(a, b, c) =
-		let(p = a + (b - a) / PHI)
-		[[false, c, p, b], [true, p, c, a]];	
-		
-	function _sub_a1(a, b, c) =
+function _subdivide(triangles) = 
+	[
+		for(tri = triangles)
 		let(
-			q = b + (a - b) / PHI,
-			r = b + (c - b) / PHI
+			type = tri[0],
+			a = tri[1],
+			b = tri[2],
+			c = tri[3]
 		)
-		[[true, r, c, a], [true, q, r, b], [false, r, q, a]];
-
-	function _penrose3(triangles, n, i = 0) = 
-		i == n ? triangles :
-				_penrose3(_subdivide(triangles), n, i+ 1);
-				
-			
-	a0 = 360 / fn;
-	a2 = 180 - a0 * 2;
-
-	shape_tri0 = [[0, 0], [radius, 0], ptf_rotate([radius, 0], a0)];
-	triangles = [
-		for(i = [0:fn - 1]) 
-		let(t = [for(p = shape_tri0) ptf_rotate(p, i * a0)])
-		i % 2 == 0 ? [false, t[0], t[1], t[2]] : [false, t[0], t[2], t[1]]
+		each (type ? _sub_a1(a, b, c) : _sub_a0(a, b, c))
 	];
-    tris = _penrose3(triangles, n);
+
+function _sub_a0(a, b, c) =
+	let(
+		PHI = 1.618033988749895,
+		p = a + (b - a) / PHI
+	)
+	[[false, c, p, b], [true, p, c, a]];	
+	
+function _sub_a1(a, b, c) =
+	let(
+		PHI = 1.618033988749895,
+		q = b + (a - b) / PHI,
+		r = b + (c - b) / PHI
+	)
+	[[true, r, c, a], [true, q, r, b], [false, r, q, a]];
+
+function _penrose3(triangles, n, i = 0) = 
+	i == n ? triangles :
+			_penrose3(_subdivide(triangles), n, i+ 1);
+			
+function tile_penrose3(n) = 
+    let(
+		a0 = 360 / $fn,
+	    a2 = 180 - a0 * 2,
+		shape_tri0 = [[0, 0], [1, 0], ptf_rotate([1, 0], a0)]
+	)
+    _penrose3([
+		for(i = [0:$fn - 1]) 
+		let(t = [for(p = shape_tri0) ptf_rotate(p, i * a0)])
+		    i % 2 == 0 ? [false, t[0], t[1], t[2]] : [false, t[0], t[2], t[1]]
+	], n);
+
+module draw(tris) {
 	for(t = tris) {
 		color(t[0] ? "white" : "black")
+		linear_extrude(.5))
 			polygon([t[2], t[1], t[3]]);
 		linear_extrude(1)
-		    hull_polyline2d([t[2], t[1], t[3]], .2);
+		    hull_polyline2d([t[2], t[1], t[3]], .1);
 	}
 }
 
 radius = 10;
-fn = 12;
+$fn = 12;
 
-tile_penrose3(radius, fn, 0);
+draw(tile_penrose3(0) * radius);
 
 translate([30, 0])
-    tile_penrose3(radius, fn, 1);
+    draw(tile_penrose3(1) * radius);
 
 translate([60, 0])
-    tile_penrose3(radius, fn, 2);
+    draw(tile_penrose3(2) * radius);
 
 translate([0, -30])
-    tile_penrose3(radius, fn, 3);
+    draw(tile_penrose3(3) * radius);
 
 translate([30, -30])
-    tile_penrose3(radius, fn, 4);
+    draw(tile_penrose3(4) * radius);
 
 translate([60, -30])
-    tile_penrose3(radius, fn, 5);
\ No newline at end of file
+    draw(tile_penrose3(5) * radius);
\ No newline at end of file