added error check for 'uniform' parameter, reformatted some code

beziers.scad

@@ -634,7 +634,7 @@ function path_to_bezpath(path, closed, tangents, uniform=false, size, relsize) =
                   second + L*tangent2 
                  ],
         select(path,lastpt)
-];
+    ];
 
 
 
@@ -666,30 +666,31 @@ function path_to_bezpath(path, closed, tangents, uniform=false, size, relsize) =
 function path_to_bezcornerpath(path, closed, size, relsize) =
     is_1region(path) ? path_to_bezcornerpath(path[0], default(closed,true), tangents, size, relsize) :
     let(closed=default(closed,false))
-    assert(is_bool(closed))
+        assert(is_bool(closed))
-    assert(num_defined([size,relsize])<=1, "Can't define both size and relsize")
+        assert(num_defined([size,relsize])<=1, "Can't define both size and relsize")
-    assert(is_path(path,[2,3]),"Input path is not a valid 2d or 3d path")
+        assert(is_path(path,[2,3]),"Input path is not a valid 2d or 3d path")
-    let(
+        let(
-        curvesize = first_defined([size,relsize,0.5]),
+            curvesize = first_defined([size,relsize,0.5]),
-        relative = is_undef(size),
+            relative = is_undef(size),
-        pathlen = len(path)
+            pathlen = len(path)
+        )
+        assert(is_num(curvesize) || len(curvesize)==pathlen, str("Size or relsize must have length ",pathlen))
+        let(sizevect = is_num(curvesize) ? repeat(curvesize, pathlen) : curvesize)
+            assert(min(sizevect)>0, "Size or relsize must be greater than zero")
+        let(
+            roundpath = closed ? [
+            for(i=[0:pathlen-1]) let(p3=select(path,[i-1:i+1]))
+                _bez_path_corner([0.5*(p3[0]+p3[1]), p3[1], 0.5*(p3[1]+p3[2])], sizevect[i], relative),
+            [0.5*(path[0]+path[pathlen-1])]
+        ]
+        : [ for(i=[1:pathlen-2]) let(p3=select(path,[i-1:i+1]))
+            _bez_path_corner(
+                [i>1?0.5*(p3[0]+p3[1]):p3[0], p3[1], i<pathlen-2?0.5*(p3[1]+p3[2]):p3[2]],
+                sizevect[i], relative),
+            [path[pathlen-1]]
+        ]
     )
-    assert(is_num(curvesize) || len(curvesize)==pathlen, str("Size or relsize must have length ",pathlen))
+    flatten(roundpath);
-    let(sizevect = is_num(curvesize) ? repeat(curvesize, pathlen) : curvesize)
-        assert(min(sizevect)>0, "Size or relsize must be greater than zero")
-    let(
-        roundpath = closed ? [
-        for(i=[0:pathlen-1]) let(p3=select(path,[i-1:i+1]))
-            _bez_path_corner([0.5*(p3[0]+p3[1]), p3[1], 0.5*(p3[1]+p3[2])], sizevect[i], relative),
-        [0.5*(path[0]+path[pathlen-1])]
-    ]
-    : [ for(i=[1:pathlen-2]) let(p3=select(path,[i-1:i+1]))
-        _bez_path_corner(
-            [i>1?0.5*(p3[0]+p3[1]):p3[0], p3[1], i<pathlen-2?0.5*(p3[1]+p3[2]):p3[2]],
-            sizevect[i], relative),
-        [path[pathlen-1]]
-    ]
-) flatten(roundpath);
 
 
 /// Internal function: _bez_path_corner()
@@ -743,9 +744,7 @@ let(
     // bz6 is p3
     bz3 = p2 + middir * bzdist, // center control point
     bz2 = bz3 + midto12unit*(d1<d3 ? cornerlegmin : cornerlegmax),
-    bz1 = p1 - (d1<=d3 ? leglenmin :
+    bz1 = p1 - (d1<=d3 ? leglenmin : leglenmax)*p21unit,
-        leglenmax)*p21unit,
-        //norm(0.333*(bz2-p1)))*p21unit,
     bz4 = bz3 - midto12unit*(d3<d1 ? cornerlegmin : cornerlegmax),
     bz5 = p3 - (d3<=d1 ? leglenmin : leglenmax)*p23unit
 ) [p1, bz1, bz2, bz3, bz4, bz5]; // do not include last control point

rounding.scad

@@ -735,18 +735,20 @@ function _rounding_offsets(edgespec,z_dir=1) =
 //   pts = [[-3.3, 1.7], [-3.7, -2.2], [3.8, -4.8], [-0.9, -2.4]];
 //   stroke(smooth_path(pts, uniform=false, relsize=0.1),width=.1);
 //   color("red")move_copies(pts)circle(r=.15,$fn=12);
-module smooth_path(path, tangents, size, relsize, method="edges", splinesteps=10, uniform=false, closed=false) {no_module();}
+module smooth_path(path, tangents, size, relsize, method="edges", splinesteps=10, uniform, closed=false) {no_module();}
-function smooth_path(path, tangents, size, relsize, method="edges", splinesteps=10, uniform=false, closed) =
+function smooth_path(path, tangents, size, relsize, method="edges", splinesteps=10, uniform, closed) =
-  is_1region(path) ? smooth_path(path[0], tangents, size, relsize, method, splinesteps, uniform, default(closed,true)) :
+is_1region(path)
-  assert(method=="edges" || method=="corners", "method must be \"edges\" or \"corners\".")
+    ? smooth_path(path[0], tangents, size, relsize, method, splinesteps, uniform, default(closed,true))
-  assert(method=="edges" || is_undef(tangent), "The tangents parameter is incompatible with method=\"corners\".")
+    : assert(method=="edges" || method=="corners", "method must be \"edges\" or \"corners\".")
-  let (
+assert(method=="edges" || (is_undef(tangents) && is_undef(uniform)), "The tangents and uniform parameters are incompatible with method=\"corners\".")
-     bez = method=="edges" ?
+let (
-        path_to_bezpath(path, tangents=tangents, size=size, relsize=relsize, uniform=uniform, closed=default(closed,false))
+    uniform = default(uniform,false),
+    bez = method=="edges"
+        ? path_to_bezpath(path, tangents=tangents, size=size, relsize=relsize, uniform=uniform, closed=default(closed,false))
         : path_to_bezcornerpath(path, size=size, relsize=relsize, closed=default(closed,false)),
-     smoothed = bezpath_curve(bez,splinesteps=splinesteps)
+    smoothed = bezpath_curve(bez,splinesteps=splinesteps)
-  )
+)
-  closed ? list_unwrap(smoothed) : smoothed;
+closed ? list_unwrap(smoothed) : smoothed;
 
 
 

shapes2d.scad

@@ -1854,15 +1854,17 @@ function _squircle_fg(size, squareness) = [
     ) p*[cos(theta), aspect*sin(theta)]
 ];
 
