diff --git a/rounding.scad b/rounding.scad index e9532e2..b117204 100644 --- a/rounding.scad +++ b/rounding.scad @@ -4465,7 +4465,7 @@ function _prism_fillet_prism(name, basepoly, bot, top, d, k, N, overlap, uniform // Get the object type from the specified geometry and anchor point // Note that profile is needed just to find its dimensions for making a big enough edge profile -function _get_obj_type(ind,geom,anchor,prof,edger) = +function _get_obj_type(ind,geom,anchor,prof,edger=0) = geom[0]=="spheroid" ? "sphere" : geom[0]=="conoid" ? let( axis = geom[5], diff --git a/shapes3d.scad b/shapes3d.scad index ad1b7a8..f957b96 100644 --- a/shapes3d.scad +++ b/shapes3d.scad @@ -1055,19 +1055,16 @@ function regular_prism(n, hgiven = is_def(height), height = !hgiven && is_def(ang) && r1def && r2def ? let( -fdase= echo("hot here"), dr=r1-r2, height=abs(tan(ang)*dr) ) height : height -, f=echo(height=height, r1,r2,ang,r1def,r2def,hgiven) ) assert(is_finite(height), "\nl/h/length/height must be a finite number") let( r1 = !hgiven || is_undef(ang) || r1def || rgen_def ? r1 : u_add(r2,height/tan(ang)), r2 = !hgiven || is_undef(ang) || r2def ? r2 : u_add(r1, - height/tan(ang)) - ,fee=echo(r1=r1,r2=r2) ) assert(is_finite(r1), "\nMust specify finite number for prism bottom radius / diameter / side length.") assert(is_finite(r2), "\nMust specify finite number for prism top radius / diameter / side length.")