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

Further simplify boolean operator handling.

Browse source
This commit is contained in:
Jürg Lehni 2016-01-05 11:10:59 +01:00
parent 1132de0415
commit d71acb4002
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,10 +77,9 @@ PathItem.inject(new function() {
var _path1 = preparePath(path1, true),
_path2 = path2 && path1 !== path2 && preparePath(path2, true),
// Retrieve the operator lookup table for winding numbers.
lookup = operators[operation],
// Create the operator structure, holding the lookup table and a
// simple boolean check for an operation, e.g. `if (operator.unite)`
operator = { lookup: lookup };
operator = operators[operation];
// Add a simple boolean property to check for a given operation,
// e.g. `if (operator.unite)`
operator[operation] = true;
// Give both paths the same orientation except for subtraction
// and exclusion, where we need them at opposite orientation.
@ -129,7 +128,7 @@ PathItem.inject(new function() {
// If there are any valid segments that are not part of overlaps,
// prefer these to start tracing boolean paths from. But if all
// segments are part of overlaps, we need to start there.
if (!(inter && inter.isOverlap()) && lookup[segment._winding])
if (!(inter && inter.isOverlap()) && operator[segment._winding])
startInOverlaps = false;
}
return finishBoolean(CompoundPath,
@ -532,8 +531,7 @@ PathItem.inject(new function() {
otherStart;
function isValid(seg) {
return !seg._visited
&& (!operator || operator.lookup[seg._winding]);
return !seg._visited && (!operator || operator[seg._winding]);
}
function isStart(seg) {