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

Resolved an issue where overlapping lines were falsely marked invalid

Browse source
This commit is contained in:
hkrish 2013-05-01 22:09:15 +02:00
parent 4afe657896
commit 37ad183c02
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Boolean2.js
View file

@ -155,10 +155,9 @@ function computeBoolean( path1, path2, operator ){
paths.push( _path2 );
}
_path2.selected = true;
// step 1: discard invalid links according to the boolean operator
var lastNode, firstNode, nextNode, midPoint, insidePath1, insidePath2;
var thisId, thisWinding, contains;
var thisId, thisWinding, contains, subtractionOp = (operator.name === 'subtraction');
for (i = 0, len = paths.length; i < len; i++) {
insidePath1 = insidePath2 = false;
path = paths[i];
@ -173,12 +172,12 @@ function computeBoolean( path1, path2, operator ){
midPoint = crv.getPoint( 0.5 );
if( thisId !== path1Id ){
contains = _path1.contains( midPoint );
insidePath1 = (thisWinding === path1Clockwise)? contains :
insidePath1 = (thisWinding === path1Clockwise || subtractionOp )? contains :
contains && !testOnCurve( _path1, midPoint );
}
if( thisId !== path2Id ){
contains = _path2.contains( midPoint );
insidePath2 = (thisWinding === path2Clockwise)? contains :
insidePath2 = (thisWinding === path2Clockwise )? contains :
contains && !testOnCurve( _path2, midPoint );
}
if( !operator( thisId === path1Id, insidePath1, insidePath2 ) ){