From 33484f2c4b83f2d19f33b850a3b408adf963f154 Mon Sep 17 00:00:00 2001
From: Adrian Mariano <avm4@cornell.edu>
Date: Wed, 6 Oct 2021 21:53:46 -0400
Subject: [PATCH] misc bugfixes

---
 beziers.scad | 14 ++++++++------
 paths.scad   |  2 +-
 regions.scad |  4 ++--
 skin.scad    |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/beziers.scad b/beziers.scad
index 1d98302..b8e6dcf 100644
--- a/beziers.scad
+++ b/beziers.scad
@@ -977,15 +977,12 @@ module trace_bezier(bez, width=1, N=3) {
     stroke(bezier_path(bez, N=N), width=width, color="cyan");
     color("green")
       if (N!=3) 
-           stroke(path3d(path), width=size);
+           stroke(path3d(path), width=width);
       else 
            for(i=[1:3:len(bez)]) stroke(select(bez,max(0,i-2), min(len(bez)-1,i)), width=width);
     twodim = len(bez[0])==2;
-    move_copies(bez)
-      if ($idx % N ==0)
-        color("blue") if (twodim) circle(d=width*2.5); else sphere(d=width*2.5);
-      else
-        color("red")
+    color("red") move_copies(bez)
+      if ($idx % N !=0)
           if (twodim){
             rect([width/2, width*3],center=true);
             rect([width*3, width/2],center=true);
@@ -994,6 +991,11 @@ module trace_bezier(bez, width=1, N=3) {
            xcyl(d=width/2, h=width*3);
            ycyl(d=width/2, h=width*3);
         }
+    color("blue") move_copies(bez)
+      if ($idx % N ==0)
+        if (twodim) circle(d=width*2.25); else sphere(d=width*2.25);
+    if (twodim) color("red") move_copies(bez)
+      if ($idx % N !=0) circle(d=width/2);
 }
 
 
diff --git a/paths.scad b/paths.scad
index 17123a3..ce91520 100644
--- a/paths.scad
+++ b/paths.scad
@@ -211,7 +211,7 @@ function path_length_fractions(path, closed=false) =
 ///   // isects == [[[-33.3333, 0], 0, 0.666667, 4, 0.333333], [[33.3333, 0], 1, 0.333333, 3, 0.666667]]
 ///   stroke(path, closed=true, width=1);
 ///   for (isect=isects) translate(isect[0]) color("blue") sphere(d=10);
-function _path_self_intersections5(path, closed=true, eps=EPSILON) =
+function _path_self_intersections(path, closed=true, eps=EPSILON) =
     let(
         path = closed ? close_path(path,eps=eps) : path,
         plen = len(path)
diff --git a/regions.scad b/regions.scad
index 56e4faf..a4c66ba 100644
--- a/regions.scad
+++ b/regions.scad
@@ -265,7 +265,7 @@ function split_path_at_region_crossings(path, region, closed=true, eps=EPSILON)
 //   components intersect each other.
 // Example(2D,NoAxes):
 //   R = [for(i=[1:7]) square(i,center=true)];
-//   region_list = split_nested_region(R);
+//   region_list = region_parts(R);
 //   rainbow(region_list) region($item);
 // Example(2D,NoAxes):
 //   R = [back(7,square(3,center=true)),
@@ -273,7 +273,7 @@ function split_path_at_region_crossings(path, region, closed=true, eps=EPSILON)
 //        left(5,square(8,center=true)),
 //        for(i=[4:2:8])
 //          right(5,square(i,center=true))];
-//   region_list = split_nested_region(R);
+//   region_list = region_parts(R);
 //   rainbow(region_list) region($item);
 function region_parts(region) =
     let(
diff --git a/skin.scad b/skin.scad
index 7b759c4..3854462 100644
--- a/skin.scad
+++ b/skin.scad
@@ -1105,7 +1105,7 @@ function sweep(shape, transforms, closed=false, caps, style="min_edge") =
     assert(capsOK, "caps must be boolean or a list of two booleans")
     assert(!closed || !caps, "Cannot make closed shape with caps")
     is_region(shape)? let(
-        regions = split_nested_region(shape),
+        regions = region_parts(shape),
         rtrans = reverse(transforms),
         vnfs = [
             for (rgn=regions) each [