scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-03-13 16:33:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Go back to simpler code to handle visited segments.

Browse source 
It appears that the imprecisions addressed in 6cdead0e8c have since disappeared.
This commit is contained in:
Jürg Lehni 2015-10-20 23:02:19 +02:00
parent 7422e0710f
commit 6ccd78e8af
1 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/path/PathItem.Boolean.js
View file

@ -766,52 +766,29 @@ PathItem.inject(new function() {
drawSegment(seg, null, 'stay', i, 'blue');
}
if (seg._visited) {
finished = isStart(seg);
if (finished) {
if (isStart(seg)) {
finished = true;
drawSegment(seg, null, 'done', i, 'red');
}
if (!finished && inter) {
} else if (inter) {
// See if any of the intersections is the start segment,
// and if so finish the path.
var found = findStartSegment(inter, true)
|| findStartSegment(inter, false);
// This should not happen but due to numerical
// imprecisions we sometimes end up in a dead-end. See
// if we can find a way out by checking all valid
// segments to find one that's close enough.
for (var j = 0; !found && j < l; j++) {
var seg2 = segments[j];
// Do not start a chain with already visited
// segments, and segments that are not going to
// be part of the resulting operation.
if (seg !== seg2
&& seg._point.isClose(seg2._point,
/*#=*/Numerical.GEOMETRIC_EPSILON)
&& (isStart(seg2) || isValid(seg2))) {
found = seg2;
}
}
if (found) {
seg = found;
finished = isStart(seg);
if (window.reportSegments) {
console.log('Switching to: ',
seg._path._id + '.' + seg._index);
}
if (finished) {
drawSegment(seg, null, 'done inter', i, 'red');
}
finished = true;
drawSegment(seg, null, 'done multiple', i, 'red');
}
}
if (finished)
break;
if (!isValid(seg)) {
if (!finished) {
// We didn't manage to switch, so stop right here.
console.error('Visited segment encountered, aborting #'
+ pathCount + '.'
+ (path ? path._segments.length + 1 : 1)
+ ', id: ' + seg._path._id + '.' + seg._index
+ ', multiple: ' + !!(inter && inter._next));
break;
}
break;
}
if (!path) {
path = new Path(Item.NO_INSERT);