Merge branch 'master' into master

This commit is contained in:
Revar Desmera 2023-12-12 15:22:19 -08:00 committed by GitHub
commit 226299a54b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View file

@ -897,10 +897,10 @@ function group_sort(list, idx) =
// Description:
// Given a list of integer group numbers, and an equal-length list of values,
// returns a list of groups with the values sorted into the corresponding groups.
// Ie: if you have a groups index list of [2,3,2] and values of ["A","B","C"], then
// the values "A" and "C" will be put in group 2, and "B" will be in group 3.
// Ie: if you have a groups index list of `[2,3,2]` and values of `["A","B","C"]`, then
// the values `"A"` and `"C"` will be put in group 2, and `"B"` will be in group 3.
// Groups that have no values grouped into them will be an empty list. So the
// above would return [[], [], ["A","C"], ["B"]]
// above would return `[[], [], ["A","C"], ["B"]]`
// Arguments:
// groups = A list of integer group index numbers.
// values = A list of values to sort into groups.

View file

@ -986,7 +986,7 @@ function rotate_sweep(
style=style
) :
let(
steps = segs(max_x),
steps = ceil(segs(max_x) * angle / 360) + 1,
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y),
transforms = [
if (angle==360) for (i=[0:1:steps-1]) skmat * rot([90,0,360-i*360/steps]),
@ -1027,7 +1027,6 @@ module rotate_sweep(
max_y = bounds[1].y;
h = max_y - min_y;
check2 = assert(min_x>=0, "Input region must exist entirely in the X+ half-plane.");
steps = segs(max_x);
if (!is_undef(texture)) {
_textured_revolution(
shape,
@ -1047,6 +1046,7 @@ module rotate_sweep(
spin=spin, orient=orient
) children();
} else {
steps = ceil(segs(max_x) * angle / 360) + 1;
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y);
transforms = [
if (angle==360) for (i=[0:1:steps-1]) skmat * rot([90,0,360-i*360/steps]),

View file

@ -9,7 +9,7 @@
//////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,663];
BOSL_VERSION = [2,0,664];
// Section: BOSL Library Version Functions