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

bug fixes & new examples

Browse Source
This commit is contained in:
Adrian Mariano
2025-04-19 22:10:17 -04:00
parent 736dd57f70
commit d7434dc3e3
3 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lists.scad
View File

@@ -390,7 +390,7 @@ function bselect(list,index) =
// e = repeat(4, -1); // Returns []
function repeat(val, n, i=0) =
is_num(n)? [for(j=[1:1:n]) val] :
assert( is_list(n), "Invalid count number.")
assert( is_vector(n), "Invalid count number.")
(i>=len(n))? val :
[for (j=[1:1:n[i]]) repeat(val, n, i+1)];

24
shapes3d.scad
View File

@@ -1232,9 +1232,9 @@ function regular_prism(n,
// textured_tile("trunc_pyramids_vnf", [10,8],
// tex_reps=[5,5], tex_inset=true, diff=true);
// Example(3D,NoAxes,VPT=[5.86588,-0.107082,-0.311155],VPR=[17.2,0,9.6],VPD=32.4895): Tile shaped like a rhombic prism
// textured_tile("ribs", w1=10, w2=10, shift=4,ysize=7);
// textured_tile("ribs", w1=10, w2=10, shift=4, ysize=7, tex_reps=[5,1]);
// Example(3D,NoAxes,VPT=[-0.487417,-0.398897,-0.143258],VPR=[10.2,0,12.4],VPD=26.3165): A tile shaped like a trapezoidal prism. Note that trapezoidal tiles will always distort the texture, resulting in curves
// textured_tile("diamonds", w1=10, w2=7, ysize=7);
// textured_tile("diamonds", w1=10, w2=7, ysize=7, tex_reps=5);
// Example(3D,NoAxes,VPT=[-0.0889877,-0.31974,0.554444],VPR=[22.1,0,22.2],VPD=32.4895): An inset trapezoidal tile placed into a cube
// diff()cuboid([10,10,2])
// attach(TOP,BOT)
@@ -1245,8 +1245,24 @@ function regular_prism(n,
// Example(3D,NoAxes,VPT=[-0.212176,-0.651766,0.124004],VPR=[58.5,0,21.5],VPD=29.2405): This texture has an asymmetry even with the default `tex_extra=1`.
// textured_tile("trunc_ribs", 10, tex_reps=[5,1]);
// Example(3D,NoAxes,VPT=[-0.212176,-0.651766,0.124004],VPR=[58.5,0,21.5],VPD=29.2405): It could be fixed by setting `tex_extra=2`, which would place an extra flat strip on the right. But another option is to use the `tex_skip` parameter to trim the flat part from the left. Note that we are also skipping in the y direction, but it doesn't make a difference for this texture, except that you need to have enough texture tiles to accommodate the skip, so we increased the Y reps value to 2. You can also set `tex_skip` to a vector.
// Example(3D,NoAxes): Textures can be used to place images onto objects. Here we place a very simple image into a cube, leaving a border around the image.
// textured_tile("trunc_ribs", 10, tex_reps=[5,2], tex_skip=1);
// img = [
// [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
// [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0,.5,.5, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0,.5,.5, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
// [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
// ];
// cuboid(25) attach([TOP,FWD,RIGHT],BOT)
// textured_tile(img, [20,20], tex_reps=1);
module textured_tile(
texture,
@@ -1315,7 +1331,7 @@ function textured_tile(
tex_skip=0,
anchor=CENTER, spin=0, orient=UP,
_return_anchor=false
) = let(f=echo(size=tex_size))
) =
assert(is_undef(tex_reps) || is_int(tex_reps) || (all_integer(tex_reps) && len(tex_reps)==2), "tex_reps must be an integer or list of two integers")
assert(is_undef(tex_size) || is_vector(tex_size,2) || is_finite(tex_size))
assert(num_defined([tex_size, tex_reps])<2, "Cannot give both tex_size and tex_reps")

57
skin.scad
View File

@@ -262,10 +262,10 @@ __vnf_no_n_mesg=" texture is a VNF so it does not accept n. Set sample rate for
// Example: rounding corners of a square. Note that `$fn` makes the number of points constant, and avoiding the `rounding=0` case keeps everything simple. In this case, the connections between profiles are linear, so there is no benefit to setting `slices` bigger than zero.
// shapes = [for(i=[.01:.045:2])zrot(-i*180/2,cp=[-8,0,0],p=xrot(90,p=path3d(regular_ngon(n=4, side=4, rounding=i, $fn=64))))];
// rotate(180) skin( shapes, slices=0);
// Example: Here's a simplified version of the above, with `i=0` included. That first layer doesn't look good.
// Example(3D,Med,NoScales,VPR=[66.90,0.00,165.70],VPD=13.79,VPT=[1.43,6.15,4.13]): Here's a simplified version of the above, with `i=0` included. That first layer has narrow triangles creating a stair step effect at the corners.
// shapes = [for(i=[0:.2:1]) path3d(regular_ngon(n=4, side=4, rounding=i, $fn=32),i*5)];
// skin(shapes, slices=0);
// Example: You can fix it by specifying "tangent" for the first method, but you still need "direct" for the rest.
// Example(3D,Med,NoScales,VPR=[66.90,0.00,165.70],VPD=13.79,VPT=[1.43,6.15,4.13]): You can fix it by specifying "tangent" for the first method, but you still need "direct" for the rest.
// shapes = [for(i=[0:.2:1]) path3d(regular_ngon(n=4, side=4, rounding=i, $fn=32),i*5)];
// skin(shapes, slices=0, method=concat(["tangent"],repeat("direct",len(shapes)-2)));
// Example(FlatSpin,VPD=35): Connecting square to pentagon using "direct" method.
@@ -1079,6 +1079,48 @@ function linear_sweep(
// down(31)linear_extrude(height=1)arc(r=23,angle=[0,180], wedge=true);
// rotate_sweep(path, closed=false, texture=diag_weave_vnf, angle=180,
// tex_size=[10,10], convexity=12, tex_depth=2);
// Example(3D,VPR=[59.20,0.00,159.20],VPD=74.40,VPT=[7.45,6.83,1.54],NoAxes): Textures can be used to place images onto objects. If you want to place an image onto a cylinder you probably don't want it to cover the whole cylinder, or to create many small copies. To do this you can create a textured cylinder with an angle less than 360 degrees to hold the texture. In this example we calculate the angle so that the output has the same aspect ratio. The default `tex_extra` of zero for a single tile ensures that the image appears without an extra border.
// img = [
// [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
// [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0,.5,.5, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0,.5,.5, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
// [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
// ];
// h = 20;
// r = 15;
// ang = len(img[0])/len(img)*h/(2*PI*r)*360;
// rotate_sweep([[15,-10],[15,10]], texture=img,
// tex_reps=1,angle=ang, closed=false);
//
// Example(3D,VPR=[80.20,0.00,138.40],VPD=82.67,VPT=[6.88,7.29,1.77],NoAxes): Here we have combined the above model with a suitable cylinder. Note that with a coarse texture like this you need to either match the `$fn` of the cylinder to the texture, or choose a sufficiently fine cylinder to avoid conflicting facets.
// img = [
// [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
// [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0,.5,.5, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0,.5,.5, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0],
// [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0],
// [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
// ];
// h = 20;
// r = 15;
// ang = len(img[0])/len(img)*h/(2*PI*r)*360;
// rotate_sweep([[15,-10],[15,10]], texture=img,
// tex_reps=1,angle=ang, closed=false);
// cyl(r=r,h=27,$fn=128);
function rotate_sweep(
@@ -4445,7 +4487,7 @@ function _textured_revolution(
let( taper_is_ok = is_undef(taper) || (is_finite(taper) && taper>=0 && taper<50) || is_path(taper,2) )
assert(taper_is_ok, "Bad taper= value.")
assert(in_list(atype, _ANCHOR_TYPES), "Anchor type must be \"hull\" or \"intersect\"")
assert(is_finite(tex_extra) || is_vector(tex_extra,2), "tex_extra must be a number of 2-vector")
assert(is_undef(tex_extra) || is_finite(tex_extra) || is_vector(tex_extra,2), "tex_extra must be a number of 2-vector")
let(
regions = !is_path(shape,2)? region_parts(shape)
: closed? region_parts([shape])
@@ -4497,7 +4539,8 @@ function _textured_revolution(
side_open_path = is_undef(side_paths) ? undef : len(side_paths[0])==0 ? [] : side_paths[0][0],
side_closed_paths = is_undef(side_paths) ? [] : side_paths[1],
counts_x = is_def(counts)? counts.x : max(1,round(angle/360*circumf/tex_size.x)),
adj_angle = angle*(1-(tex_extra.x-1)/(texcnt.x*counts_x+tex_extra.x-1)), // adjusted angle for strip positions taking tex_extra into account
adj_angle = is_vnf(texture)?angle
: angle*(1-(tex_extra.x-1)/(texcnt.x*counts_x+tex_extra.x-1)), // adjusted angle for strip positions taking tex_extra into account
taper_lup = closed || is_undef(taper)? [[-1,1],[2,1]] :
is_num(taper)? [[-1,0], [0,0], [taper/100+EPSILON,1], [1-taper/100-EPSILON,1], [1,0], [2,0]] :
is_path(taper,2)? let(
@@ -4546,7 +4589,7 @@ function _textured_revolution(
]),
full_wall = vnf_join([
for (i = [0:1:counts_x-1])
zrot(i*angle/counts_x, rgn_wall_vnf)
zrot(i*angle/counts_x, strip)
])
)
full_wall
@@ -4640,7 +4683,7 @@ function _textured_revolution(
bases = xrot(90, p=path3d(obases)),
norms = xrot(90, p=path3d(onorms)),
bpath = is_def(edge_paths)
? len(edge_paths[0])==0 ? [] : repeat(2,hstack([column(edge_paths[0][0],0), column(edge_paths[0][0],2)]))
? len(edge_paths[0])==0 ? [] : repeat(hstack([column(edge_paths[0][0],0), column(edge_paths[0][0],2)]),2)
:
[ for(j=[texcnt.y-1+tex_extra.y,0])
[for (i = [0:1:texcnt.x-1+max(1,tex_extra.x)])
@@ -4677,7 +4720,7 @@ function _textured_revolution(
xyz = base - norm * texh
) zrot(adj_angle*uang, p=xyz)
],
pplen = texcnt.x+1,
pplen = default(texcnt.x+1,len(ppath)),
last_len = len(ppath)-(tex_extra.x==0?1:0),
zed = j<0? max(column(ppath,2)): min(column(ppath,2)),
slice_vnf = [