scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always give intersection segment priority over current segment if valid.

Browse source 
Fixes example 22 in #784, doesn't seem to introduce new issues, unlike last time I tried this approach.
This commit is contained in:
Jürg Lehni 2015-10-05 05:34:22 +02:00
parent bd4874d73e
commit 05bc6afdbb
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/path/CurveLocation.js
View file

@ -483,10 +483,11 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
var loc2 = locations[i];
// See #equals() for details of why `>= 1` is used here.
if (abs(compare(loc, loc2)) >= 1)
return null;
break;
if (loc.equals(loc2))
return loc2;
}
return null;
}
while (l <= r) {

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

@ -649,8 +649,8 @@ PathItem.inject(new function() {
+ ', other: ' + inter._segment._path._id + '.'
+ inter._segment._index);
}
inter = getIntersection(true, inter)
|| getIntersection(false, inter) || inter;
inter = inter && (getIntersection(true, inter)
|| getIntersection(false, inter)) || inter;
var other = inter && inter._segment;
// A switched intersection means we may have changed the segment
// Point to the other segment in the selected intersection.
@ -699,10 +699,6 @@ PathItem.inject(new function() {
// switch at each crossing.
drawSegment(seg, other, 'exclude-cross', i, 'green');
seg = other;
} else if (!seg._visited && isValid(seg)) {
// Do not switch to the intersecting segment as this segment
// is part of the the boolean result.
drawSegment(seg, null, 'keep', i, 'black');
} else if (!other._visited && isValid(other)) {
// The other segment is part of the boolean result, and we
// are at crossing, switch over.
@ -713,6 +709,7 @@ PathItem.inject(new function() {
drawSegment(seg, null, 'stay', i, 'blue');
}
if (seg._visited) {
// TODO: || !isValid(seg) ?
// We didn't manage to switch, so stop right here.
console.error('Visited segment encountered, aborting #'
+ pathCount + '.'