diff --git a/arrays.scad b/arrays.scad
index 6bc128e..7619648 100644
--- a/arrays.scad
+++ b/arrays.scad
@@ -24,7 +24,7 @@
// Returns true when the list have elements of same type up to the depth `depth`.
// Booleans and numbers are not distinguinshed as of distinct types.
// Arguments:
-// list = the list to check
+// l = the list to check
// depth = the lowest level the check is done
// Example:
// a = is_homogeneous([[1,["a"]], [2,["b"]]]); // Returns true
@@ -71,20 +71,22 @@ function _same_type(a,b, depth) =
// g = select(l, -2); // Returns 8
// h = select(l, [1:3]); // Returns [4,5,6]
// i = select(l, [1,3]); // Returns [4,6]
-function select(list, start, end=undef) =
+function select(list, start, end) =
assert( is_list(list) || is_string(list), "Invalid list.")
let(l=len(list))
- l==0 ? []
- : end==undef?
- is_num(start)?
- list[ (start%l+l)%l ]
- : assert( is_list(start) || is_range(start), "Invalid start parameter")
+ l==0
+ ? []
+ : end==undef
+ ? is_num(start)
+ ? list[ (start%l+l)%l ]
+ : assert( is_list(start) || is_range(start), "Invalid start parameter")
[for (i=start) list[ (i%l+l)%l ] ]
- : assert(is_finite(start), "Invalid start parameter.")
+ : assert(is_finite(start), "Invalid start parameter.")
assert(is_finite(end), "Invalid end parameter.")
let( s = (start%l+l)%l, e = (end%l+l)%l )
- (s <= e)? [for (i = [s:1:e]) list[i]]
- : concat([for (i = [s:1:l-1]) list[i]], [for (i = [0:1:e]) list[i]]) ;
+ (s <= e)
+ ? [for (i = [s:1:e]) list[i]]
+ : concat([for (i = [s:1:l-1]) list[i]], [for (i = [0:1:e]) list[i]]) ;
// Function: last()
@@ -97,19 +99,22 @@ function select(list, start, end=undef) =
// Example:
// l = [3,4,5,6,7,8,9];
// x = last(l); // Returns 9.
-function last(list) = list[len(list)-1];
+function last(list) =
+ list[len(list)-1];
+
// Function: delete_last()
// Usage:
// list = delete_last(list);
// Description:
-// Returns a list of all but the last entry. If input is empty, returns empty list.
-// Usage:
-// delete_last(list)
+// Returns a list with all but the last entry from the input list. If input is empty, returns empty list.
+// Example:
+// nlist = delete_last(["foo", "bar", "baz"]); // Returns: ["foo", "bar"]
function delete_last(list) =
assert(is_list(list))
list==[] ? [] : slice(list,0,-2);
+
// Function: slice()
// Usage:
// list = slice(list,start,end);
@@ -130,10 +135,11 @@ function slice(list,start,end) =
assert( is_list(list), "Invalid list" )
assert( is_finite(start) && is_finite(end), "Invalid number(s)" )
let( l = len(list) )
- l==0 ? []
- : let(
- s = start<0? (l+start): start,
- e = end<0? (l+end+1): end
+ l==0
+ ? []
+ : let(
+ s = start<0? (l+start) : start,
+ e = end<0? (l+end+1) : end
) [for (i=[s:1:e-1]) if (e>s) list[i]];
@@ -150,7 +156,7 @@ function slice(list,start,end) =
// a = in_list("bar", ["foo", "bar", "baz"]); // Returns true.
// b = in_list("bee", ["foo", "bar", "baz"]); // Returns false.
// c = in_list("bar", [[2,"foo"], [4,"bar"], [3,"baz"]], idx=1); // Returns true.
-function in_list(val,list,idx=undef) =
+function in_list(val,list,idx) =
assert( is_list(list) && (is_undef(idx) || is_finite(idx)),
"Invalid input." )
let( s = search([val], list, num_returns_per_match=1, index_col_num=idx)[0] )
@@ -248,18 +254,20 @@ function repeat(val, n, i=0) =
(i>=len(n))? val :
[for (j=[1:1:n[i]]) repeat(val, n, i+1)];
+
// Function: list_range()
// Usage:
-// list = list_range(n, <s>, <e>);
-// list = list_range(n, <s>, <step>);
-// list = list_range(e, <step>);
-// list = list_range(s, e, <step>);
+// list = list_range(n=, <s=>, <e=>);
+// list = list_range(n=, <s=>, <step=>);
+// list = list_range(e=, <step=>);
+// list = list_range(s=, e=, <step=>);
// Description:
// Returns a list, counting up from starting value `s`, by `step` increments,
// until either `n` values are in the list, or it reaches the end value `e`.
// If both `n` and `e` are given, returns `n` values evenly spread from `s`
// to `e`, and `step` is ignored.
// Arguments:
+// ---
// n = Desired number of values in returned list, if given.
// s = Starting value. Default: 0
// e = Ending value to stop at, if given.
@@ -275,14 +283,14 @@ function repeat(val, n, i=0) =
// h = list_range(s=3, e=8, step=2); // Returns [3,5,7]
// i = list_range(s=4, e=8.3, step=2); // Returns [4,6,8]
// j = list_range(n=4, s=[3,4], step=[2,3]); // Returns [[3,4], [5,7], [7,10], [9,13]]
-function list_range(n=undef, s=0, e=undef, step=undef) =
+function list_range(n, s=0, e, step) =
assert( is_undef(n) || is_finite(n), "Parameter `n` must be a number.")
assert( is_undef(n) || is_undef(e) || is_undef(step), "At most 2 of n, e, and step can be given.")
let( step = (n!=undef && e!=undef)? (e-s)/(n-1) : default(step,1) )
- is_undef(e) ?
- assert( is_consistent([s, step]), "Incompatible data.")
+ is_undef(e)
+ ? assert( is_consistent([s, step]), "Incompatible data.")
[for (i=[0:1:n-1]) s+step*i ]
- : assert( is_vector([s,step,e]), "Start `s`, step `step` and end `e` must be numbers.")
+ : assert( is_vector([s,step,e]), "Start `s`, step `step` and end `e` must be numbers.")
[for (v=[s:step:e]) v] ;
@@ -379,10 +387,11 @@ function deduplicate_indexed(list, indices, closed=false, eps=EPSILON) =
assert(is_list(list)||is_string(list), "Improper list or string.")
indices==[]? [] :
assert(is_vector(indices), "Indices must be a list of numbers.")
- let( l = len(indices),
- end = l-(closed?0:1) )
- [ for (i = [0:1:l-1])
- let(
+ let(
+ l = len(indices),
+ end = l-(closed?0:1)
+ ) [
+ for (i = [0:1:l-1]) let(
a = list[indices[i]],
b = list[indices[(i+1)%l]],
eq = (a == b)? true :
@@ -455,22 +464,25 @@ function repeat_entries(list, N, exact=true) =
function list_set(list=[],indices,values,dflt=0,minlen=0) =
assert(is_list(list))
!is_list(indices)? (
- (is_finite(indices) && indices<len(list))?
- concat([for (i=idx(list)) i==indices? values : list[i]], repeat(dflt, minlen-len(list)))
- : list_set(list,[indices],[values],dflt) )
- :indices==[] && values==[] ?
- concat(list, repeat(dflt, minlen-len(list)))
- :assert(is_vector(indices) && is_list(values) && len(values)==len(indices) ,
+ (is_finite(indices) && indices<len(list))
+ ? concat([for (i=idx(list)) i==indices? values : list[i]], repeat(dflt, minlen-len(list)))
+ : list_set(list,[indices],[values],dflt)
+ ) :
+ indices==[] && values==[]
+ ? concat(list, repeat(dflt, minlen-len(list)))
+ : assert(is_vector(indices) && is_list(values) && len(values)==len(indices),
"Index list and value list must have the same length")
let( midx = max(len(list)-1, max(indices)) )
- [ for(i=[0:midx] )
- let( j = search(i,indices,0),
- k = j[0] )
+ [
+ for (i=[0:1:midx]) let(
+ j = search(i,indices,0),
+ k = j[0]
+ )
assert( len(j)<2, "Repeated indices are not allowed." )
- k!=undef ? values[k] :
- i<len(list) ? list[i]:
- dflt ,
- each repeat(dflt, minlen-max(len(list),max(indices)))
+ k!=undef
+ ? values[k]
+ : i<len(list) ? list[i] : dflt,
+ each repeat(dflt, minlen-max(len(list),max(indices)))
];
@@ -484,29 +496,31 @@ function list_set(list=[],indices,values,dflt=0,minlen=0) =
// b = list_insert([3,6,9,12],[1,3],[5,11]); // Returns [3,5,6,9,11,12]
function list_insert(list, indices, values) =
assert(is_list(list))
- !is_list(indices)?
+ !is_list(indices) ?
assert( is_finite(indices) && is_finite(values), "Invalid indices/values." )
assert( indices<=len(list), "Indices must be <= len(list) ." )
[
for (i=idx(list)) each ( i==indices? [ values, list[i] ] : [ list[i] ] ),
if (indices==len(list)) values
- ]
- : indices==[] && values==[] ? list
- : assert( is_vector(indices) && is_list(values) && len(values)==len(indices) ,
- "Index list and value list must have the same length")
- assert( max(indices)<=len(list), "Indices must be <= len(list) ." )
- let( maxidx = max(indices),
- minidx = min(indices) )
- [ for(i=[0:1:minidx-1] ) list[i],
- for(i=[minidx: min(maxidx, len(list)-1)] )
- let( j = search(i,indices,0),
- k = j[0],
- x = assert( len(j)<2, "Repeated indices are not allowed." )
- )
- each ( k != undef ? [ values[k], list[i] ] : [ list[i] ] ),
- for(i=[min(maxidx, len(list)-1)+1:1:len(list)-1] ) list[i],
- if(maxidx==len(list)) values[max_index(indices)]
- ];
+ ] :
+ indices==[] && values==[] ? list :
+ assert( is_vector(indices) && is_list(values) && len(values)==len(indices),
+ "Index list and value list must have the same length")
+ assert( max(indices)<=len(list), "Indices must be <= len(list)." )
+ let(
+ maxidx = max(indices),
+ minidx = min(indices)
+ ) [
+ for (i=[0:1:minidx-1] ) list[i],
+ for (i=[minidx : min(maxidx, len(list)-1)] )
+ let(
+ j = search(i,indices,0),
+ k = j[0],
+ x = assert( len(j)<2, "Repeated indices are not allowed." )
+ ) each ( k != undef ? [ values[k], list[i] ] : [ list[i] ] ),
+ for ( i = [min(maxidx, len(list)-1)+1 : 1 : len(list)-1] ) list[i],
+ if (maxidx == len(list)) values[max_index(indices)]
+ ];
// Function: list_remove()
@@ -616,6 +630,8 @@ function list_bset(indexset, valuelist, dflt=0) =
// Returns the length of the shortest sublist in a list of lists.
// Arguments:
// array = A list of lists.
+// Example:
+// slen = list_shortest([[3,4,5],[6,7,8,9]]); // Returns: 3
function list_shortest(array) =
assert(is_list(array), "Invalid input." )
min([for (v = array) len(v)]);
@@ -628,6 +644,8 @@ function list_shortest(array) =
// Returns the length of the longest sublist in a list of lists.
// Arguments:
// array = A list of lists.
+// Example:
+// llen = list_longest([[3,4,5],[6,7,8,9]]); // Returns: 4
function list_longest(array) =
assert(is_list(array), "Invalid input." )
max([for (v = array) len(v)]);
@@ -641,8 +659,11 @@ function list_longest(array) =
// Arguments:
// array = A list.
// minlen = The minimum length to pad the list to.
-// fill = The value to pad the list with.
-function list_pad(array, minlen, fill=undef) =
+// fill = The value to pad the list with. Default: `undef`
+// Example:
+// list = [3,4,5];
+// nlist = list_pad(list,5,23); // Returns: [3,4,5,23,23]
+function list_pad(array, minlen, fill) =
assert(is_list(array), "Invalid input." )
concat(array,repeat(fill,minlen-len(array)));
@@ -655,6 +676,9 @@ function list_pad(array, minlen, fill=undef) =
// Arguments:
// array = A list.
// minlen = The minimum length to pad the list to.
+// Example:
+// list = [3,4,5,6,7,8];
+// nlist = list_trim(list,4); // Returns: [3,4,5,6]
function list_trim(array, maxlen) =
assert(is_list(array), "Invalid input." )
[for (i=[0:1:min(len(array),maxlen)-1]) array[i]];
@@ -669,7 +693,13 @@ function list_trim(array, maxlen) =
// Arguments:
// array = A list.
// minlen = The minimum length to pad the list to.
-// fill = The value to pad the list with.
+// fill = The value to pad the list with. Default: `undef`
+// Example:
+// list = [3,4,5,6];
+// nlist = list_fit(list,3); // Returns: [3,4,5]
+// Example:
+// list = [3,4,5,6];
+// nlist = list_fit(list,6,23); // Returns: [3,4,5,6,23,23]
function list_fit(array, length, fill) =
assert(is_list(array), "Invalid input." )
let(l=len(array))
@@ -699,7 +729,7 @@ function _valid_idx(idx,imin,imax) =
// Function: shuffle()
// Usage:
-// shuffled = shuffle(list,<seed>)
+// shuffled = shuffle(list,<seed>);
// Description:
// Shuffles the input list into random order.
// If given a string, shuffles the characters within the string.
@@ -708,11 +738,17 @@ function _valid_idx(idx,imin,imax) =
// Arguments:
// list = The list to shuffle.
// seed = Optional random number seed for the shuffling.
+// Example:
+// // Spades Hearts Diamonds Clubs
+// suits = ["\u2660", "\u2661", "\u2662", "\u2663"];
+// ranks = [2,3,4,5,6,7,8,9,10,"J","Q","K","A"];
+// cards = [for (suit=suits, rank=ranks) str(rank,suit)];
+// deck = shuffle(cards);
function shuffle(list,seed) =
assert(is_list(list)||is_string(list), "Invalid input." )
is_string(list)? str_join(shuffle([for (x = list) x],seed=seed)) :
len(list)<=1 ? list :
- let (
+ let(
rval = is_num(seed) ? rands(0,1,len(list),seed_value=seed)
: rands(0,1,len(list)),
left = [for (i=[0:len(list)-1]) if (rval[i]< 0.5) list[i]],
@@ -743,7 +779,7 @@ function _sort_vectors(arr, _i=0) =
lesser = [ for (entry=arr) if (entry[_i] < pivot ) entry ],
equal = [ for (entry=arr) if (entry[_i] == pivot ) entry ],
greater = [ for (entry=arr) if (entry[_i] > pivot ) entry ]
- )
+ )
concat(
_sort_vectors(lesser, _i ),
_sort_vectors(equal, _i+1 ),
@@ -900,6 +936,8 @@ function sortidx(list, idx=undef) =
// Returns a sorted list with all repeated items removed.
// Arguments:
// list = The list to uniquify.
+// Example:
+// sorted = unique([5,2,8,3,1,3,8,7,5]); // Returns: [1,2,3,5,7,8]
function unique(list) =
assert(is_list(list)||is_string(list), "Invalid input." )
is_string(list)? str_join(unique([for (x = list) x])) :
@@ -919,6 +957,8 @@ function unique(list) =
// that `count[i]` gives the number of times that `sorted[i]` appears in `list`.
// Arguments:
// list = The list to analyze.
+// Example:
+// sorted = unique([5,2,8,3,1,3,8,3,5]); // Returns: [ [1,2,3,5,8], [1,1,3,2,2] ]
function unique_count(list) =
assert(is_list(list) || is_string(list), "Invalid input." )
list == [] ? [[],[]] :
@@ -931,21 +971,26 @@ function unique_count(list) =
// Function: idx()
// Usage:
-// rng = idx(list, <step>, <end>, <start>);
-// for(i=idx(list, <step>, <end>, <start>)) ...
+// rng = idx(list, <s=>, <e=>, <step=>);
+// for(i=idx(list, <s=>, <e=>, <step=>)) ...
// Description:
// Returns the range of indexes for the given list.
// Arguments:
// list = The list to returns the index range of.
+// s = The starting index. Default: 0
+// e = The delta from the end of the list. Default: -1 (end of list)
// step = The step size to stride through the list. Default: 1
-// end = The delta from the end of the list. Default: -1
-// start = The starting index. Default: 0
// Example(2D):
// colors = ["red", "green", "blue"];
// for (i=idx(colors)) right(20*i) color(colors[i]) circle(d=10);
-function idx(list, step=1, end=-1,start=0) =
+function idx(list, s=0, e=-1, step=1) =
assert(is_list(list)||is_string(list), "Invalid input." )
- [start : step : len(list)+end];
+ let( ll = len(list) )
+ ll == 0 ? [0:1:ll-1] :
+ let(
+ _s = posmod(s,ll),
+ _e = posmod(e,ll)
+ ) [_s : step : _e];
// Function: enumerate()
@@ -975,7 +1020,7 @@ function enumerate(l,idx=undef) =
// Function: force_list()
// Usage:
-// list = force_list(value, <n>, <fill>)
+// list = force_list(value, <n>, <fill>);
// Description:
// Coerces non-list values into a list. Makes it easy to treat a scalar input
// consistently as a singleton list, as well as list inputs.
@@ -998,68 +1043,57 @@ function force_list(value, n=1, fill) =
// Function: pair()
// Usage:
-// p = pair(v);
-// for (p = pair(v)) ... // p contains a list of two adjacent items.
+// p = pair(list, <wrap>);
+// for (p = pair(list, <wrap>)) ... // On each iteration, p contains a list of two adjacent items.
// Description:
-// Takes a list, and returns a list of adjacent pairs from it.
-// Example(2D): Note that the last point and first point do NOT get paired together.
-// for (p = pair(circle(d=20, $fn=12)))
-// move(p[0])
-// rot(from=BACK, to=p[1]-p[0])
-// trapezoid(w1=1, w2=0, h=norm(p[1]-p[0]), anchor=FRONT);
+// Takes a list, and returns a list of adjacent pairs from it, optionally wrapping back to the front.
+// Arguments:
+// list = The list to iterate.
+// wrap = If true, wrap back to the start from the end. ie: return the last and first items as the last pair. Default: false
+// Example(2D): Does NOT wrap from end to start,
+// for (p = pair(circle(d=40, $fn=12)))
+// stroke(p, endcap2="arrow2");
+// Example(2D): Wraps around from end to start.
+// for (p = pair(circle(d=40, $fn=12), wrap=true))
+// stroke(p, endcap2="arrow2");
// Example:
// l = ["A","B","C","D"];
// echo([for (p=pair(l)) str(p.y,p.x)]); // Outputs: ["BA", "CB", "DC"]
-function pair(v) =
- assert(is_list(v)||is_string(v), "Invalid input." )
- [for (i=[0:1:len(v)-2]) [v[i],v[i+1]]];
-
-
-// Function: pair_wrap()
-// Usage:
-// p = pair_wrap(v);
-// for (p = pair_wrap(v)) ...
-// Description:
-// Takes a list, and returns a list of adjacent pairs from it, wrapping around from the end to the start of the list.
-// Example(2D):
-// for (p = pair_wrap(circle(d=20, $fn=12)))
-// move(p[0])
-// rot(from=BACK, to=p[1]-p[0])
-// trapezoid(w1=1, w2=0, h=norm(p[1]-p[0]), anchor=FRONT);
-// Example:
-// l = ["A","B","C","D"];
-// echo([for (p=pair_wrap(l)) str(p.y,p.x)]); // Outputs: ["BA", "CB", "DC", "AD"]
-function pair_wrap(v) =
- assert(is_list(v)||is_string(v), "Invalid input." )
- [for (i=[0:1:len(v)-1]) [v[i],v[(i+1)%len(v)]]];
+function pair(list, wrap=false) =
+ assert(is_list(list)||is_string(list), "Invalid input." )
+ assert(is_bool(wrap))
+ let(
+ ll = len(list)
+ ) wrap
+ ? [for (i=[0:1:ll-1]) [list[i], list[(i+1) % ll]]]
+ : [for (i=[0:1:ll-2]) [list[i], list[i+1]]];
// Function: triplet()
// Usage:
-// list = triplet(v);
-// for (t = triplet(v)) ...
+// list = triplet(list, <wrap>);
+// for (t = triplet(list, <wrap>)) ...
// Description:
-// Takes a list, and returns a list of adjacent triplets from it.
+// Takes a list, and returns a list of adjacent triplets from it, optionally wrapping back to the front.
// Example:
// l = ["A","B","C","D","E"];
// echo([for (p=triplet(l)) str(p.z,p.y,p.x)]); // Outputs: ["CBA", "DCB", "EDC"]
-function triplet(v) =
- assert(is_list(v)||is_string(v), "Invalid input." )
- [for (i=[0:1:len(v)-3]) [v[i],v[i+1],v[i+2]]];
-
-
-// Function: triplet_wrap()
-// Usage:
-// list = triplet_wrap(v);
-// for (t = triplet_wrap(v)) ...
-// Description:
-// Takes a list, and returns a list of adjacent triplets from it, wrapping around from the end to the start of the list.
-// Example:
-// l = ["A","B","C","D"];
-// echo([for (p=triplet_wrap(l)) str(p.z,p.y,p.x)]); // Outputs: ["CBA", "DCB", "ADC", "BAD"]
-function triplet_wrap(v) =
- assert(is_list(v)||is_string(v), "Invalid input." )
- [for (i=[0:1:len(v)-1]) [v[i],v[(i+1)%len(v)],v[(i+2)%len(v)]]];
+// Example(2D):
+// path = [for (i=[0:24]) polar_to_xy(i*2, i*360/12)];
+// for (t = triplet(path)) {
+// a = t[0]; b = t[1]; c = t[2];
+// v = unit(unit(a-b) + unit(c-b));
+// translate(b) rot(from=FWD,to=v) anchor_arrow2d();
+// }
+// stroke(path);
+function triplet(list, wrap=false) =
+ assert(is_list(list)||is_string(list), "Invalid input." )
+ assert(is_bool(wrap))
+ let(
+ ll = len(list)
+ ) wrap
+ ? [for (i=[0:1:ll-1]) [ list[i], list[(i+1)%ll], list[(i+2)%ll] ]]
+ : [for (i=[0:1:ll-3]) [ list[i], list[i+1], list[i+2] ]];
// Function: permute()
@@ -1331,7 +1365,7 @@ function hstack(M1, M2, M3) =
function block_matrix(M) =
let(
bigM = [for(bigrow = M) each hstack(bigrow)],
- len0=len(bigM[0]),
+ len0 = len(bigM[0]),
badrows = [for(row=bigM) if (len(row)!=len0) 1]
)
assert(badrows==[], "Inconsistent or invalid input")
@@ -1407,7 +1441,9 @@ function array_group(v, cnt=2, dflt=0) =
// l = List to flatten.
// Example:
// l = flatten([[1,2,3], [4,5,[6,7,8]]]); // returns [1,2,3,4,5,[6,7,8]]
-function flatten(l) = [for (a = l) each a];
+function flatten(l) =
+ !is_list(l)? l :
+ [for (a=l) if (is_list(a)) (each a) else a];
// Function: full_flatten()
@@ -1420,7 +1456,9 @@ function flatten(l) = [for (a = l) each a];
// l = List to flatten.
// Example:
// l = full_flatten([[1,2,3], [4,5,[6,7,8]]]); // returns [1,2,3,4,5,6,7,8]
-function full_flatten(l) = [for(a=l) if(is_list(a)) (each full_flatten(a)) else a ];
+function full_flatten(l) =
+ !is_list(l)? l :
+ [for (a=l) if (is_list(a)) (each full_flatten(a)) else a];
// Internal. Not exposed.
@@ -1447,14 +1485,12 @@ function _array_dim_recurse(v) =
// Usage:
// dims = array_dim(v, <depth>);
// Description:
-// Returns the size of a multi-dimensional array. Returns a list of
-// dimension lengths. The length of `v` is the dimension `0`. The
-// length of the items in `v` is dimension `1`. The length of the
-// items in the items in `v` is dimension `2`, etc. For each dimension,
-// if the length of items at that depth is inconsistent, `undef` will
-// be returned. If no items of that dimension depth exist, `0` is
-// returned. Otherwise, the consistent length of items in that
-// dimensional depth is returned.
+// Returns the size of a multi-dimensional array. Returns a list of dimension lengths. The length
+// of `v` is the dimension `0`. The length of the items in `v` is dimension `1`. The length of the
+// items in the items in `v` is dimension `2`, etc. For each dimension, if the length of items at
+// that depth is inconsistent, `undef` will be returned. If no items of that dimension depth exist,
+// `0` is returned. Otherwise, the consistent length of items in that dimensional depth is
+// returned.
// Arguments:
// v = Array to get dimensions of.
// depth = Dimension to get size of. If not given, returns a list of dimension lengths.
diff --git a/attachments.scad b/attachments.scad
index b93171b..be4ec9e 100644
--- a/attachments.scad
+++ b/attachments.scad
@@ -573,7 +573,7 @@ function find_anchor(anchor, geom) =
path = move(-point2d(cp), p=geom[1]),
anchor = point2d(anchor),
isects = [
- for (t=triplet_wrap(path)) let(
+ for (t=triplet(path,true)) let(
seg1 = [t[0],t[1]],
seg2 = [t[1],t[2]],
isect = ray_segment_intersection([[0,0],anchor], seg1),
diff --git a/beziers.scad b/beziers.scad
index c1ddb86..4162a17 100644
--- a/beziers.scad
+++ b/beziers.scad
@@ -345,7 +345,7 @@ function bezier_segment_length(curve, start_u=0, end_u=1, max_deflect=0.01) =
uvals = [for (i=[0:1:segs]) lerp(start_u, end_u, i/segs)],
path = bezier_points(curve,uvals),
defl = max([
- for (i=idx(path,end=-3)) let(
+ for (i=idx(path,e=-3)) let(
mp = (path[i] + path[i+2]) / 2
) norm(path[i+1] - mp)
]),
diff --git a/debug.scad b/debug.scad
index 299667c..fb9eaba 100644
--- a/debug.scad
+++ b/debug.scad
@@ -9,11 +9,14 @@
// Section: Debugging Paths and Polygons
// Module: trace_path()
+// Usage:
+// trace_path(path, <closed=>, <showpts=>, <N=>, <size=>, <color=>);
// Description:
// Renders lines between each point of a path.
// Can also optionally show the individual vertex points.
// Arguments:
// path = The list of points in the path.
+// ---
// closed = If true, draw the segment from the last vertex to the first. Default: false
// showpts = If true, draw vertices and control points.
// N = Mark the first and every Nth vertex after in a different color and shape.
@@ -29,7 +32,7 @@ module trace_path(path, closed=false, showpts=false, N=1, size=1, color="yellow"
if (showpts) {
for (i = [0:1:len(path)-1]) {
translate(path[i]) {
- if (i%N == 0) {
+ if (i % N == 0) {
color("blue") sphere(d=size*2.5, $fn=8);
} else {
color("red") {
@@ -45,7 +48,7 @@ module trace_path(path, closed=false, showpts=false, N=1, size=1, color="yellow"
color(color) stroke(path3d(path), width=size, $fn=8);
} else {
for (i = [0:1:len(path)-2]) {
- if (N!=3 || (i%N) != 1) {
+ if (N != 3 || (i % N) != 1) {
color(color) extrude_from_to(path[i], path[i+1]) circle(d=size, $fn=sides);
}
}
@@ -54,11 +57,16 @@ module trace_path(path, closed=false, showpts=false, N=1, size=1, color="yellow"
// Module: debug_polygon()
-// Description: A drop-in replacement for `polygon()` that renders and labels the path points.
+// Usage:
+// debug_polygon(points, paths, <convexity=>, <size=>);
+// Description:
+// A drop-in replacement for `polygon()` that renders and labels the path points.
// Arguments:
// points = The array of 2D polygon vertices.
// paths = The path connections between the vertices.
+// ---
// convexity = The max number of walls a ray can pass through the given polygon paths.
+// size = The base size of the line and labels.
// Example(Big2D):
// debug_polygon(
// points=concat(
@@ -70,9 +78,11 @@ module trace_path(path, closed=false, showpts=false, N=1, size=1, color="yellow"
// [for (i=[15:-1:8]) i]
// ]
// );
-module debug_polygon(points, paths=undef, convexity=2, size=1)
+module debug_polygon(points, paths, convexity=2, size=1)
{
- paths = is_undef(paths)? [[for (i=[0:1:len(points)-1]) i]] : is_num(paths[0])? [paths] : paths;
+ paths = is_undef(paths)? [[for (i=[0:1:len(points)-1]) i]] :
+ is_num(paths[0])? [paths] :
+ paths;
echo(points=points);
echo(paths=paths);
linear_extrude(height=0.01, convexity=convexity, center=true) {
@@ -118,13 +128,16 @@ module debug_polygon(points, paths=undef, convexity=2, size=1)
// Module: debug_vertices()
+// Usage:
+// debug_vertices(vertices, <size>, <disabled=>);
// Description:
// Draws all the vertices in an array, at their 3D position, numbered by their
// position in the vertex array. Also draws any children of this module with
// transparency.
// Arguments:
// vertices = Array of point vertices.
-// size = The size of the text used to label the vertices.
+// size = The size of the text used to label the vertices. Default: 1
+// ---
// disabled = If true, don't draw numbers, and draw children without transparency. Default = false.
// Example:
// verts = [for (z=[-10,10], y=[-10,10], x=[-10,10]) [x,y,z]];
@@ -161,6 +174,8 @@ module debug_vertices(vertices, size=1, disabled=false) {
// Module: debug_faces()
+// Usage:
+// debug_faces(vertices, faces, <size=>, <disabled=>);
// Description:
// Draws all the vertices at their 3D position, numbered in blue by their
// position in the vertex array. Each face will have their face number drawn
@@ -168,9 +183,10 @@ module debug_vertices(vertices, size=1, disabled=false) {
// with transparency.
// Arguments:
// vertices = Array of point vertices.
-// faces = Array of faces by vertex numbers.
-// size = The size of the text used to label the faces and vertices.
-// disabled = If true, don't draw numbers, and draw children without transparency. Default = false.
+// faces = Array of faces by vertex numbers.
+// ---
+// size = The size of the text used to label the faces and vertices. Default: 1
+// disabled = If true, don't draw numbers, and draw children without transparency. Default: false.
// Example(EdgesMed):
// verts = [for (z=[-10,10], y=[-10,10], x=[-10,10]) [x,y,z]];
// faces = [[0,1,2], [1,3,2], [0,4,5], [0,5,1], [1,5,7], [1,7,3], [3,7,6], [3,6,2], [2,6,4], [2,4,0], [4,6,7], [4,7,5]];
@@ -224,6 +240,8 @@ module debug_faces(vertices, faces, size=1, disabled=false) {
// Module: debug_polyhedron()
+// Usage:
+// debug_polyhedron(points, faces, <convexity=>, <txtsize=>, <disabled=>);
// Description:
// A drop-in module to replace `polyhedron()` and help debug vertices and faces.
// Draws all the vertices at their 3D position, numbered in blue by their
@@ -232,15 +250,17 @@ module debug_faces(vertices, faces, size=1, disabled=false) {
// transparency. All children of this module are drawn with transparency.
// Works best with Thrown-Together preview mode, to see reversed faces.
// Arguments:
-// vertices = Array of point vertices.
+// points = Array of point vertices.
// faces = Array of faces by vertex numbers.
+// ---
+// convexity = The max number of walls a ray can pass through the given polygon paths.
// txtsize = The size of the text used to label the faces and vertices.
// disabled = If true, act exactly like `polyhedron()`. Default = false.
// Example(EdgesMed):
// verts = [for (z=[-10,10], a=[0:120:359.9]) [10*cos(a),10*sin(a),z]];
// faces = [[0,1,2], [5,4,3], [0,3,4], [0,4,1], [1,4,5], [1,5,2], [2,5,3], [2,3,0]];
// debug_polyhedron(points=verts, faces=faces, txtsize=1);
-module debug_polyhedron(points, faces, convexity=10, txtsize=1, disabled=false) {
+module debug_polyhedron(points, faces, convexity=6, txtsize=1, disabled=false) {
debug_faces(vertices=points, faces=faces, size=txtsize, disabled=disabled) {
polyhedron(points=points, faces=faces, convexity=convexity);
}
@@ -273,11 +293,11 @@ function standard_anchors(two_d=false) = [
// Usage:
// anchor_arrow(<s>, <color>, <flag>);
// Description:
-// Show an anchor orientation arrow.
+// Show an anchor orientation arrow. By default, tagged with the name "anchor-arrow".
// Arguments:
-// s = Length of the arrows.
-// color = Color of the arrow.
-// flag = If true, draw the orientation flag on the arrowhead.
+// s = Length of the arrows. Default: `10`
+// color = Color of the arrow. Default: `[0.333, 0.333, 1]`
+// flag = If true, draw the orientation flag on the arrowhead. Default: true
// Example:
// anchor_arrow(s=20);
module anchor_arrow(s=10, color=[0.333,0.333,1], flag=true, $tags="anchor-arrow") {
@@ -316,10 +336,12 @@ module anchor_arrow2d(s=15, color=[0.333,0.333,1], $tags="anchor-arrow") {
// Module: show_internal_anchors()
// Usage:
-// show_internal_anchors() ...
+// show_internal_anchors(<opacity>) {...}
// Description:
// Makes the children transparent gray, while showing any
// anchor arrows that may exist.
+// Arguments:
+// opacity = The opacity of the arrow. 0.0 is invisible, 1.0 is opaque. Default: 0.2
// Example(FlatSpin):
// show_internal_anchors() cube(50, center=true) show_anchors();
module show_internal_anchors(opacity=0.2) {
@@ -329,10 +351,13 @@ module show_internal_anchors(opacity=0.2) {
// Module: show_anchors()
+// Usage:
+// show_anchors(<s>, <std=>, <custom=>);
// Description:
// Show all standard anchors for the parent object.
// Arguments:
// s = Length of anchor arrows.
+// ---
// std = If true (default), show standard anchors.
// custom = If true (default), show custom anchors.
// Example(FlatSpin):
@@ -376,28 +401,35 @@ module show_anchors(s=10, std=true, custom=true) {
// Module: frame_ref()
+// Usage:
+// frame_ref(s, opacity);
// Description:
// Displays X,Y,Z axis arrows in red, green, and blue respectively.
// Arguments:
// s = Length of the arrows.
+// opacity = The opacity of the arrows. 0.0 is invisible, 1.0 is opaque. Default: 1.0
// Examples:
// frame_ref(25);
-module frame_ref(s=15) {
+// frame_ref(30, opacity=0.5);
+module frame_ref(s=15, opacity=1) {
cube(0.01, center=true) {
- attach(RIGHT) anchor_arrow(s=s, flag=false, color="red");
- attach(BACK) anchor_arrow(s=s, flag=false, color="green");
- attach(TOP) anchor_arrow(s=s, flag=false, color="blue");
+ attach([1,0,0]) anchor_arrow(s=s, flag=false, color=[1.0, 0.3, 0.3, opacity]);
+ attach([0,1,0]) anchor_arrow(s=s, flag=false, color=[0.3, 1.0, 0.3, opacity]);
+ attach([0,0,1]) anchor_arrow(s=s, flag=false, color=[0.3, 0.3, 1.0, opacity]);
children();
}
}
// Module: ruler()
+// Usage:
+// ruler(length, width, <thickness=>, <depth=>, <labels=>, <pipscale=>, <maxscale=>, <colors=>, <alpha=>, <unit=>, <inch=>);
// Description:
// Creates a ruler for checking dimensions of the model
// Arguments:
// length = length of the ruler. Default 100
// width = width of the ruler. Default: size of the largest unit division
+// ---
// thickness = thickness of the ruler. Default: 1
// depth = the depth of mark subdivisions. Default: 3
// labels = draw numeric labels for depths where labels are larger than 1. Default: false
@@ -407,6 +439,9 @@ module frame_ref(s=15) {
// alpha = transparency value. Default: 1.0
// unit = unit to mark. Scales the ruler marks to a different length. Default: 1
// inch = set to true for a ruler scaled to inches (assuming base dimension is mm). Default: false
+// anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#anchor). Default: `LEFT+BACK+TOP`
+// spin = Rotate this many degrees around the Z axis. See [spin](attachments.scad#spin). Default: `0`
+// orient = Vector to rotate top towards. See [orient](attachments.scad#orient). Default: `UP`
// Examples(2D,Big):
// ruler(100,depth=3);
// ruler(100,depth=3,labels=true);
@@ -417,7 +452,7 @@ module frame_ref(s=15) {
// Example(2D,Big): Metric vs Imperial
// ruler(12,width=50,inch=true,labels=true,maxscale=0);
// fwd(50)ruler(300,width=50,labels=true);
-module ruler(length=100, width=undef, thickness=1, depth=3, labels=false, pipscale=1/3, maxscale=undef, colors=["black","white"], alpha=1.0, unit=1, inch=false, anchor=LEFT+BACK+TOP, spin=0, orient=UP)
+module ruler(length=100, width, thickness=1, depth=3, labels=false, pipscale=1/3, maxscale, colors=["black","white"], alpha=1.0, unit=1, inch=false, anchor=LEFT+BACK+TOP, spin=0, orient=UP)
{
inchfactor = 25.4;
assert(depth<=5, "Cannot render scales smaller than depth=5");
@@ -492,11 +527,12 @@ function mod_indent(indent=" ") =
// Function: mod_trace()
// Usage:
-// str = mod_trace(<levs>, <indent>);
+// str = mod_trace(<levs>, <indent=>, <modsep=>);
// Description:
// Returns a string that shows the current module and its parents, indented for each unprinted parent module.
// Arguments:
// levs = This is the number of levels to print the names of. Prints the N most nested module names. Default: 2
+// ---
// indent = The string to indent each level by. Default: " " (Two spaces)
// modsep = Multiple module names will be separated by this string. Default: "->"
// Example:
@@ -510,8 +546,8 @@ function mod_trace(levs=2, indent=" ", modsep="->") =
// Function&Module: echo_matrix()
// Usage:
-// echo_matrix(M, [description], [sig], [eps]);
-// dummy = echo_matrix(M, [description], [sig], [eps]),
+// echo_matrix(M, <description=>, <sig=>, <eps=>);
+// dummy = echo_matrix(M, <description=>, <sig=>, <eps=>),
// Description:
// Display a numerical matrix in a readable columnar format with `sig` significant
// digits. Values smaller than eps display as zero. If you give a description
diff --git a/geometry.scad b/geometry.scad
index b5a4c23..52f03c2 100644
--- a/geometry.scad
+++ b/geometry.scad
@@ -2004,7 +2004,7 @@ function _split_polygon_at_x(poly, x) =
) (min(xs) >= x || max(xs) <= x)? [poly] :
let(
poly2 = [
- for (p = pair_wrap(poly)) each [
+ for (p = pair(poly,true)) each [
p[0],
if(
(p[0].x < x && p[1].x > x) ||
@@ -2034,7 +2034,7 @@ function _split_polygon_at_y(poly, y) =
) (min(ys) >= y || max(ys) <= y)? [poly] :
let(
poly2 = [
- for (p = pair_wrap(poly)) each [
+ for (p = pair(poly,true)) each [
p[0],
if(
(p[0].y < y && p[1].y > y) ||
@@ -2064,7 +2064,7 @@ function _split_polygon_at_z(poly, z) =
) (min(zs) >= z || max(zs) <= z)? [poly] :
let(
poly2 = [
- for (p = pair_wrap(poly)) each [
+ for (p = pair(poly,true)) each [
p[0],
if(
(p[0].z < z && p[1].z > z) ||
diff --git a/involute_gears.scad b/involute_gears.scad
index 1cb9842..90859a4 100644
--- a/involute_gears.scad
+++ b/involute_gears.scad
@@ -1124,7 +1124,7 @@ function worm(
],
maxang = 360 / segs(d/2),
refined_polars = [
- for (i=idx(polars,end=-2)) let(
+ for (i=idx(polars,e=-2)) let(
delta = polars[i+1].x - polars[i].x,
steps = ceil(delta/maxang),
step = delta/steps
diff --git a/paths.scad b/paths.scad
index 9e87ae8..cb1b30a 100644
--- a/paths.scad
+++ b/paths.scad
@@ -824,7 +824,7 @@ function assemble_a_path_from_fragments(fragments, rightmost=true, startfrag=0,
[foundfrag, concat([path], remainder)]
) : let(
fragend = select(foundfrag,-1),
- hits = [for (i = idx(path,end=-2)) if(approx(path[i],fragend,eps=eps)) i]
+ hits = [for (i = idx(path,e=-2)) if(approx(path[i],fragend,eps=eps)) i]
) hits? (
let(
// Found fragment intersects with initial path
diff --git a/regions.scad b/regions.scad
index 25a0bd7..7eee696 100644
--- a/regions.scad
+++ b/regions.scad
@@ -367,7 +367,7 @@ function linear_sweep(region, height=1, center, twist=0, scale=1, slices, maxseg
for (path=rgn) let(
p = cleanup_path(path),
path = is_undef(maxseg)? p : [
- for (seg=pair_wrap(p)) each
+ for (seg=pair(p,true)) each
let(steps=ceil(norm(seg.y-seg.x)/maxseg))
lerp(seg.x, seg.y, [0:1/steps:1-EPSILON])
]
@@ -380,7 +380,7 @@ function linear_sweep(region, height=1, center, twist=0, scale=1, slices, maxseg
for (pathnum = idx(rgn)) let(
p = cleanup_path(rgn[pathnum]),
path = is_undef(maxseg)? p : [
- for (seg=pair_wrap(p)) each
+ for (seg=pair(p,true)) each
let(steps=ceil(norm(seg.y-seg.x)/maxseg))
lerp(seg.x, seg.y, [0:1/steps:1-EPSILON])
],
diff --git a/scripts/docs_gen.py b/scripts/docs_gen.py
index fc0afa7..71a4aa1 100755
--- a/scripts/docs_gen.py
+++ b/scripts/docs_gen.py
@@ -574,12 +574,13 @@ class LeafNode(object):
for line in block:
out.append(mkdn_esc(line))
out.append("")
- if self.arguments:
+ if self.arguments or self.named_arguments:
out.append("**Arguments:**")
+ if self.arguments:
out.append('<abbr title="These args can be used by position or by name.">By Position</abbr> | What it does')
out.append("---------------- | ------------------------------")
for argname, argdesc in self.arguments:
- argname = argname.replace(" / ", "` / `")
+ argname = " / ".join("`{}`".format(x.strip()) for x in argname.replace("|","/").split("/"))
out.append(
"{0:15s} | {1}".format(
"`{0}`".format(argname),
@@ -591,7 +592,7 @@ class LeafNode(object):
out.append('<abbr title="These args must be used by name, ie: name=value">By Name</abbr> | What it does')
out.append("-------------- | ------------------------------")
for argname, argdesc in self.named_arguments:
- argname = argname.replace(" / ", "` / `")
+ argname = " / ".join("`{}`".format(x.strip()) for x in argname.replace("|","/").split("/"))
out.append(
"{0:15s} | {1}".format(
"`{0}`".format(argname),
diff --git a/shapes2d.scad b/shapes2d.scad
index 35d1387..bbd3fd1 100644
--- a/shapes2d.scad
+++ b/shapes2d.scad
@@ -186,7 +186,7 @@ module stroke(
if (len(path[0]) == 2) {
// Straight segments
- for (i = idx(path2,end=-2)) {
+ for (i = idx(path2,e=-2)) {
seg = select(path2,i,i+1);
delt = seg[1] - seg[0];
translate(seg[0]) {
@@ -234,7 +234,7 @@ module stroke(
}
} else {
quatsums = Q_Cumulative([
- for (i = idx(path2,end=-2)) let(
+ for (i = idx(path2,e=-2)) let(
vec1 = i==0? UP : unit(path2[i]-path2[i-1], UP),
vec2 = unit(path2[i+1]-path2[i], UP),
axis = vector_axis(vec1,vec2),
@@ -243,12 +243,12 @@ module stroke(
]);
rotmats = [for (q=quatsums) Q_Matrix4(q)];
sides = [
- for (i = idx(path2,end=-2))
+ for (i = idx(path2,e=-2))
quantup(segs(max(widths[i],widths[i+1])/2),4)
];
// Straight segments
- for (i = idx(path2,end=-2)) {
+ for (i = idx(path2,e=-2)) {
dist = norm(path2[i+1] - path2[i]);
w1 = widths[i]/2;
w2 = widths[i+1]/2;
diff --git a/skin.scad b/skin.scad
index 07381ca..e8faf66 100644
--- a/skin.scad
+++ b/skin.scad
@@ -460,7 +460,7 @@ function _skin_core(profiles, caps) =
vertices = [for (prof=profiles) each prof],
plens = [for (prof=profiles) len(prof)],
sidefaces = [
- for(pidx=idx(profiles,end=-2))
+ for(pidx=idx(profiles,e=-2))
let(
prof1 = profiles[pidx%len(profiles)],
prof2 = profiles[(pidx+1)%len(profiles)],
diff --git a/tests/test_arrays.scad b/tests/test_arrays.scad
index 26509c8..162bade 100644
--- a/tests/test_arrays.scad
+++ b/tests/test_arrays.scad
@@ -266,9 +266,9 @@ test_list_fit();
module test_idx() {
colors = ["red", "green", "blue", "cyan"];
assert([for (i=idx(colors)) i] == [0,1,2,3]);
- assert([for (i=idx(colors,end=-2)) i] == [0,1,2]);
- assert([for (i=idx(colors,start=1)) i] == [1,2,3]);
- assert([for (i=idx(colors,start=1,end=-2)) i] == [1,2]);
+ assert([for (i=idx(colors,e=-2)) i] == [0,1,2]);
+ assert([for (i=idx(colors,s=1)) i] == [1,2,3]);
+ assert([for (i=idx(colors,s=1,e=-2)) i] == [1,2]);
}
test_idx();
@@ -449,31 +449,25 @@ test_force_list();
module test_pair() {
assert(pair([3,4,5,6]) == [[3,4], [4,5], [5,6]]);
assert(pair("ABCD") == [["A","B"], ["B","C"], ["C","D"]]);
+ assert(pair([3,4,5,6],true) == [[3,4], [4,5], [5,6], [6,3]]);
+ assert(pair("ABCD",true) == [["A","B"], ["B","C"], ["C","D"], ["D","A"]]);
+ assert(pair([3,4,5,6],wrap=true) == [[3,4], [4,5], [5,6], [6,3]]);
+ assert(pair("ABCD",wrap=true) == [["A","B"], ["B","C"], ["C","D"], ["D","A"]]);
}
test_pair();
-module test_pair_wrap() {
- assert(pair_wrap([3,4,5,6]) == [[3,4], [4,5], [5,6], [6,3]]);
- assert(pair_wrap("ABCD") == [["A","B"], ["B","C"], ["C","D"], ["D","A"]]);
-}
-test_pair_wrap();
-
-
module test_triplet() {
assert(triplet([3,4,5,6,7]) == [[3,4,5], [4,5,6], [5,6,7]]);
assert(triplet("ABCDE") == [["A","B","C"], ["B","C","D"], ["C","D","E"]]);
+ assert(triplet([3,4,5,6],true) == [[3,4,5], [4,5,6], [5,6,3], [6,3,4]]);
+ assert(triplet("ABCD",true) == [["A","B","C"], ["B","C","D"], ["C","D","A"], ["D","A","B"]]);
+ assert(triplet([3,4,5,6],wrap=true) == [[3,4,5], [4,5,6], [5,6,3], [6,3,4]]);
+ assert(triplet("ABCD",wrap=true) == [["A","B","C"], ["B","C","D"], ["C","D","A"], ["D","A","B"]]);
}
test_triplet();
-module test_triplet_wrap() {
- assert(triplet_wrap([3,4,5,6]) == [[3,4,5], [4,5,6], [5,6,3], [6,3,4]]);
- assert(triplet_wrap("ABCD") == [["A","B","C"], ["B","C","D"], ["C","D","A"], ["D","A","B"]]);
-}
-test_triplet_wrap();
-
-
module test_permute() {
assert(permute([3,4,5,6]) == [[3,4],[3,5],[3,6],[4,5],[4,6],[5,6]]);
assert(permute([3,4,5,6],n=3) == [[3,4,5],[3,4,6],[3,5,6],[4,5,6]]);
diff --git a/tests/test_geometry.scad b/tests/test_geometry.scad
index 63a1966..6dc8e02 100644
--- a/tests/test_geometry.scad
+++ b/tests/test_geometry.scad
@@ -394,7 +394,7 @@ module test_line_normal() {
assert(line_normal([[0,0],[0,-10]]) == [1,0]);
assert(approx(line_normal([[0,0],[10,10]]), [-sqrt(2)/2,sqrt(2)/2]));
pts = [for (p=pair(rands(-100,100,1000,seed_value=4312))) p];
- for (p = pair_wrap(pts)) {
+ for (p = pair(pts,true)) {
p1 = p.x;
p2 = p.y;
n = unit(p2-p1);
@@ -619,7 +619,7 @@ module test_circle_point_tangents() {
module test_tri_calc() {
sides = rands(1,100,100,seed_value=8888);
- for (p=pair_wrap(sides)) {
+ for (p=pair(sides,true)) {
opp = p[0];
adj = p[1];
hyp = norm([opp,adj]);
@@ -642,7 +642,7 @@ module test_tri_calc() {
module test_tri_functions() {
sides = rands(1,100,100,seed_value=8181);
- for (p = pair_wrap(sides)) {
+ for (p = pair(sides,true)) {
adj = p.x;
opp = p.y;
hyp = norm([opp,adj]);
diff --git a/version.scad b/version.scad
index 19b3de9..a0652e5 100644
--- a/version.scad
+++ b/version.scad
@@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////
-BOSL_VERSION = [2,0,537];
+BOSL_VERSION = [2,0,542];
// Section: BOSL Library Version Functions
diff --git a/vnf.scad b/vnf.scad
index 19541ea..9e5ada8 100644
--- a/vnf.scad
+++ b/vnf.scad
@@ -674,7 +674,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
varr = vnf[0],
faces = vnf[1],
edges = sort([
- for (face=faces, edge=pair_wrap(face))
+ for (face=faces, edge=pair(face,true))
edge[0]<edge[1]? edge : [edge[1],edge[0]]
]),
edgecnts = unique_count(edges),
@@ -732,8 +732,8 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
for(i = idx(faces), j = idx(faces)) if(i != j)
if(len(deduplicate(faces[i],closed=true))>=3)
if(len(deduplicate(faces[j],closed=true))>=3)
- for(edge1 = pair_wrap(faces[i]))
- for(edge2 = pair_wrap(faces[j]))
+ for(edge1 = pair(faces[i],true))
+ for(edge2 = pair(faces[j],true))
if(edge1 == edge2) // Valid adjacent faces will never have the same vertex ordering.
if(_edge_not_reported(edge1, varr, overpop_edges))
[
@@ -768,7 +768,7 @@ function vnf_validate(vnf, show_warns=true, check_isects=false) =
f1 = faces[i],
f2 = faces[j],
shared_edges = [
- for (edge1 = pair_wrap(f1), edge2 = pair_wrap(f2)) let(
+ for (edge1 = pair(f1,true), edge2 = pair(f2,true)) let(
e1 = edge1[0]<edge1[1]? edge1 : [edge1[1],edge1[0]],
e2 = edge2[0]<edge2[1]? edge2 : [edge2[1],edge2[0]]
) if (e1==e2) 1