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

Fixes in finding the "base-contour"

Browse source
This commit is contained in:
hkrish 2013-04-22 11:55:34 +02:00
parent af48103417
commit f3e278f13b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Boolean.js
View file

@ -312,7 +312,7 @@
path1.closed = true; path1.closed = true;
path1Clockwise = path1.clockwise; path1Clockwise = path1.clockwise;
// path1.clockwise = true; // path1.clockwise = true;
graph = graph.concat( makeGraph( path1, 1, 1, true ) ); graph = graph.concat( makeGraph( path1, 1, true ) );
} }
// if operator === BooleanOps.Subtraction, then reverse path2 // if operator === BooleanOps.Subtraction, then reverse path2
@ -323,18 +323,18 @@
for (i = 0, base = true, l = path2Children.length; i < l; i++, base = false) { for (i = 0, base = true, l = path2Children.length; i < l; i++, base = false) {
path2Children[i].closed = true; path2Children[i].closed = true;
if( reverse ){ path2Children[i].reverse(); } if( reverse ){ path2Children[i].reverse(); }
if( base ){ path1Clockwise = path1Children[i].clockwise; } if( base ){ path2Clockwise = path2Children[i].clockwise; }
graph = graph.concat( makeGraph( path2Children[i], 2, i + 1, base ) ); graph = graph.concat( makeGraph( path2Children[i], 2, base ) );
} }
} else { } else {
path2.closed = true; path2.closed = true;
// path2.clockwise = true; // path2.clockwise = true;
if( reverse ){ path2.reverse(); } if( reverse ){ path2.reverse(); }
path2Clockwise = path2.clockwise; path2Clockwise = path2.clockwise;
graph = graph.concat( makeGraph( path2, 2, 1, true ) ); graph = graph.concat( makeGraph( path2, 2, true ) );
} }
// console.log( "Total curves: " + graph.length ); // console.log( path1Clockwise, path2Clockwise );
// Sort function to sort intersections according to the 'parameter'(t) in a link (curve) // Sort function to sort intersections according to the 'parameter'(t) in a link (curve)
function ixSort( a, b ){ return a.parameter - b.parameter; } function ixSort( a, b ){ return a.parameter - b.parameter; }
@ -347,6 +347,7 @@
* intersections if the "id" of the links differ. * intersections if the "id" of the links differ.
* The rest of the algorithm can easily be modified to resolve self-intersections * The rest of the algorithm can easily be modified to resolve self-intersections
*/ */
var ixCount = 0;
for ( i = graph.length - 1; i >= 0; i--) { for ( i = graph.length - 1; i >= 0; i--) {
var c1 = graph[i].getCurve(); var c1 = graph[i].getCurve();
var v1 = c1.getValues(); var v1 = c1.getValues();
@ -363,6 +364,7 @@
// TODO: change this to loc2._id when CurveLocation has an id property // TODO: change this to loc2._id when CurveLocation has an id property
loc2.id = loc[k].id; loc2.id = loc[k].id;
graph[j].intersections.push( loc2 ); graph[j].intersections.push( loc2 );
++ixCount;
} }
} }
} }
@ -537,7 +539,7 @@
while( len-- ){ while( len-- ){
lnk = graph[len]; lnk = graph[len];
if( !lnk.INVALID && !lnk.nodeIn.visited && !firstNode ){ if( !lnk.INVALID && !lnk.nodeIn.visited && !firstNode ){
if( !foundBasePath && lnk.isBaseContour === 1 ){ if( !foundBasePath && lnk.isBaseContour ){
firstNode = lnk.nodeIn; firstNode = lnk.nodeIn;
foundBasePath = true; foundBasePath = true;
break; break;