mirror of
https://github.com/BelfrySCAD/BOSL2.git
synced 2025-01-01 09:49:45 +00:00
Merge branch 'master' into master
This commit is contained in:
commit
e4a5833514
2 changed files with 3 additions and 3 deletions
|
@ -986,7 +986,7 @@ function rotate_sweep(
|
||||||
style=style
|
style=style
|
||||||
) :
|
) :
|
||||||
let(
|
let(
|
||||||
steps = ceil(segs(max_x) * angle / 360) + 1,
|
steps = ceil(segs(max_x) * angle / 360) + (angle<360? 1 : 0),
|
||||||
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y),
|
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y),
|
||||||
transforms = [
|
transforms = [
|
||||||
if (angle==360) for (i=[0:1:steps-1]) skmat * rot([90,0,360-i*360/steps]),
|
if (angle==360) for (i=[0:1:steps-1]) skmat * rot([90,0,360-i*360/steps]),
|
||||||
|
@ -1046,7 +1046,7 @@ module rotate_sweep(
|
||||||
spin=spin, orient=orient
|
spin=spin, orient=orient
|
||||||
) children();
|
) children();
|
||||||
} else {
|
} else {
|
||||||
steps = ceil(segs(max_x) * angle / 360) + 1;
|
steps = ceil(segs(max_x) * angle / 360) + (angle<360? 1 : 0);
|
||||||
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y);
|
skmat = down(min_y) * skew(sxz=shift.x/h, syz=shift.y/h) * up(min_y);
|
||||||
transforms = [
|
transforms = [
|
||||||
if (angle==360) for (i=[0:1:steps-1]) skmat * rot([90,0,360-i*360/steps]),
|
if (angle==360) for (i=[0:1:steps-1]) skmat * rot([90,0,360-i*360/steps]),
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
BOSL_VERSION = [2,0,671];
|
BOSL_VERSION = [2,0,667];
|
||||||
|
|
||||||
|
|
||||||
// Section: BOSL Library Version Functions
|
// Section: BOSL Library Version Functions
|
||||||
|
|
Loading…
Reference in a new issue