mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-04 03:45:58 -05:00
Boolean: Sort segments to give non-ambiguous segments preference when tracing.
Relates to #1075
This commit is contained in:
parent
91e67887da
commit
064cee1629
1 changed files with 12 additions and 2 deletions
|
@ -632,6 +632,17 @@ PathItem.inject(new function() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Sort segments to give non-ambiguous segments the preference as
|
||||||
|
// starting points when tracing: prefer segments with no intersections
|
||||||
|
// over intersections, and process intersections with overlaps last:
|
||||||
|
segments.sort(function(a, b) {
|
||||||
|
var i1 = a._intersection,
|
||||||
|
i2 = b._intersection,
|
||||||
|
o1 = !!(i1 && i1._overlap),
|
||||||
|
o2 = !!(i2 && i2._overlap);
|
||||||
|
return !i1 && !i2 ? -1 : o1 ^ o2 ? o1 ? 1 : -1 : 0;
|
||||||
|
});
|
||||||
|
|
||||||
for (var i = 0, l = segments.length; i < l; i++) {
|
for (var i = 0, l = segments.length; i < l; i++) {
|
||||||
var path = null,
|
var path = null,
|
||||||
finished = false,
|
finished = false,
|
||||||
|
@ -666,8 +677,7 @@ PathItem.inject(new function() {
|
||||||
// contribution but are part of the contour (excludeContour=true).
|
// contribution but are part of the contour (excludeContour=true).
|
||||||
// - Do not start in overlaps, unless all segments are part of
|
// - Do not start in overlaps, unless all segments are part of
|
||||||
// overlaps, in which case we have no other choice.
|
// overlaps, in which case we have no other choice.
|
||||||
if (!isValid(seg, true)
|
if (!isValid(seg, true))
|
||||||
|| !seg._path._validOverlapsOnly && inter && inter._overlap)
|
|
||||||
continue;
|
continue;
|
||||||
start = otherStart = null;
|
start = otherStart = null;
|
||||||
while (true) {
|
while (true) {
|
||||||
|
|
Loading…
Reference in a new issue