scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-03 19:45:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

No more need for two passes of findBestIntersection()

Browse source 
Goodbye strict-mode :)
This commit is contained in:
Jürg Lehni 2016-06-13 12:49:57 +02:00
parent fbe787dc4d
commit 693898a5b1
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -515,7 +515,7 @@ PathItem.inject(new function() {
// If there are multiple possible intersections, find the one that's // If there are multiple possible intersections, find the one that's
// either connecting back to start or is not visited yet, and will be // either connecting back to start or is not visited yet, and will be
// part of the boolean result: // part of the boolean result:
function findBestIntersection(inter, exclude, strict) { function findBestIntersection(inter, exclude) {
if (!inter._next) if (!inter._next)
return inter; return inter;
while (inter) { while (inter) {
@ -525,26 +525,14 @@ PathItem.inject(new function() {
// See if this segment and the next are both not visited yet, or // See if this segment and the next are both not visited yet, or
// are bringing us back to the beginning, and are both valid, // are bringing us back to the beginning, and are both valid,
// meaning they are part of the boolean result. // meaning they are part of the boolean result.
// Handling overlaps correctly requires two passes, first with
// strict set to true, then false:
// In strict mode, the next segment is not allowed to be an
// overlap. In non-strict mode, the next segment may be invalid
// if it offers a switch to a valid segment.
if (seg !== exclude && (isStart(seg) || isStart(nextSeg) if (seg !== exclude && (isStart(seg) || isStart(nextSeg)
|| !seg._visited && !nextSeg._visited || !seg._visited && !nextSeg._visited
// Self-intersections (!operator) don't need isValid() calls // Self-intersections (!operator) don't need isValid() calls
&& (!operator && (!operator || isValid(seg) && (isValid(nextSeg)
|| isValid(seg) // If the next segment isn't valid, its intersection
// Do not consider nextSeg in strict mode if it is part // to which we may switch might be, so check that.
// of an overlap, in order to give non-overlapping || nextInter && isValid(nextInter._segment)))
// options that might follow the priority over overlaps. ))
&& (!(strict && nextInter && nextInter._overlap)
&& isValid(nextSeg)
// If the next segment isn't valid, its intersection
// to which we may switch might be, so check that.
|| !strict && nextInter
&& isValid(nextInter._segment))
)))
return inter; return inter;
// If it's no match, continue with the next linked intersection. // If it's no match, continue with the next linked intersection.
inter = inter._next; inter = inter._next;
@ -593,8 +581,7 @@ PathItem.inject(new function() {
while (true) { while (true) {
// For each segment we encounter, see if there are multiple // For each segment we encounter, see if there are multiple
// intersections, and if so, pick the best one: // intersections, and if so, pick the best one:
inter = inter && (findBestIntersection(inter, seg, true) inter = inter && findBestIntersection(inter, seg) || inter;
|| findBestIntersection(inter, seg, false)) || inter;
// Get the reference to the other segment on the intersection. // Get the reference to the other segment on the intersection.
var other = inter && inter._segment; var other = inter && inter._segment;
if (isStart(seg)) { if (isStart(seg)) {