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

Minor code cleanups.

Browse source
This commit is contained in:
Jürg Lehni 2017-02-04 20:14:35 +01:00
parent a410aafaf2
commit 9af936514e
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ PathItem.inject(new function() {
for (var i = 0, l = segments.length; i < l; i++) { for (var i = 0, l = segments.length; i < l; i++) {
var segment = segments[i], var segment = segments[i],
inter = segment._intersection; inter = segment._intersection;
if (segment._winding == null) { if (!segment._winding) {
propagateWinding(segment, _path1, _path2, curves, operator); propagateWinding(segment, _path1, _path2, curves, operator);
} }
// See if all encountered segments in a path are overlaps. // See if all encountered segments in a path are overlaps.
@ -275,9 +275,10 @@ PathItem.inject(new function() {
// different "insideness" and set opposite orientation. // different "insideness" and set opposite orientation.
if (path2.contains(point)) { if (path2.contains(point)) {
var entry2 = lookup[path2._id]; var entry2 = lookup[path2._id];
containerWinding = entry2.winding;
entry1.winding += containerWinding;
entry1.container = entry2.exclude ? entry2.container entry1.container = entry2.exclude ? entry2.container
: path2; : path2;
entry1.winding += (containerWinding = entry2.winding);
break; break;
} }
} }
@ -713,15 +714,17 @@ PathItem.inject(new function() {
function isValid(seg) { function isValid(seg) {
var winding; var winding;
return !!(seg && !seg._visited && (!operator var res = !!(seg && !seg._visited && (!operator
|| operator[(winding = seg._winding || {}).winding] || operator[(winding = seg._winding).winding]
// Unite operations need special handling of segments with a // Unite operations need special handling of segments
// winding contribution of two (part of both involved areas) // with a winding contribution of two (part of both
// which are only valid if they are part of the contour of // areas), which are only valid if they are part of the
// the result, not contained inside another area. // result's contour, not contained inside another area.
&& !(operator.unite && winding.winding === 2 && !(operator.unite && winding.winding === 2
// No contour if both windings are non-zero. // No contour if both windings are non-zero.
&& winding.windingL && winding.windingR))); && winding.windingL && winding.windingR)));
console.log(seg && seg._winding);
return res;
} }
function isStart(seg) { function isStart(seg) {