scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move sorting and expansion of intersections to the getIntersections method

Browse source
This commit is contained in:
hkrish 2014-01-26 05:39:00 +01:00
parent c5ddbf19da
commit 758cf67f6e
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/path/PathItem.js
View file

@ -160,7 +160,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
ix = new paper.Line(from._point.subtract(v1), v1.multiply(2), true)
.intersect(new paper.Line(to._point.subtract(v2),
v2.multiply(2), true), false);
if (ix){
if (ix) {
parts = paper.Curve.subdivide(values1);
locs.length = 0;
Curve.getIntersections(parts[0], parts[1], curve1, curve1, locs);
@ -343,28 +343,10 @@ var PathItem = Item.extend(/** @lends PathItem# */{
* @param {Array} intersections Array of CurveLocation objects
*/
_splitPath: function(intersections) {
function compare(loc1, loc2) {
var path1 = loc1.getPath(),
path2 = loc2.getPath();
return path1 === path2
// We can add parameter (0 <= t <= 1) to index
// (a integer) to compare both at the same time
? (loc1.getIndex() + loc1.getParameter())
- (loc2.getIndex() + loc2.getParameter())
// Sort by path id to group all locations on the same path.
: path1._id - path2._id;
}
var loc, i, j, node1, node2, t, segment,
path1, isLinear, crv, crvNew,
newSegments = [],
tolerance = /*#=*/ Numerical.EPSILON;
// Make a binary heap of all intersections
for (i = intersections.length - 1; i >= 0; i--) {
loc = intersections[i];
intersections.push(loc.getIntersection());
}
intersections.sort(compare);
for (i = intersections.length - 1; i >= 0; i--) {
node1 = intersections[i];
path1 = node1.getPath();
@ -408,6 +390,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
loc._curve === node1._curve) && isLinear)
for (j = newSegments.length-1; j >= 0; j--) {
segment = newSegments[j];
// FIXME: Don't reset the appropriate handle if the intersections were on t==0 && t==1
segment._handleOut.set(0, 0);
segment._handleIn.set(0, 0);
}