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

Give PathItem#getIntersections() a way to filter found intersections right away.

Browse source 
And use it in #getCrossings()
This commit is contained in:
Jürg Lehni 2015-09-21 10:41:59 -04:00
parent f6f42fe09b
commit e36319b71a
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/item/Item.js
View file

@ -1686,7 +1686,7 @@ var Item = Base.extend(Emitter, /** @lends Item# */{
return false;
// Tell getIntersections() to return as soon as some intersections are
// found, because all we care for here is there are some or none:
return this._asPathItem().getIntersections(item._asPathItem(),
return this._asPathItem().getIntersections(item._asPathItem(), null,
_matrix || item._matrix, true).length > 0;
},

14
src/path/Curve.js
View file

@ -1352,17 +1352,13 @@ new function() { // Scope for intersection using bezier fat-line clipping
t1 = res[0];
t2 = res[1];
}
/*
var d1 = p1 ? p1.getDistance(Curve.getPoint(v1, t1)) : 0,
d2 = p2 ? p2.getDistance(Curve.getPoint(v2, t2)) : 0;
if (!Numerical.isZero(d1) || !Numerical.isZero(d2))
debugger;
*/
CurveLocation.add(locations,
new CurveLocation(c1, t1, p1 || Curve.getPoint(v1, t1),
var loc = new CurveLocation(c1, t1, p1 || Curve.getPoint(v1, t1),
null, overlap,
new CurveLocation(c2, t2, p2 || Curve.getPoint(v2, t2),
null, overlap)), true);
null, overlap)),
include = param.include;
if (!include || include(loc))
CurveLocation.add(locations, loc, true);
}
}

20
src/path/PathItem.js
View file

@ -32,6 +32,9 @@ var PathItem = Item.extend(/** @lends PathItem# */{
* supported.
*
* @param {PathItem} path the other item to find the intersections with
* @param {Function} [include] a callback function that can be used to
* filter out undesired locations right while they are collected.
* When defined, it shall return {@true to include a location}.
* @return {CurveLocation[]} the locations of all intersection between the
* paths
* @example {@paperscript} // Finding the intersections between two paths
@ -57,7 +60,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
* }
* }
*/
getIntersections: function(path, _matrix, _returnFirst) {
getIntersections: function(path, include, _matrix, _returnFirst) {
// NOTE: For self-intersection, path is null. This means you can also
// just call path.getIntersections() without an argument to get self
// intersections.
@ -103,6 +106,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
var parts = Curve.subdivide(values1, 0.5);
Curve.getIntersections(parts[0], parts[1], curve1, curve1,
locations, {
include: include,
// Only possible if there is only one closed curve:
startConnected: length1 === 1 && p1.equals(p2),
// After splitting, the end is always connected:
@ -129,12 +133,15 @@ var PathItem = Item.extend(/** @lends PathItem# */{
Curve.getIntersections(
values1, values2[j], curve1, curve2, locations,
self ? {
include: include,
// Do not compare indices here to determine connection,
// since one array of curves can contain curves from
// separate sup-paths of a compound path.
startConnected: curve1.getPrevious() === curve2,
endConnected: curve1.getNext() === curve2
} : {}
} : {
include: include
}
);
}
}
@ -142,13 +149,10 @@ var PathItem = Item.extend(/** @lends PathItem# */{
},
getCrossings: function(path) {
var locations = this.getIntersections(path);
for (var i = locations.length - 1; i >= 0; i--) {
return this.getIntersections(path, function(inter) {
// TODO: An overlap could be either a crossing or a tangent!
if (!locations[i].isCrossing() && !locations[i]._overlap)
locations.splice(i, 1);
}
return locations;
return inter.isCrossing() || inter._overlap;
});
},
_asPathItem: function() {