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

Update to the latest paperjs api 74f6a93

Browse source
This commit is contained in:
hkrish 2013-04-26 09:55:21 +02:00
parent 019693d144
commit 29dffd1984
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Boolean.js
View file

@ -364,9 +364,9 @@
var v2 = c2.getValues(); var v2 = c2.getValues();
var loc = []; var loc = [];
if( c1.isLinear() && c2.isLinear() ){ if( c1.isLinear() && c2.isLinear() ){
_addLineIntersections( v1, v2, c1, loc ); getLineIntersections( v1, v2, c1, loc );
} else { } else {
Curve._addIntersections( v1, v2, c1, loc ); Curve.getIntersections( v1, v2, c1, loc );
} }
if( loc.length ){ if( loc.length ){
for (k = 0, l=loc.length; k<l; k++) { for (k = 0, l=loc.length; k<l; k++) {
@ -495,7 +495,7 @@
*/ */
// step 1: discard invalid links according to the boolean operator // step 1: discard invalid links according to the boolean operator
for ( i = graph.length - 1; i >= 0; i--) { for ( i = graph.length - 1; i >= 0; i-- ) {
var insidePath1 = false, insidePath2 = false, contains; var insidePath1 = false, insidePath2 = false, contains;
lnk = graph[i]; lnk = graph[i];
// if( lnk.SKIP_OPERATOR ) { continue; } // if( lnk.SKIP_OPERATOR ) { continue; }
@ -503,21 +503,18 @@
crv = lnk.getCurve(); crv = lnk.getCurve();
// var midPoint = new Point(lnk.nodeIn.point); // var midPoint = new Point(lnk.nodeIn.point);
var midPoint = crv.getPoint( 0.5 ); var midPoint = crv.getPoint( 0.5 );
// FIXME: new contains function : http://jsfiddle.net/QawX8/
// If on a base curve, consider points on the curve and inside, // If on a base curve, consider points on the curve and inside,
// if not —for example a hole, points on the curve falls outside // if not —for example a hole, points on the curve falls outside
if( lnk.id !== 1 ){ if( lnk.id !== 1 ){
contains = contains2( path1, midPoint ); contains = path1.contains( midPoint );
insidePath1 = (lnk.winding === path1Clockwise)? contains > 0: contains > 1; insidePath1 = (lnk.winding === path1Clockwise)? contains :
contains && !testOnCurve( path1, midPoint );
} }
if( lnk.id !== 2 ){ if( lnk.id !== 2 ){
contains = contains2( path2, midPoint ); contains = path2.contains( midPoint );
insidePath2 = (lnk.winding === path2Clockwise)? contains > 0: contains > 1; insidePath2 = (lnk.winding === path2Clockwise)? contains :
contains && !testOnCurve( path2, midPoint );
} }
// insidePath1 = (lnk.id === 1 )? false : contains2( path1, midPoint );
// insidePath2 = (lnk.id === 2 )? false : contains2( path2, midPoint );
// insidePath1 = (lnk.id === 1 )? false : path1.contains( midPoint );
// insidePath2 = (lnk.id === 2 )? false : path2.contains( midPoint );
} }
if( lnk.INVALID || !operator( lnk, insidePath1, insidePath2 ) ){ if( lnk.INVALID || !operator( lnk, insidePath1, insidePath2 ) ){
// lnk = graph.splice( i, 1 )[0]; // lnk = graph.splice( i, 1 )[0];
@ -629,7 +626,7 @@
} }
var _addLineIntersections = function(v1, v2, curve, locations) { var getLineIntersections = function(v1, v2, curve, locations) {
var result, a1x, a2x, b1x, b2x, a1y, a2y, b1y, b2y; var result, a1x, a2x, b1x, b2x, a1y, a2y, b1y, b2y;
a1x = v1[0]; a1y = v1[1]; a1x = v1[0]; a1y = v1[1];
a2x = v1[6]; a2y = v1[7]; a2x = v1[6]; a2y = v1[7];
@ -647,7 +644,7 @@ var _addLineIntersections = function(v1, v2, curve, locations) {
} }
}; };
function contains2( path, point ){ function testOnCurve( path, point ){
var res = 0; var res = 0;
var crv = path.getCurves(); var crv = path.getCurves();
var i = 0; var i = 0;
@ -659,9 +656,6 @@ function contains2( path, point ){
res = 1; res = 1;
} }
} }
if( !res ){
res = (path.contains(point))? 2: res;
}
} }
return res; return res;
} }

2
booleanTests.js
View file

@ -188,7 +188,7 @@ function runTests() {
var booleanStyle = { var booleanStyle = {
fillColor: new Color( 1, 0, 0, 0.5 ), fillColor: new Color( 1, 0, 0, 0.5 ),
strokeColor: new Color( 0, 0, 0 ), strokeColor: new Color( 0, 0, 0 ),
strokeWidth: 2 strokeWidth: 1.5
}; };
var pathStyleNormal = { var pathStyleNormal = {