-function squircle_radius_fg(squareness, r, angle) = let(
+function squircle_radius_fg(squareness, r, angle) =
-    s2a = abs(squareness*sin(2*angle))
+    let(
-    ) s2a>0 ? r*sqrt(2)/s2a * sqrt(1 - sqrt(1 - s2a*s2a)) : r;
+        s2a = abs(squareness*sin(2*angle))
+    )
+    s2a>0 ? r*sqrt(2)/s2a * sqrt(1 - sqrt(1 - s2a*s2a)) : r;
 
 function _linearize_squareness(s) =
     // from Chamberlain Fong (2016). "Squircular Calculations". arXiv.
     // https://arxiv.org/pdf/1604.02174v5
     let(c = 2 - 2*sqrt(2), d = 1 - 0.5*c*s)
-    2 * sqrt((1+c)*s*s - c*s) / (d*d);
+        2 * sqrt((1+c)*s*s - c*s) / (d*d);
 
 
 /* Superellipse squircle functions */
@@ -1884,27 +1886,33 @@ function _squircle_se(size, squareness) = [
     ) [ra*x, rb*y] / r
 ];
 
-function squircle_radius_se(n, r, angle) = let(
+function squircle_radius_se(n, r, angle) =
-    x = cos(angle),
+    let(
-    y = sin(angle)
+        x = cos(angle),
-) (abs(x)^n + abs(y)^n)^(1/n) / r;
+        y = sin(angle)
+    )
+    (abs(x)^n + abs(y)^n)^(1/n) / r;
 
-function _squircle_se_exponent(squareness) = let(
+function _squircle_se_exponent(squareness) =
-    // limit squareness; error if >0.99889, limit is smaller for r>1
+    let(
-    s=min(0.998,squareness),
+        // limit squareness; error if >0.99889, limit is smaller for r>1
-    rho = 1 + s*(sqrt(2)-1),
+        s=min(0.998,squareness),
-    x = rho / sqrt(2)
+        rho = 1 + s*(sqrt(2)-1),
-) log(0.5) / log(x);
+        x = rho / sqrt(2)
+    )
+    log(0.5) / log(x);
 
 
 /* Bezier squircle function */
 
-function _squircle_bz(size, squareness) = let(
+function _squircle_bz(size, squareness) =
-    splinesteps = $fn>=12 ? round($fn/4) : 10,
+    let(
-    size = is_num(size) ? [size,size] : point2d(size),
+        splinesteps = $fn>=12 ? round($fn/4) : 10,
-    sq = square(size, center=true),
+        size = is_num(size) ? [size,size] : point2d(size),
-    bez = path_to_bezcornerpath(sq, relsize=1-squareness, closed=true)
+        sq = square(size, center=true),
-) bezpath_curve(bez, splinesteps=splinesteps);
+        bez = path_to_bezcornerpath(sq, relsize=1-squareness, closed=true)
+    )
+    bezpath_curve(bez, splinesteps=splinesteps);