diff --git a/masks3d.scad b/masks3d.scad index 36f3258..899b6ef 100644 --- a/masks3d.scad +++ b/masks3d.scad @@ -15,13 +15,13 @@ // Module: chamfer_edge_mask() // Usage: -// chamfer_edge_mask(l, chamfer, [excess]) [ATTACHMENTS]; +// chamfer_edge_mask(l|h=|length=|height=, chamfer, [excess]) [ATTACHMENTS]; // Description: // Creates a shape that can be used to chamfer a 90 degree edge. // Difference it from the object to be chamfered. The center of // the mask object should align exactly with the edge to be chamfered. // Arguments: -// l = Length of mask. +// l/h/length/height = Length of mask. // chamfer = Size of chamfer. // excess = The extra amount to add to the length of the mask so that it differences away from other shapes cleanly. Default: `0.1` // --- @@ -41,8 +41,9 @@ // edge_mask(TOP+RIGHT) // #chamfer_edge_mask(l=50, chamfer=10); // } -function chamfer_edge_mask(l=1, chamfer=1, excess=0.1, anchor=CENTER, spin=0, orient=UP) = no_function("chamfer_edge_mask"); -module chamfer_edge_mask(l=1, chamfer=1, excess=0.1, anchor=CENTER, spin=0, orient=UP) { +function chamfer_edge_mask(l, chamfer=1, excess=0.1, h, length, height, anchor=CENTER, spin=0, orient=UP) = no_function("chamfer_edge_mask"); +module chamfer_edge_mask(l, chamfer=1, excess=0.1, h, length, height, anchor=CENTER, spin=0, orient=UP) { + l = one_defined([l, h, height, length], "l,h,height,length"); attachable(anchor,spin,orient, size=[chamfer*2, chamfer*2, l]) { cylinder(r=chamfer, h=l+excess, center=true, $fn=4); children(); @@ -149,14 +150,14 @@ module chamfer_cylinder_mask(r, chamfer, d, ang=45, from_end=false, anchor=CENTE // Module: rounding_edge_mask() // Usage: -// rounding_edge_mask(l|h, r|d, [excess=]) [ATTACHMENTS]; -// rounding_edge_mask(l|h, r1=|d1=, r2=|d2=, [excess=]) [ATTACHMENTS]; +// rounding_edge_mask(l|h=|length=|height=, r|d=, [excess=]) [ATTACHMENTS]; +// rounding_edge_mask(l|h=|length=|height=, r1=|d1=, r2=|d2=, [excess=]) [ATTACHMENTS]; // Description: // Creates a shape that can be used to round a vertical 90 degree edge. // Difference it from the object to be rounded. The center of the mask // object should align exactly with the edge to be rounded. // Arguments: -// l/h = Length of mask. +// l/h/length/height = Length of mask. // r = Radius of the rounding. // --- // r1 = Bottom radius of rounding. @@ -193,10 +194,10 @@ module chamfer_cylinder_mask(r, chamfer, d, ang=45, from_end=false, anchor=CENTE // rounding_edge_mask(l=p.z, r=25); // } // } -function rounding_edge_mask(l, r, r1, r2, d, d1, d2, excess=0.1, anchor=CENTER, spin=0, orient=UP, h=undef) = no_function("rounding_edge_mask"); -module rounding_edge_mask(l, r, r1, r2, d, d1, d2, excess=0.1, anchor=CENTER, spin=0, orient=UP, h=undef) +function rounding_edge_mask(l, r, r1, r2, d, d1, d2, excess=0.1, anchor=CENTER, spin=0, orient=UP, h,height,length) = no_function("rounding_edge_mask"); +module rounding_edge_mask(l, r, r1, r2, d, d1, d2, excess=0.1, anchor=CENTER, spin=0, orient=UP, h,height,length) { - l = first_defined([l, h, 1]); + l = one_defined([l, h, height, length], "l,h,height,length"); r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=1); r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=1); sides = quantup(segs(max(r1,r2)),4); @@ -275,14 +276,14 @@ module rounding_corner_mask(r, d, style="octa", excess=0.1, anchor=CENTER, spin= // Module: rounding_angled_edge_mask() // Usage: -// rounding_angled_edge_mask(h, r|d=, [ang=]) [ATTACHMENTS]; -// rounding_angled_edge_mask(h, r1=|d1=, r2=|d2=, [ang=]) [ATTACHMENTS]; +// rounding_angled_edge_mask(h|l=|length=|height=, r|d=, [ang=]) [ATTACHMENTS]; +// rounding_angled_edge_mask(h|l=|length=|height=, r1=|d1=, r2=|d2=, [ang=]) [ATTACHMENTS]; // Description: // Creates a vertical mask that can be used to round the edge where two face meet, at any arbitrary // angle. Difference it from the object to be rounded. The center of the mask should align exactly // with the edge to be rounded. // Arguments: -// h = Height of vertical mask. +// h/l/height/length = Height of vertical mask. // r = Radius of the rounding. // --- // r1 = Bottom radius of rounding. @@ -304,8 +305,8 @@ module rounding_corner_mask(r, d, style="octa", excess=0.1, anchor=CENTER, spin= // pie_slice(ang=70, h=50, d=100, center=true); // #rounding_angled_edge_mask(h=51, r1=10, r2=25, ang=70, $fn=32); // } -function rounding_angled_edge_mask(h, r, r1, r2, d, d1, d2, ang=90, anchor=CENTER, spin=0, orient=UP) = no_function("rounding_angled_edge_mask"); -module rounding_angled_edge_mask(h, r, r1, r2, d, d1, d2, ang=90, anchor=CENTER, spin=0, orient=UP) +function rounding_angled_edge_mask(h, r, r1, r2, d, d1, d2, ang=90, anchor=CENTER, spin=0, orient=UP,l,height,length) = no_function("rounding_angled_edge_mask"); +module rounding_angled_edge_mask(h, r, r1, r2, d, d1, d2, ang=90, anchor=CENTER, spin=0, orient=UP,l,height,length) { function _mask_shape(r) = [ for (i = [0:1:n]) let (a=90+ang+i*sweep/n) [r*cos(a)+x, r*sin(a)+r], @@ -313,7 +314,7 @@ module rounding_angled_edge_mask(h, r, r1, r2, d, d1, d2, ang=90, anchor=CENTER, [min(-1, r*cos(270-ang)+x-1), r*sin(270-ang)-r], [min(-1, r*cos(90+ang)+x-1), r*sin(90+ang)+r], ]; - + h = one_defined([l, h, height, length], "l,h,height,length"); sweep = 180-ang; r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=1); r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=1); @@ -445,10 +446,10 @@ module rounding_cylinder_mask(r, rounding, d, anchor=CENTER, spin=0, orient=UP) // hole to be rounded. // Arguments: // r = Radius of hole. -// d = Diameter of hole to rounding. // rounding = Radius of the rounding. // excess = The extra thickness of the mask. Default: `0.1`. // --- +// d = Diameter of hole to rounding. // anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER` // spin = Rotate this many degrees around the Z axis after anchor. See [spin](attachments.scad#subsection-spin). Default: `0` // orient = Vector to rotate top towards, after spin. See [orient](attachments.scad#subsection-orient). Default: `UP` @@ -486,11 +487,11 @@ module rounding_hole_mask(r, rounding, excess=0.1, d, anchor=CENTER, spin=0, ori // Module: teardrop_edge_mask() // Usage: -// teardrop_edge_mask(l, r|d=, [angle], [excess], [anchor], [spin], [orient]) [ATTACHMENTS]; +// teardrop_edge_mask(l|h=|length=|height=, r|d=, [angle], [excess], [anchor], [spin], [orient]) [ATTACHMENTS]; // Description: // Makes an apropriate 3D corner rounding mask that keeps within `angle` degrees of vertical. // Arguments: -// l = length of mask +// l/h/length/height = length of mask // r = Radius of the mask rounding. // angle = Maximum angle from vertical. Default: 45 // excess = Excess mask size. Default: 0.1 @@ -509,9 +510,10 @@ module rounding_hole_mask(r, rounding, excess=0.1, d, anchor=CENTER, spin=0, ori // corner_mask(BOT) // teardrop_corner_mask(r=10, angle=40); // } -function teardrop_edge_mask(l, r, angle, excess=0.1, d, anchor, spin, orient) = no_function("teardrop_edge_mask"); -module teardrop_edge_mask(l, r, angle, excess=0.1, d, anchor=CTR, spin=0, orient=UP) +function teardrop_edge_mask(l, r, angle=45, excess=0.1, d, anchor, spin, orient,h,height,length) = no_function("teardrop_edge_mask"); +module teardrop_edge_mask(l, r, angle=45, excess=0.1, d, anchor=CTR, spin=0, orient=UP,h,height,length) { + l = one_defined([l, h, height, length], "l,h,height,length"); check = assert(is_num(l) && l>0, "Length of mask must be positive") assert(is_num(angle) && angle>0 && angle<90, "Angle must be a number between 0 and 90")