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

Merge branch 'master' into revarbat_dev

Browse source
This commit is contained in:
Garth Minette 2021-01-20 18:07:18 -08:00
commit 9a395023ff
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
affine.scad
View file

@ -459,7 +459,7 @@ function affine3d_rot_from_to(from, to) =
// Function: affine3d_frame_map()
// Usage:
// map = affine3d_frame_map(v1, v2, v3);
// map = affine3d_frame_map(v1, v2, v3, <reverse>);
// map = affine3d_frame_map(x=VECTOR1, y=VECTOR2, <reverse>);
// map = affine3d_frame_map(x=VECTOR1, z=VECTOR2, <reverse>);
// map = affine3d_frame_map(y=VECTOR1, z=VECTOR2, <reverse>);

4
paths.scad
View file

@ -1172,7 +1172,7 @@ module path_spread(path, n, spacing, sp=undef, rotate_children=true, closed=fals
sort([for(entry=ptlist) posmod(entry-listcenter,length)]) :
[for(entry=ptlist) entry + length/2-listcenter ]
);
distOK = min(distances)>=0 && max(distances)<=length;
distOK = is_def(n) || (min(distances)>=0 && max(distances)<=length);
assert(distOK,"Cannot fit all of the copies");
cutlist = path_cut(path, distances, closed, direction=true);
planar = len(path[0])==2;
@ -1186,7 +1186,7 @@ module path_spread(path, n, spacing, sp=undef, rotate_children=true, closed=fals
if(planar) {
rot(from=[0,1],to=cutlist[i][3]) children();
} else {
multmatrix(affine2d_to_3d(transpose([cutlist[i][2],cross(cutlist[i][3],cutlist[i][2]), cutlist[i][3]])))
multmatrix(affine3d_frame_map(x=cutlist[i][2], z=cutlist[i][3]))
children();
}
} else {