From 243c3eb659a4e99358a532e2c9390855b543db05 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Fri, 24 Jun 2022 08:52:38 +0800 Subject: [PATCH] return spiral r --- src/experimental/_impl/_foliage_scroll_impl.scad | 2 +- src/experimental/foliage_scroll.scad | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/experimental/_impl/_foliage_scroll_impl.scad b/src/experimental/_impl/_foliage_scroll_impl.scad index 1508f4fc..c4857403 100644 --- a/src/experimental/_impl/_foliage_scroll_impl.scad +++ b/src/experimental/_impl/_foliage_scroll_impl.scad @@ -77,7 +77,7 @@ function try_create_spiral(size, spirals, i, min_radius) = spiral_angle(spiral) <= 270 ? undef : let( r = spiral_r(spiral), - cr = r * rands(0.5, 1.75, 1)[0] + cr = r * rands(0.5, 1.5, 1)[0] ) cr < min_radius ? undef : let( diff --git a/src/experimental/foliage_scroll.scad b/src/experimental/foliage_scroll.scad index baf14028..c16bacbe 100644 --- a/src/experimental/foliage_scroll.scad +++ b/src/experimental/foliage_scroll.scad @@ -9,7 +9,7 @@ function foliage_scroll(size, max_spirals, init_radius, min_radius, angle_step = ) [ for(spiral = _foliage_scroll(size, init_spirals, max_spirals, min_radius, angle_step, done)) - spiral_path(spiral) + [spiral_r(spiral), spiral_path(spiral)] ]; @@ -22,7 +22,11 @@ angle_step = 10; min_radius = 10; init_radius = rands(min_radius * 2, min_radius * 4, 1)[0]; -for(spiral = foliage_scroll([width, height], max_spirals, init_radius, min_radius)) { - polyline_join(spiral) - circle(min_radius / 5); +spirals = foliage_scroll([width, height], max_spirals, init_radius, min_radius); + +for(spiral = spirals) { + r = spiral[0]; + path = spiral[1]; + polyline_join(path) + circle(r / 5); } \ No newline at end of file