From 45e64f309c08c0f100d112a62f037afb317239ff Mon Sep 17 00:00:00 2001 From: Adrian Mariano Date: Tue, 16 Nov 2021 20:33:51 -0500 Subject: [PATCH] bug fixes --- shapes2d.scad | 3 ++- skin.scad | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/shapes2d.scad b/shapes2d.scad index 08fc969..977e942 100644 --- a/shapes2d.scad +++ b/shapes2d.scad @@ -1173,8 +1173,9 @@ function _superformula(theta,m1,m2,n1,n2=1,n3=1,a=1,b=1) = // linear_extrude(height=0.3, scale=0) supershape(step=1, m1=6, n1=0.4, n2=0, n3=6); // linear_extrude(height=5, scale=0) supershape(step=1, b=3, m1=6, n1=3.8, n2=16, n3=10); function supershape(step=0.5, m1=4, m2, n1=1, n2, n3, a=1, b, r, d,anchor=CENTER, spin=0, atype="hull") = + assert(in_list(atype, _ANCHOR_TYPES), "Anchor type must be \"hull\" or \"intersect\"") let( - assert(in_list(atype, _ANCHOR_TYPES), "Anchor type must be \"hull\" or \"intersect\""), + r = get_radius(r=r, d=d, dflt=undef), m2 = is_def(m2) ? m2 : m1, n2 = is_def(n2) ? n2 : n1, diff --git a/skin.scad b/skin.scad index c7c8996..585e781 100644 --- a/skin.scad +++ b/skin.scad @@ -814,7 +814,7 @@ module path_sweep(shape, path, method="incremental", normal, closed=false, twist { vnf = path_sweep(shape, path, method, normal, closed, twist, twist_by_length, symmetry, last_normal, tangent, relaxed, caps, style); - vnf_polyhedron(vnf,convexity=convexity,anchor=anchor, spin=spin, orient=orient, vnf=vnf, atype=atype, cp=cp) + vnf_polyhedron(vnf,convexity=convexity,anchor=anchor, spin=spin, orient=orient, atype=atype, cp=cp) children(); } @@ -1005,7 +1005,7 @@ module path_sweep2d(profile, path, closed=false, caps, quality=1, style="min_edg anchor="origin", cp="centroid", spin=0, orient=UP, atype="hull") { vnf = path_sweep2d(profile, path, closed, caps, quality, style); - vnf_polyhedron(vnf,convexity=convexity,anchor=anchor, spin=spin, orient=orient, vnf=vnf, atype=atype, cp=cp) + vnf_polyhedron(vnf,convexity=convexity,anchor=anchor, spin=spin, orient=orient, atype=atype, cp=cp) children(); }