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

Further simplifications in PathItem._tracePaths()

Browse source
This commit is contained in:
Jürg Lehni 2014-02-20 15:17:08 +01:00
parent abb2b0dec9
commit b960cbc07b
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/path/PathItem.js
View file

@ -447,21 +447,19 @@ statics: {
seg = startSeg = segments[i];
if (seg._visited || !operator(seg._winding))
continue;
// Initialise a new path chain with the seed segment.
var path = new Path({ insert: false }),
inter = seg._intersection,
startInterSeg = inter && inter._segment,
firstHandleIn = null,
added = false, // Wether a first segment as added already
dir = 1;
do {
var nextHandleIn = dir > 0 ? seg._handleIn : seg._handleOut,
nextHandleOut = dir > 0 ? seg._handleOut : seg._handleIn,
var handleIn = dir > 0 ? seg._handleIn : seg._handleOut,
handleOut = dir > 0 ? seg._handleOut : seg._handleIn,
interSeg;
// If the intersection segment is valid, try switching to
// it, with an appropriate direction to continue traversal.
// Else, stay on the same contour.
if (firstHandleIn
&& (!operator(seg._winding) || selfIx)
if (added && (!operator(seg._winding) || selfIx)
&& (inter = seg._intersection)
&& (interSeg = inter._segment)
&& interSeg !== startSeg) {
@ -507,15 +505,12 @@ statics: {
} else {
dir = 1;
}
nextHandleOut = dir > 0 ? seg._handleOut : seg._handleIn;
handleOut = dir > 0 ? seg._handleOut : seg._handleIn;
}
// Add the current segment to the path, and mark the added
// segment as visited.
if (!firstHandleIn) {
firstHandleIn = nextHandleIn;
nextHandleIn = null;
}
path.add(new Segment(seg._point, nextHandleIn, nextHandleOut));
path.add(new Segment(seg._point, added && handleIn, handleOut));
added = true;
seg._visited = true;
// Move to the next segment according to the traversal direction
seg = dir > 0 ? seg.getNext() : seg. getPrevious();
@ -525,8 +520,8 @@ statics: {
// Finish with closing the paths if necessary, correctly linking up
// curves etc.
if (seg && (seg === startSeg || seg === startInterSeg)) {
path.firstSegment.setHandleIn(
(seg === startInterSeg ? startInterSeg : seg)._handleIn);
path.firstSegment.setHandleIn((seg === startInterSeg
? startInterSeg : seg)._handleIn);
path.setClosed(true);
} else {
path.lastSegment._handleOut.set(0, 0);
@ -534,11 +529,8 @@ statics: {
// Add the path to the result.
// Try to avoid stray segments and incomplete paths.
var count = path._segments.length;
if (count > 2 || count === 2 && path._closed && !path.isPolygon()) {
if (count > 2 || count === 2 && path._closed && !path.isPolygon())
paths.push(path);
} else {
path.remove();
}
}
return paths;
},