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

vnf_halfspace: fixed loop detection

Browse source
This commit is contained in:
Jerome Plut 2020-12-04 09:06:34 +01:00
parent 8b22f3da08
commit 245a545b6e
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
vnf.scad
View file

@ -916,20 +916,37 @@ function _vnf_halfspace_face(face, map, inside, i=0,
concat(newface0, [inter]), concat(newface0, [inter]),
concat(newedge, [inter]), concat(newedge, [inter]),
is_undef(exit) ? inside[p] : exit); is_undef(exit) ? inside[p] : exit);
function _vnf_halfspace_path_search_edge(edge, paths, i=0, ret=[undef,undef]) =
/* given an oriented edge [x,y] and a set of oriented paths,
* returns the indices [i,j] of paths [before, after] given edge
*/
// termination condition
i >= len(paths) ? ret:
_vnf_halfspace_path_search_edge(edge, paths, i+1,
[last(paths[i]) == edge[0] ? i : ret[0],
paths[i][0] == edge[1] ? i : ret[1]]);
function _vnf_halfspace_paths(edges, i=0, paths=[]) = function _vnf_halfspace_paths(edges, i=0, paths=[]) =
/* given a set of oriented edges [x,y], /* given a set of oriented edges [x,y],
returns all paths [x,y,z,..] that may be formed from these edges. returns all paths [x,y,z,..] that may be formed from these edges.
A closed path will be returned with equal first and last point. A closed path will be returned with equal first and last point.
i: index of currently examined edge i: index of currently examined edge
*/ */
i >= len(edges) ? paths : // termination condition i >= len(edges) ? paths : // termination condition
let(e = edges[i], let(e=edges[i], s = _vnf_halfspace_path_search_edge(e, paths))
s = [for(x=enumerate(paths)) if(last(x[1]) == e[0]) x[0]]) _vnf_halfspace_paths(edges, i+1,
_vnf_halfspace_paths(edges, i+1, // we keep all paths untouched by e[i]
// if cannot attach to previous path: create a new one concat([for(i=[0:1:len(paths)-1]) if(i!= s[0] && i != s[1]) paths[i]],
s == [] ? concat(paths, [e]) : is_undef(s[0])? (
// otherwise, attach to found path // fresh e: create a new path
[for(x=enumerate(paths)) x[0]==s[0] ? concat(x[1], [e[1]]) : x[1]]); is_undef(s[1]) ? [e] :
// e attaches to beginning of previous path
[concat([e[0]], paths[s[1]])]
) :// edge attaches to end of previous path
is_undef(s[1]) ? [concat(paths[s[0]], [e[1]])] :
// edge merges two paths
s[0] != s[1] ? [concat(paths[s[0]], paths[s[1]])] :
// edge closes a loop
[concat(paths[s[0]], [e[1]])]));
function vnf_halfspace(_arg1=_undef, _arg2=_undef, function vnf_halfspace(_arg1=_undef, _arg2=_undef,
halfspace=_undef, vnf=_undef) = halfspace=_undef, vnf=_undef) =
// here is where we wish that OpenSCAD had array lvalues... // here is where we wish that OpenSCAD had array lvalues...