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

Trying getParameterOf instead of getNearestLocation.parameter

Browse source
This commit is contained in:
hkrish 2013-04-19 22:35:36 +02:00
parent aabec49446
commit aa9f569931
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Boolean.js
View file

@ -321,10 +321,12 @@ function computeBoolean( _path1, _path2, operator ){
for (k = 0, l=loc.length; k<l; k++) { for (k = 0, l=loc.length; k<l; k++) {
var loc1 = loc[k].clone(); var loc1 = loc[k].clone();
loc1._intersectionID = loc[k]._intersectionID; loc1._intersectionID = loc[k]._intersectionID;
// loc1._parameter = c1.getParameterOf( loc[k] ); // For sorting on curve1
loc1._parameter = c1.getNearestLocation( loc[k] ).parameter; // For sorting on curve1 loc1._parameter = c1.getNearestLocation( loc[k] ).parameter; // For sorting on curve1
graph[i].intersections.push( loc1 ); graph[i].intersections.push( loc1 );
var loc2 = loc[k].clone(); var loc2 = loc[k].clone();
loc2._intersectionID = loc[k]._intersectionID; loc2._intersectionID = loc[k]._intersectionID;
// loc2._parameter = c2.getParameterOf( loc[k] ); // For sorting on curve2
loc2._parameter = c2.getNearestLocation( loc[k] ).parameter; // For sorting on curve2 loc2._parameter = c2.getNearestLocation( loc[k] ).parameter; // For sorting on curve2
graph[j].intersections.push( loc2 ); graph[j].intersections.push( loc2 );
} }
@ -351,6 +353,7 @@ function computeBoolean( _path1, _path2, operator ){
// We need to recalculate parameter after each curve split // We need to recalculate parameter after each curve split
// This operation (except for recalculating the curve parameter), // This operation (except for recalculating the curve parameter),
// is fairly similar to Curve.split method, except that it operates on Node and Link objects. // is fairly similar to Curve.split method, except that it operates on Node and Link objects.
// var param = crv.getParameterOf( ix[j] );
var param = crv.getNearestLocation( ix[j] ).parameter; var param = crv.getNearestLocation( ix[j] ).parameter;
if( param === 0.0 || param === 1.0) { if( param === 0.0 || param === 1.0) {
// Intersection falls on an existing node // Intersection falls on an existing node
@ -487,9 +490,7 @@ function computeBoolean( _path1, _path2, operator ){
} }
} }
// Final step: Retrieve the resulting paths from the graph // Final step: Retrieve the resulting paths from the graph
// TODO: start from a path where childId === 1
var boolResult = new CompoundPath(); var boolResult = new CompoundPath();
var firstNode = true, nextNode, foundBasePath = false; var firstNode = true, nextNode, foundBasePath = false;
while( firstNode ){ while( firstNode ){