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

Implement Path#contains() correctly for open paths.

Browse source
This commit is contained in:
Jürg Lehni 2013-06-12 00:35:34 -07:00
parent ac1908878e
commit 7a2f577b75
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/path/Path.js
View file

@ -1594,10 +1594,10 @@ var Path = PathItem.extend(/** @lends Path# */{
},
_contains: function(point) {
var closed = this._closed;
// If the path is not closed, we should not bail out in case it has a
// fill color!
var hasFill = this.hasFill();
if (!this._closed && !hasFill
if (!closed && !this.hasFill()
// We need to call the internal _getBounds, to get non-
// transformed bounds.
|| !this._getBounds('getRoughBounds')._containsPoint(point))
@ -1615,7 +1615,13 @@ var Path = PathItem.extend(/** @lends Path# */{
crossings = 0,
// Reuse one array for root-finding, give garbage collector a break
roots = new Array(3),
previous = curves[curves.length - 1];
last = closed
? curves[curves.length - 1]
// Create a straight closing line for open paths, just like
// how filling open paths works.
: new Curve(segments[segments.length - 1]._point,
segments[0]._point),
previous = last;
for (var i = 0, l = curves.length; i < l; i++) {
var curve = curves[i];
if (!curve.isZero()) {
@ -1623,11 +1629,8 @@ var Path = PathItem.extend(/** @lends Path# */{
previous = curve;
}
}
// TODO: Do not close open path for contains(), but create a straight
// closing lines instead, just like how filling open paths works.
if (!this._closed && hasFill)
crossings += Curve.create(this, segments[segments.length - 1],
segments[0])._getCrossings(point, previous, roots);
if (!closed)
crossings += last._getCrossings(point, previous, roots);
return (crossings & 1) === 1;
},