grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More select and posmod optimizations.

Browse source
This commit is contained in:
Revar Desmera 2019-03-31 00:03:02 -07:00
parent 015c34d637
commit d7320b7c0a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
math.scad
View file

@ -96,7 +96,7 @@ function constrain(v, minval, maxval) = min(maxval, max(minval, v));
// Arguments: // Arguments:
// x = The value to constrain. // x = The value to constrain.
// m = Modulo value. // m = Modulo value.
function posmod(x,m) = (x % m + m) % m; function posmod(x,m) = (x%m) + (x<0)? m : 0;
// Function: modrange() // Function: modrange()
@ -119,7 +119,7 @@ function modrange(x, y, m, step=1) =
a = posmod(x, m), a = posmod(x, m),
b = posmod(y, m), b = posmod(y, m),
c = step>0? (a>b? b+m : b) : (a<b? b-m : b) c = step>0? (a>b? b+m : b) : (a<b? b-m : b)
) [for (i=[a:step:c]) posmod(i,m)]; ) [for (i=[a:step:c]) (i%m+m)%m];
// Function: segs() // Function: segs()
@ -459,12 +459,12 @@ function wrap_range(list, start, end=undef) = select(list,start,end);
function select(list, start, end=undef) = function select(list, start, end=undef) =
let(l=len(list)) let(l=len(list))
(list==[])? [] : (list==[])? [] :
!is_def(end)? ( end==undef? (
is_scalar(start)? is_scalar(start)?
let(s=posmod(start,l)) list[s] : let(s=(start%l+l)%l) list[s] :
[for (i=start) list[posmod(i, l)]] [for (i=start) list[(i%l+l)%l]]
) : ( ) : (
let(s=posmod(start,l), e=posmod(end,l)) let(s=(start%l+l)%l, e=(end%l+l)%l)
(s<=e)? (s<=e)?
[for (i = [s:e]) list[i]] : [for (i = [s:e]) list[i]] :
concat([for (i = [s:l-1]) list[i]], [for (i = [0:e]) list[i]]) concat([for (i = [s:l-1]) list[i]], [for (i = [0:e]) list[i]])