openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-08-18 18:11:16 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Richard Milewski
2025-05-04 12:43:01 -07:00
parent 28211b1db4 3ee24b287c
commit 86ff46fba8
3 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
shapes3d.scad
View File

@@ -121,7 +121,8 @@ function cube(size=1, center, anchor, spin=0, orient=UP) =
// edges = Edges to mask. See [Specifying Edges](attachments.scad#section-specifying-edges). Default: all edges.
// except = Edges to explicitly NOT mask. See [Specifying Edges](attachments.scad#section-specifying-edges). Default: No edges.
// trimcorners = If true, rounds or chamfers corners where three chamfered/rounded edges meet. Default: `true`
// teardrop = If given as a number, rounding around the bottom edge of the cuboid won't exceed this many degrees from vertical. If true, the limit angle is 45 degrees. Default: `false`
// teardrop = If given as a number, rounding around the bottom edge of the cuboid won't exceed this many degrees from vertical, altering to a chamfer at that angle. If true, the limit angle is 45 degrees. Default: `false`
// clip_angle = If given as a number, rounding around the bottom edge of the cuboid won't exceed this many degrees from vertical, with the rounding stopping at the bottom of the cuboid. Default: (no clipping)
// p1 = Align the cuboid's corner at `p1`, if given. Forces `anchor=FRONT+LEFT+BOTTOM`.
// p2 = If given with `p1`, defines the cornerpoints of the cuboid.
// anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER`
@@ -147,6 +148,8 @@ function cube(size=1, center, anchor, spin=0, orient=UP) =
// cuboid([30,40,50], rounding=10);
// Example(VPR=[100,0,25],VPD=180): Rounded Edges and Corners with Teardrop Bottoms
// cuboid([30,40,50], rounding=10, teardrop=true);
// Example(VPR=[100,0,25],VPD=180): Rounded Edges and Corners with Clipped Bottoms
// cuboid([30,40,50], rounding=10, clip_angle=40);
// Example: Rounded Edges, Untrimmed Corners
// cuboid([30,40,50], rounding=10, trimcorners=false);
// Example: Chamferring Selected Edges
@@ -200,6 +203,7 @@ module cuboid(
except_edges,
trimcorners=true,
teardrop=false,
clip_angle,
anchor=CENTER,
spin=0,
orient=UP
@@ -219,6 +223,9 @@ module cuboid(
module xtcyl(l,r) {
if (teardrop) {
teardrop(r=r, l=l, cap_h=r, ang=teardrop, spin=90, orient=DOWN);
} else if (is_finite(clip_angle)) {
cap_h = r * sin(clip_angle);
down(r-cap_h) teardrop(r=r, l=l, cap_h=cap_h, ang=clip_angle, spin=90, orient=DOWN);
} else {
yrot(90) cyl(l=l, r=r);
}
@@ -226,6 +233,9 @@ module cuboid(
module ytcyl(l,r) {
if (teardrop) {
teardrop(r=r, l=l, cap_h=r, ang=teardrop, spin=0, orient=DOWN);
} else if (is_finite(clip_angle)) {
cap_h = r * sin(clip_angle);
down(r-cap_h) teardrop(r=r, l=l, cap_h=cap_h, ang=clip_angle, spin=0, orient=DOWN);
} else {
zrot(90) yrot(90) cyl(l=l, r=r);
}
@@ -233,6 +243,9 @@ module cuboid(
module tsphere(r) {
if (teardrop) {
onion(r=r, cap_h=r, ang=teardrop, orient=DOWN);
} else if (is_finite(clip_angle)) {
cap_h = r * sin(clip_angle);
down(r-cap_h) onion(r=r, cap_h=cap_h, ang=clip_angle, orient=DOWN);
} else {
spheroid(r=r, style="octa", orient=DOWN);
}
@@ -344,6 +357,8 @@ module cuboid(
assert(is_undef(rounding) || is_finite(rounding),"rounding must be a finite value")
assert(is_undef(rounding) || is_undef(chamfer), "Cannot specify nonzero value for both chamfer and rounding")
assert(teardrop==false || (is_finite(teardrop) && teardrop>0 && teardrop<=90), "teardrop must be either false or an angle number between 0 and 90")
assert(clip_angle==undef || (is_finite(clip_angle) && clip_angle>0 && clip_angle<=90), "clip_angle must be either false or an angle number between 0 and 90")
assert(!teardrop || clip_angle==undef, "teardrop= and clip_angle= are mutually exclusive features.")
assert(is_undef(p1) || is_vector(p1,3), "p1 must be a 3-vector")
assert(is_undef(p2) || is_vector(p2,3), "p2 must be a 3-vector")
assert(is_bool(trimcorners));
@@ -876,6 +891,7 @@ function prismoid(
// rounding2 = The radius of the rounding on the top end of the prism.
// realign = If true, rotate the prism by half the angle of one face so that a face points in the X+ direction. Default: false
// teardrop = If given as a number, rounding around the bottom edge of the prism won't exceed this many degrees from vertical. If true, the limit angle is 45 degrees. Default: `false`
// clip_angle = If given as a number, rounding around the bottom edge of the prism won't exceed this many degrees from vertical, with the rounding stopping at the bottom of the prism. Default: (no clipping)
// texture = A texture name string, or a rectangular array of scalar height values (0.0 to 1.0), or a VNF tile that defines the texture to apply to vertical surfaces. See {{texture()}} for what named textures are supported.
// tex_size = An optional 2D target size (2-vector or scalar) for the textures. Actual texture sizes will be scaled somewhat to evenly fit the available surface. Default: `[5,5]`
// tex_reps = If given instead of tex_size, a scalar or 2-vector giving the number of texture tile repetitions in the horizontal and vertical directions.
@@ -891,6 +907,10 @@ function prismoid(
// regular_prism(5,r=10,h=25);
// Example: With end rounding
// regular_prism(5,r=10,h=25,rounding=3,$fn=32);
// Example: With teardrop end rounding
// regular_prism(5,r=10,h=25,rounding=3,teardrop=40,$fn=32);
// Example: With clipped end rounding
// regular_prism(5,r=10,h=25,rounding=3,clip_angle=40,$fn=32);
// Example: By side length at bottom, inner radius at top, shallow chamfer
// regular_prism(7, side1=10, ir2=7, height=20,chamfer2=2,chamfang2=20);
// Example: With shift
@@ -919,7 +939,7 @@ module regular_prism(n,
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
realign=false, shift=[0,0],
teardrop=false,
teardrop=false, clip_angle,
from_end, from_end1, from_end2,
texture, tex_size=[5,5], tex_reps,
tex_inset=false, tex_rot=0,
@@ -935,7 +955,7 @@ module regular_prism(n,
chamfang=chamfang,chamfang1=chamfang1,chamfang2=chamfang2,
rounding=rounding,rounding1=rounding1, rounding2=rounding2,
realign=realign, shift=shift,
teardrop=teardrop,
teardrop=teardrop, clip_angle=clip_angle,
from_end=from_end, from_end1=from_end1, from_end2=from_end2,
texture=texture, tex_size=tex_size, tex_reps=tex_reps,
tex_inset=tex_inset, tex_rot=tex_rot,
@@ -958,7 +978,7 @@ function regular_prism(n,
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
circum=false, realign=false, shift=[0,0],
teardrop=false,
teardrop=false, clip_angle,
from_end, from_end1, from_end2,
texture, tex_size=[5,5], tex_reps,
tex_inset=false, tex_rot=0,
@@ -1005,7 +1025,7 @@ function regular_prism(n,
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
from_end, from_end1, from_end2,
teardrop),
teardrop, clip_angle),
[0,height/2]
]
)
@@ -1938,10 +1958,10 @@ function cylinder(h, r1, r2, center, r, d, d1, d2, anchor, spin=0, orient=UP) =
// cyl(l|h|length|height, r|d, chamfer1=, chamfer2=, [chamfang1=], [chamfang2=], [from_end=], ...);
//
// Usage: Rounded End Cylinders
// cyl(l|h|length|height, r|d, rounding=, ...);
// cyl(l|h|length|height, r|d, rounding1=, ...);
// cyl(l|h|length|height, r|d, rounding2=, ...);
// cyl(l|h|length|height, r|d, rounding1=, rounding2=, ...);
// cyl(l|h|length|height, r|d, rounding=, [teardrop=], [clip_angle=], ...);
// cyl(l|h|length|height, r|d, rounding1=, [teardrop=], [clip_angle=], ...);
// cyl(l|h|length|height, r|d, rounding2=, [teardrop=], [clip_angle=], ...);
// cyl(l|h|length|height, r|d, rounding1=, rounding2=, [teardrop=], [clip_angle=], ...);
//
// Usage: Textured Cylinders
// cyl(l|h|length|height, r|d, texture=, [tex_size=]|[tex_reps=], [tex_depth=], [tex_rot=], [tex_samples=], [style=], [tex_taper=], [tex_inset=], ...);
@@ -2022,7 +2042,8 @@ function cylinder(h, r1, r2, center, r, d, d1, d2, anchor, spin=0, orient=UP) =
// extra1 = Add extra height to the bottom end
// extra2 = Add extra height to the top end.
// realign = If true, rotate the cylinder by half the angle of one face.
// teardrop = If given as a number, rounding around the bottom edge of the cylinder won't exceed this many degrees from vertical. If true, the limit angle is 45 degrees. Default: `false`
// teardrop = If given as a number, rounding around the bottom edge of the cylinder won't exceed this many degrees from horizontal. If true, the limit angle is 45 degrees. Default: `false`
// clip_angle = If given as a number, rounding around the bottom edge of the cylinder won't exceed this many degrees from horizontal, with the rounding stopping at the bottom of the cylinder. Default: (no clipping)
// texture = A texture name string, or a rectangular array of scalar height values (0.0 to 1.0), or a VNF tile that defines the texture to apply to vertical surfaces. See {{texture()}} for what named textures are supported.
// tex_size = An optional 2D target size (2-vector or scalar) for the textures. Actual texture sizes will be scaled somewhat to evenly fit the available surface. Default: `[5,5]`
// tex_reps = If given instead of tex_size, a scalar or 2-vector giving the integer number of texture tile repetitions in the horizontal and vertical directions.
@@ -2063,6 +2084,9 @@ function cylinder(h, r1, r2, center, r, d, d1, d2, anchor, spin=0, orient=UP) =
// Example(VPD=175;VPR=[90,0,0]): Teardrop Bottom Rounding
// cyl(l=40, d=40, rounding=10, teardrop=true);
//
// Example(VPD=175;VPR=[90,0,0]): Clipped Bottom Rounding
// cyl(l=40, d=40, rounding=10, clip_angle=40);
//
// Example: Heterogenous Chamfers and Rounding
// ydistribute(80) {
// // Shown Front to Back.
@@ -2165,7 +2189,7 @@ function _cyl_path(
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
from_end, from_end1, from_end2,
teardrop=false,
teardrop=false, clip_angle
) =
let(
vang = atan2(r1-r2,l),
@@ -2213,7 +2237,12 @@ function _cyl_path(
teardrop == false? 90 :
assert(is_finite(teardrop))
assert(teardrop>=0 && teardrop<=90)
teardrop
teardrop,
clip_ang = clip_angle == undef? 90 :
assert(is_finite(clip_angle))
assert(clip_angle>=0 && clip_angle<=90)
clip_angle
)
assert(is_finite(round1), "rounding1 must be a number if given.")
assert(is_finite(round2), "rounding2 must be a number if given.")
@@ -2222,6 +2251,7 @@ function _cyl_path(
assert(roundlen1 <= r1, "size of rounding1 is larger than the r1 radius of the cylinder.")
assert(roundlen2 <= r2, "size of rounding2 is larger than the r2 radius of the cylinder.")
assert(dy1+dy2 <= facelen, "Chamfers/roundings don't fit on the cylinder/cone. They exceed the length of the cylinder/cone face.")
assert(td_ang==90 || clip_ang==90, "teardrop= and clip_angle= are mutually exclusive options.")
[
if (!approx(chamf1r,0))
each [
@@ -2230,6 +2260,8 @@ function _cyl_path(
]
else if (!approx(round1,0) && td_ang < 90)
each _teardrop_corner(r=round1, corner=[[max(0,r1-2*roundlen1),-l/2],[r1,-l/2],[r2,l/2]], ang=td_ang)
else if (!approx(round1,0) && clip_ang < 90)
each _clipped_corner(r=round1, corner=[[max(0,r1-2*roundlen1),-l/2],[r1,-l/2],[r2,l/2]], ang=clip_ang)
else if (!approx(round1,0) && td_ang >= 90)
each arc(r=abs(round1), corner=[[max(0,r1-2*roundlen1),-l/2],[r1,-l/2],[r2,l/2]])
else [r1,-l/2],
@@ -2255,7 +2287,7 @@ function cyl(
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
circum=false, realign=false, shift=[0,0],
teardrop=false,
teardrop=false, clip_angle,
from_end, from_end1, from_end2,
texture, tex_size=[5,5], tex_reps, tex_counts,
tex_inset=false, tex_rot=0,
@@ -2299,7 +2331,7 @@ function cyl(
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
from_end, from_end1, from_end2,
teardrop),
teardrop, clip_angle),
path = [
if (texture==undef) [0,-l/2-extra1],
if (extra1>0) cpath[0]-[0,extra1],
@@ -2330,19 +2362,39 @@ function _teardrop_corner(r, corner, ang=45) =
assert(is_finite(r))
assert(is_finite(ang)),
cp = circle_2tangents(abs(r), corner)[0],
pvec = rot(sign(r)*90,p=corner[0]-corner[1]),
path1 = arc(r=abs(r), corner=corner),
path2 = [
for (p = select(path1,0,-2))
if (abs(modang(v_theta(p-cp)-90)) <= 180-ang) p,
if (vector_angle(p-cp, pvec) > ang) p,
last(path1)
],
path = [
line_intersection([corner[0],corner[1]],[path2[0],path2[0]+polar_to_xy(1,-90-ang*sign(r))]),
line_intersection([corner[0],corner[1]],[path2[0],path2[0]+polar_to_xy(1,270-(90-ang)*sign(r))]),
each path2
]
) path;
function _clipped_corner(r, corner, ang=45) =
let(
check = assert(len(corner)==3)
assert(is_finite(r))
assert(is_finite(ang)),
vec1 = unit(corner[0] - corner[1]),
vec2 = unit(corner[2] - corner[1]),
off = r * (1-cos(ang)) * rot(90, p=vec1),
line1 = [corner[0], corner[1]] + [off, off],
line2 = [corner[1], corner[2]],
corn_pt = line_intersection(line1,line2),
cp = circle_2tangents(abs(r), [line1[0],corn_pt,line2[1]])[0],
vec3 = rot(sign(r)*(90+ang), p=vec1),
vec4 = rot(-sign(r)*90, p=vec2),
dang = vector_angle(vec3,vec4),
path = arc(r=abs(r), cp=cp, start=v_theta(vec3), angle=sign(r)*dang)
) path;
module cyl(
h, r, center,
l, r1, r2,
@@ -2351,7 +2403,7 @@ module cyl(
chamfang, chamfang1, chamfang2,
rounding, rounding1, rounding2,
circum=false, realign=false, shift=[0,0],
teardrop=false,
teardrop=false, clip_angle,
from_end, from_end1, from_end2,
texture, tex_size=[5,5], tex_reps, tex_counts,
tex_inset=false, tex_rot=0,
@@ -2391,7 +2443,7 @@ module cyl(
chamfang=chamfang, chamfang1=chamfang1, chamfang2=chamfang2,
rounding=rounding, rounding1=rounding1, rounding2=rounding2,
from_end=from_end, from_end1=from_end1, from_end2=from_end2,
teardrop=teardrop,
teardrop=teardrop, clip_angle=clip_angle,
texture=texture, tex_size=tex_size,
tex_reps=tex_reps, tex_depth=tex_depth,
tex_inset=tex_inset, tex_rot=tex_rot,
@@ -2676,7 +2728,7 @@ module zcyl(
// tube(h|l, ir1=|id1=, ir2=|id2=, or1=|od1=, or2=|od2=, ...) [ATTACHMENTS];
// tube(h|l, or1=|od1=, or2=|od2=, wall=, ...) [ATTACHMENTS];
// Usage: Rounded and chamfered tubes
// tube(..., [rounding=], [irounding=], [orounding=], [rounding1=], [rounding2=], [irounding1=], [irounding2=], [orounding1=], [orounding2=], [teardrop=]);
// tube(..., [rounding=], [irounding=], [orounding=], [rounding1=], [rounding2=], [irounding1=], [irounding2=], [orounding1=], [orounding2=], [teardrop=], [clip_angle=]);
// tube(..., [chamfer=], [ichamfer=], [ochamfer=], [chamfer1=], [chamfer2=], [ichamfer1=], [ichamfer2=], [ochamfer1=], [ochamfer2=]);
// Arguments:
// h / l / height / length = height of tube. Default: 1
@@ -2717,7 +2769,8 @@ module zcyl(
// ochamfer = The size of the chamfer on the outside of the ends of the tube.
// ochamfer1 = The size of the chamfer on the bottom outside end of the tube.
// ochamfer2 = The size of the chamfer on the top outside end of the tube.
// teardrop = if true roundings on the bottom use a teardrop shape. Default: false
// teardrop = If given as a number, rounding around the bottom edges won't exceed this many degrees from the endcap, altering to a chamfer at that angle. If true, the limit angle is 45 degrees. Default: `false`
// clip_angle = If given as a number, rounding around the bottom edges won't exceed this many degrees from the endcap, with the rounding stopping at the bottom of the shape. Default: (no clipping)
// realign = If true, rotate the inner and outer parts tube by half the angle of one face so that a face is aligned at the X+ axis. Default: False
// 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`
@@ -2739,9 +2792,21 @@ module zcyl(
// Example: Chamfered tube
// back_half()
// tube(ir=10,or=20, h=30, chamfer=2);
// Example: Rounded tube
// back_half()
// tube(ir=10,or=20,or2=5,ir2=2, h=30,
// rounding1=5, rounding2=1.5);
// Example: Rounded conical tube, with negative rounding at base
// back_half()
// tube(ir=10,or=20,or2=5,ir2=2, h=30, rounding1=-5,rounding2=1.5);
// Example: Teardrop bottom rounding
// back_half()
// tube(ir=10,or=20,or2=5,ir2=2, h=30,
// rounding1=5, rounding2=1.5, teardrop=true);
// Example: Clipped bottom rounding
// back_half()
// tube(ir=10,or=20,or2=5,ir2=2, h=30,
// rounding1=5, rounding2=1.5, clip_angle=40);
// Example: Mixing chamfers and roundings
// back_half()
// tube(ir=10,or=20,h=30, ochamfer1=-5,irounding1=-3, orounding2=6, ichamfer2=2);
@@ -2758,7 +2823,8 @@ function tube(
ir1, ir2, id1, id2,
realign=false, l, length, height,
anchor, spin=0, orient=UP, orounding1,irounding1,orounding2,irounding2,rounding1,rounding2,rounding,
ochamfer1,ichamfer1,ochamfer2,ichamfer2,chamfer1,chamfer2,chamfer,irounding,ichamfer,orounding,ochamfer, teardrop=false, shift=[0,0],
ochamfer1,ichamfer1,ochamfer2,ichamfer2,chamfer1,chamfer2,chamfer,irounding,ichamfer,orounding,ochamfer,
teardrop=false, clip_angle, shift=[0,0],
ifn, rounding_fn, circum=false
) = no_function("tube");
@@ -2771,7 +2837,8 @@ module tube(
ir1, ir2, id1, id2,
realign=false, l, length, height,
anchor, spin=0, orient=UP, orounding1,irounding1,orounding2,irounding2,rounding1,rounding2,rounding,
ochamfer1,ichamfer1,ochamfer2,ichamfer2,chamfer1,chamfer2,chamfer,irounding,ichamfer,orounding,ochamfer, teardrop=false, shift=[0,0],
ochamfer1,ichamfer1,ochamfer2,ichamfer2,chamfer1,chamfer2,chamfer,irounding,ichamfer,orounding,ochamfer,
teardrop=false, clip_angle, shift=[0,0],
ifn, rounding_fn, circum=false
) {
h = one_defined([h,l,height,length],"h,l,height,length",dflt=1);
@@ -2845,7 +2912,7 @@ module tube(
each _cyl_path(r1,r2,h,
chamfer1=ochamfer1, chamfer2=ochamfer2,
rounding1=orounding1, rounding2=orounding2,
teardrop=teardrop),
teardrop=teardrop, clip_angle=clip_angle),
[0,h/2]
];
ipath = _cyl_path(adj_ir1,adj_ir2,h,

2
skin.scad
View File

@@ -982,7 +982,7 @@ function linear_sweep(
// tex_reps=[6,2],caps=true);
// Example(NoAxes): If we manually connect the top and bottom then they also receive texture.
// rotate_sweep([[0,-10],[20,-10],[20,10],[0,10]],
// tex_reps=[6,6],,tex_depth=1.5,
// tex_reps=[6,6],tex_depth=1.5,
// texture="dots");
// Example(NoAxes,VPR=[95.60,0.00,69.80],VPD=74.40,VPT=[5.81,5.74,1.97]): You can connect just the top or bottom alone instead of both to get texture on one and a flat cap on the other. Here you can see that the sloped top has texture but the bottom does not. Also note that the texture doesn't fit neatly on the side and top like it did in the previous two examples, but makes a somewhat ugly transition across the corner. You have to size your object carefully so that the tops and sides each fit an integer number of texture tiles to avoid this type of transition.
// rotate_sweep([[15,-10],[15,10],[0,15]],

2
sliders.scad
View File

@@ -42,7 +42,7 @@ module slider(l=30, w=10, h=10, base=10, wall=5, ang=30, chamfer=2, anchor=BOTTO
full_width = w + 2*wall;
full_height = h + base;
attachable(anchor,spin,orient, size=[full_width, l, h+2*base]) {
attachable(anchor,spin,orient, size=[l, full_width, full_height], offset=[0,0,-h/2]) {
zrot(90)
down(base+h/2) {
// Base