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

Clean up Item#hitTest() code.

Browse source
This commit is contained in:
Jürg Lehni 2013-06-23 19:01:48 -07:00
parent 58f697abfc
commit 9f7167a47f
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/item/Item.js
View file

@ -1372,14 +1372,6 @@ var Item = Base.extend(Callback, /** @lends Item# */{
* hit.
*/
hitTest: function(point, options) {
function checkBounds(type, part) {
var pt = bounds['get' + part]();
// TODO: We need to transform the point back to the coordinate
// system of the DOM level on which the inquiry was started!
if (point.getDistance(pt) < options.tolerance)
return new HitResult(type, that,
{ name: Base.hyphenate(part), point: pt });
}
point = Point.read(arguments);
options = HitResult.getOptions(Base.read(arguments));
@ -1395,20 +1387,32 @@ var Item = Base.extend(Callback, /** @lends Item# */{
// Transform point to local coordinates but use untransformed point
// for bounds check above.
point = this._matrix._inverseTransform(point);
var that = this,
res;
function checkBounds(type, part) {
var pt = bounds['get' + part]();
// TODO: We need to transform the point back to the coordinate
// system of the DOM level on which the inquiry was started!
if (point.getDistance(pt) < options.tolerance)
return new HitResult(type, that,
{ name: Base.hyphenate(part), point: pt });
}
if ((options.center || options.bounds) &&
// Ignore top level layers:
!(this instanceof Layer && !this._parent)) {
// Don't get the transformed bounds, check against transformed
// points instead
var bounds = this.getBounds(),
that = this,
// TODO: Move these into a private scope
points = ['TopLeft', 'TopRight', 'BottomLeft', 'BottomRight',
'LeftCenter', 'TopCenter', 'RightCenter', 'BottomCenter'],
res;
var bounds = this.getBounds();
if (options.center && (res = checkBounds('center', 'Center')))
return res;
if (options.bounds) {
// TODO: Move these into a private scope
var points = [
'TopLeft', 'TopRight', 'BottomLeft', 'BottomRight',
'LeftCenter', 'TopCenter', 'RightCenter', 'BottomCenter'
];
for (var i = 0; i < 8; i++)
if (res = checkBounds('bounds', points[i]))
return res;
@ -1427,10 +1431,9 @@ var Item = Base.extend(Callback, /** @lends Item# */{
_hitTest: function(point, options) {
if (this._children) {
// Loop backwards, so items that get drawn last are tested first
for (var i = this._children.length - 1; i >= 0; i--) {
var res = this._children[i].hitTest(point, options);
if (res) return res;
}
for (var i = this._children.length - 1; i >= 0; i--)
if (res = this._children[i].hitTest(point, options))
return res;
} else if (this.hasFill() && this._contains(point)) {
return new HitResult('fill', this);
}