Input Handler updates, orientation screen and World visibility

This commit is contained in:
photonstorm
2013-11-04 20:43:59 +00:00
parent 19ddad8095
commit 2e576fa9a7
8 changed files with 236 additions and 64 deletions
+26 -18
View File
@@ -410,20 +410,25 @@ Phaser.InputHandler.prototype = {
*/
pointerOver: function (index) {
if (typeof index === 'undefined')
if (this.enabled)
{
for (var i = 0; i < 10; i++)
if (typeof index === 'undefined')
{
if (this._pointerData[i].isOver)
for (var i = 0; i < 10; i++)
{
return true;
if (this._pointerData[i].isOver)
{
return true;
}
}
}
else
{
return this._pointerData[index].isOver;
}
}
else
{
return this._pointerData[index].isOver;
}
return false;
},
@@ -435,20 +440,25 @@ Phaser.InputHandler.prototype = {
*/
pointerOut: function (pointer) {
if (typeof index === 'undefined')
if (this.enabled)
{
for (var i = 0; i < 10; i++)
if (typeof index === 'undefined')
{
if (this._pointerData[i].isOut)
for (var i = 0; i < 10; i++)
{
return true;
if (this._pointerData[i].isOut)
{
return true;
}
}
}
else
{
return this._pointerData[index].isOut;
}
}
else
{
return this._pointerData[index].isOut;
}
return false;
},
@@ -569,8 +579,6 @@ Phaser.InputHandler.prototype = {
return false;
}
// For an enabled sprite that may have been clicked
if (this.draggable && this._draggedPointerID == pointer.id)
{
return this.updateDrag(pointer);