openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-08-07 15:26:39 +02:00
Code Issues Releases Wiki Activity

fix missing _join

Browse Source
This commit is contained in:
Justin Lin
2020-04-15 10:01:18 +08:00
parent a4fe86b58c
commit 4d9f09d48b
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
use <experimental/_impl/_lsystem_comm.scad>; use <experimental/_impl/_lsystem_comm.scad>;
use <turtle/turtle2d.scad>; use <turtle/turtle2d.scad>;
function _lsystem2_join(str_lt) = _join(str_lt);
function _lsystem2_derive(axiom, rules, n, rules_pr) = function _lsystem2_derive(axiom, rules, n, rules_pr) =
is_undef(rules_pr) ? _derive(axiom, rules, n) : is_undef(rules_pr) ? _derive(axiom, rules, n) :
_derive_p(axiom, rules, rules_pr, n); _derive_p(axiom, rules, rules_pr, n);

4
src/experimental/_impl/_lsystem3_impl.scad
View File

@@ -1,6 +1,8 @@
use <experimental/_impl/_lsystem_comm.scad>; use <experimental/_impl/_lsystem_comm.scad>;
use <turtle/turtle3d.scad>; use <turtle/turtle3d.scad>;
function _lsystem3_join(str_lt) = _join(str_lt);
function _lsystem3_derive(axiom, rules, n, rules_pr) = function _lsystem3_derive(axiom, rules, n, rules_pr) =
is_undef(rules_pr) ? _derive(axiom, rules, n) : is_undef(rules_pr) ? _derive(axiom, rules, n) :
_derive_p(axiom, rules, rules_pr, n); _derive_p(axiom, rules, rules_pr, n);

2
src/experimental/lsystem2.scad
View File

@@ -16,7 +16,7 @@ use <turtle/turtle2d.scad>;
function lsystem2(axiom, rules, n, angle, leng = 1, heading = 0, start = [0, 0], forward_chars = "F", rules_pr) = function lsystem2(axiom, rules, n, angle, leng = 1, heading = 0, start = [0, 0], forward_chars = "F", rules_pr) =
let( let(
derived = _lsystem2_derive(axiom, rules, n, rules_pr), derived = _lsystem2_derive(axiom, rules, n, rules_pr),
codes = forward_chars == "F" ? derived : _join([ codes = forward_chars == "F" ? derived : _lsystem2_join([
for(c = derived) for(c = derived)
let(idx = search(c, forward_chars)) let(idx = search(c, forward_chars))
idx == [] ? c : "F" idx == [] ? c : "F"

2
src/experimental/lsystem3.scad
View File

@@ -20,7 +20,7 @@ use <turtle/turtle3d.scad>;
function lsystem3(axiom, rules, n, angle, leng = 1, heading = 0, start = [0, 0, 0], forward_chars = "F", rules_pr) = function lsystem3(axiom, rules, n, angle, leng = 1, heading = 0, start = [0, 0, 0], forward_chars = "F", rules_pr) =
let( let(
derived = _lsystem3_derive(axiom, rules, n, rules_pr), derived = _lsystem3_derive(axiom, rules, n, rules_pr),
codes = forward_chars == "F" ? derived : _join([ codes = forward_chars == "F" ? derived : _lsystem3_join([
for(c = derived) for(c = derived)
let(idx = search(c, forward_chars)) let(idx = search(c, forward_chars))
idx == [] ? c : "F" idx == [] ? c : "F"