openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-06 23:06:43 +02:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Justin Lin
2020-04-14 14:49:14 +08:00
parent c1c8681036
commit 1bd71893bc
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/lsystem_collection.scad
View File

@@ -28,7 +28,7 @@ function plant(n = 4, angle = 25, leng = 1, heading = 0, start = [0, 0]) =
["F", "FF"] ["F", "FF"]
] ]
) )
lsystem2(rule, n, angle, leng, heading, start, rule_pr = [1, 1, 1]); lsystem2(rule, n, angle, leng, heading, start);
function koch_curve(n = 4, angle = 60, leng = 1, heading = 0, start = [0, 0]) = function koch_curve(n = 4, angle = 60, leng = 1, heading = 0, start = [0, 0]) =
let( let(

13
src/experimental/_impl/_lsystem2_impl.scad
View File

@@ -1,24 +1,24 @@
use <experimental/assoc_lookup.scad>; use <experimental/assoc_lookup.scad>;
use <turtle/turtle2d.scad>; use <turtle/turtle2d.scad>;
use <util/rand.scad>;
// It doesn't use recursion to avoid recursion error. // It doesn't use recursion to avoid recursion error.
function _join(strs) = function _join(strs) =
let(leng = len(strs)) let(leng = len(strs))
[for(i = 0, s = strs[0]; i < leng; i = i + 1, s = str(s, strs[i])) s][leng - 1]; [for(i = 0, s = strs[0]; i < leng; i = i + 1, s = str(s, strs[i])) s][leng - 1];
function c_or_v(c, v, rand_n, rule, rule_pr, leng, i = 0) = function c_or_v(c, v, rule, rule_pr, leng, i = 0) =
i == leng ? c : ( i == leng ? c : (
let(idx = search([v[i]], rule, num_returns_per_match=0, index_col_num = 1)[0][0]) let(idx = search([v[i]], rule, num_returns_per_match=0, index_col_num = 1)[0][0])
rand_n < rule_pr[idx] ? v[i] : c_or_v(c, v, rand_n, rule, rule_pr, leng, i + 1) rand(0, 1) <= rule_pr[idx] ? v[i] : c_or_v(c, v, rule, rule_pr, leng, i + 1)
); );
function _derive1_p(base, rule, rule_pr) = function _derive1_p(base, rule, rule_pr) =
let(rand_n = rands(0, 1, 1)[0])
_join([ _join([
for(c = base) for(c = base)
let(v = [for(r = rule) if(r[0] == c) r[1]]) let(v = [for(r = rule) if(r[0] == c) r[1]])
v == [] ? c : v == [] ? c :
c_or_v(c, v, rand_n, rule, rule_pr, len(v)) c_or_v(c, v, rule, rule_pr, len(v))
]); ]);
function _derive_p(base, rule, rule_pr, n, i = 0) = function _derive_p(base, rule, rule_pr, n, i = 0) =
@@ -34,9 +34,8 @@ function _derive(base, rule, n, i = 0) =
i == n ? base : _derive(_derive1(base, rule), rule, n, i + 1); i == n ? base : _derive(_derive1(base, rule), rule, n, i + 1);
function _lsystem2_derive(rule, n, rule_pr) = function _lsystem2_derive(rule, n, rule_pr) =
let(base = assoc_lookup(rule, "S")) is_undef(rule_pr) ? _derive(rule[0][1], rule, n) :
is_undef(rule_pr) ? _derive(base, rule, n) : rand() <= rule_pr[0] ? _derive_p(rule[0][1], rule, rule_pr, n) : "";
_derive_p(base, rule, rule_pr, n);
function _next_stack(t, code, stack) = function _next_stack(t, code, stack) =
code == "[" ? concat([t], stack) : code == "[" ? concat([t], stack) :