grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed corner_profile() and edge_profile() to allow negative-rounding and chamfering.

Browse source
This commit is contained in:
Revar Desmera 2023-05-14 03:16:26 -07:00
parent b4ad82bcef
commit 0adbe53545
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
attachments.scad
View file

@ -1551,6 +1551,7 @@ module corner_mask(corners=CORNERS_ALL, except=[]) {
// r = Radius of corner mask. // r = Radius of corner mask.
// --- // ---
// d = Diameter of corner mask. // d = Diameter of corner mask.
// excess = Excess length to extrude the profile to make edge masks. Default: 0.01
// convexity = Max number of times a line could intersect the perimeter of the mask shape. Default: 10 // convexity = Max number of times a line could intersect the perimeter of the mask shape. Default: 10
// Side Effects: // Side Effects:
// Tags the children with "remove" (and hence sets `$tag`) if no tag is already set. // Tags the children with "remove" (and hence sets `$tag`) if no tag is already set.
@ -1562,13 +1563,13 @@ module corner_mask(corners=CORNERS_ALL, except=[]) {
// cube([50,60,70],center=true) // cube([50,60,70],center=true)
// face_profile(TOP,r=10) // face_profile(TOP,r=10)
// mask2d_roundover(r=10); // mask2d_roundover(r=10);
module face_profile(faces=[], r, d, convexity=10) { module face_profile(faces=[], r, d, excess=0.01, convexity=10) {
req_children($children); req_children($children);
faces = is_vector(faces)? [faces] : faces; faces = is_vector(faces)? [faces] : faces;
assert(all([for (face=faces) is_vector(face) && sum([for (x=face) x!=0? 1 : 0])==1]), "Vector in faces doesn't point at a face."); assert(all([for (face=faces) is_vector(face) && sum([for (x=face) x!=0? 1 : 0])==1]), "Vector in faces doesn't point at a face.");
r = get_radius(r=r, d=d, dflt=undef); r = get_radius(r=r, d=d, dflt=undef);
assert(is_num(r) && r>0); assert(is_num(r) && r>=0);
edge_profile(faces) children(); edge_profile(faces, excess=excess) children();
corner_profile(faces, convexity=convexity, r=r) children(); corner_profile(faces, convexity=convexity, r=r) children();
} }
@ -1589,6 +1590,7 @@ module face_profile(faces=[], r, d, convexity=10) {
// Arguments: // Arguments:
// edges = Edges to mask. See [Specifying Edges](attachments.scad#subsection-specifying-edges). Default: All edges. // edges = Edges to mask. See [Specifying Edges](attachments.scad#subsection-specifying-edges). Default: All edges.
// except = Edges to explicitly NOT mask. See [Specifying Edges](attachments.scad#subsection-specifying-edges). Default: No edges. // except = Edges to explicitly NOT mask. See [Specifying Edges](attachments.scad#subsection-specifying-edges). Default: No edges.
// excess = Excess length to extrude the profile to make edge masks. Default: 0.01
// convexity = Max number of times a line could intersect the perimeter of the mask shape. Default: 10 // convexity = Max number of times a line could intersect the perimeter of the mask shape. Default: 10
// Side Effects: // Side Effects:
// Tags the children with "remove" (and hence sets `$tag`) if no tag is already set. // Tags the children with "remove" (and hence sets `$tag`) if no tag is already set.
@ -1600,7 +1602,7 @@ module face_profile(faces=[], r, d, convexity=10) {
// cube([50,60,70],center=true) // cube([50,60,70],center=true)
// edge_profile([TOP,"Z"],except=[BACK,TOP+LEFT]) // edge_profile([TOP,"Z"],except=[BACK,TOP+LEFT])
// mask2d_roundover(r=10, inset=2); // mask2d_roundover(r=10, inset=2);
module edge_profile(edges=EDGES_ALL, except=[], convexity=10) { module edge_profile(edges=EDGES_ALL, except=[], excess=0.01, convexity=10) {
req_children($children); req_children($children);
assert($parent_geom != undef, "No object to attach to!"); assert($parent_geom != undef, "No object to attach to!");
edges = _edges(edges, except=except); edges = _edges(edges, except=except);
@ -1619,7 +1621,7 @@ module edge_profile(edges=EDGES_ALL, except=[], convexity=10) {
$attach_norot = true; $attach_norot = true;
$profile_type = "edge"; $profile_type = "edge";
psize = point3d($parent_size); psize = point3d($parent_size);
length = [for (i=[0:2]) if(!vec[i]) psize[i]][0]+0.1; length = [for (i=[0:2]) if(!vec[i]) psize[i]][0] + excess;
rotang = rotang =
vec.z<0? [90,0,180+v_theta(vec)] : vec.z<0? [90,0,180+v_theta(vec)] :
vec.z==0 && sign(vec.x)==sign(vec.y)? 135+v_theta(vec) : vec.z==0 && sign(vec.x)==sign(vec.y)? 135+v_theta(vec) :
@ -1644,8 +1646,8 @@ module edge_profile(edges=EDGES_ALL, except=[], convexity=10) {
// PARENT() corner_profile([corners], [except], [r=|d=], [convexity=]) CHILDREN; // PARENT() corner_profile([corners], [except], [r=|d=], [convexity=]) CHILDREN;
// Description: // Description:
// Takes a 2D mask shape, rotationally extrudes and converts it into a corner mask, and attaches it // Takes a 2D mask shape, rotationally extrudes and converts it into a corner mask, and attaches it
// to the selected corners with the appropriate orientation. If no tag is set // to the selected corners with the appropriate orientation. If no tag is set then `corner_profile()`
// then `corner_profile` sets the tag for children to "remove" so that it will work with the default {{diff()}} tag. // sets the tag for children to "remove" so that it will work with the default {{diff()}} tag.
// See [Specifying Corners](attachments.scad#subsection-specifying-corners) for information on how to specify corner sets. // See [Specifying Corners](attachments.scad#subsection-specifying-corners) for information on how to specify corner sets.
// For a step-by-step explanation of attachments, see the [Attachments Tutorial](Tutorial-Attachments). // For a step-by-step explanation of attachments, see the [Attachments Tutorial](Tutorial-Attachments).
// Arguments: // Arguments:
@ -1668,7 +1670,7 @@ module edge_profile(edges=EDGES_ALL, except=[], convexity=10) {
// } // }
module corner_profile(corners=CORNERS_ALL, except=[], r, d, convexity=10) { module corner_profile(corners=CORNERS_ALL, except=[], r, d, convexity=10) {
assert($parent_geom != undef, "No object to attach to!"); assert($parent_geom != undef, "No object to attach to!");
r = get_radius(r=r, d=d, dflt=undef); r = max(0.01, get_radius(r=r, d=d, dflt=undef));
assert(is_num(r)); assert(is_num(r));
corners = _corners(corners, except=except); corners = _corners(corners, except=except);
vecs = [for (i = [0:7]) if (corners[i]>0) CORNER_OFFSETS[i]]; vecs = [for (i = [0:7]) if (corners[i]>0) CORNER_OFFSETS[i]];
@ -1687,17 +1689,18 @@ module corner_profile(corners=CORNERS_ALL, except=[], r, d, convexity=10) {
$tag = $tag=="" ? str($tag_prefix,"remove") : $tag; $tag = $tag=="" ? str($tag_prefix,"remove") : $tag;
translate(anch[1]) { translate(anch[1]) {
rot(rotang) { rot(rotang) {
render(convexity=convexity) down(0.01) {
difference() { linear_extrude(height=r+0.01, center=false) {
translate(-0.1*[1,1,1]) cube(r+0.1, center=false); difference() {
right(r) back(r) zrot(180) { translate(-[0.01,0.01]) square(r);
rotate_extrude(angle=90, convexity=convexity) { translate([r,r]) circle(r=r*0.999);
xflip() left(r) { }
difference() { }
square(r,center=false); }
children(); translate([r,r]) zrot(180) {
} rotate_extrude(angle=90, convexity=convexity) {
} right(r) xflip() {
children();
} }
} }
} }