wassname/phaser
1
0
Fork 0
mirror of https://github.com/wassname/phaser.git synced 2026-09-11 12:31:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-done the pointer handler so it respects the top-most rendered sprite in priority to anything below it, for both mouse over and click events.

Browse Source
This commit is contained in:
Richard Davey
2013-06-03 12:03:34 +01:00
parent 1c37cd1a96
commit 82d4ba4538
18 changed files with 689 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Phaser/components/animation/AnimationManager.ts
+2
View File
@@ -251,6 +251,8 @@ module Phaser.Components {
this._parent.frameBounds.width = this.currentFrame.width;
this._parent.frameBounds.height = this.currentFrame.height;
//this._parent.frameBounds.width = this.currentFrame.sourceSizeW;
//this._parent.frameBounds.height = this.currentFrame.sourceSizeH;
this._frameIndex = this.currentFrame.index;
}
Phaser/components/animation/Frame.ts
+6 -4
View File
@@ -22,6 +22,8 @@ module Phaser {
*/
constructor(x: number, y: number, width: number, height: number, name: string) {
console.log('Creating Frame', name, 'x', x, 'y', y, 'width', width, 'height', height);
this.x = x;
this.y = y;
this.width = width;
@@ -134,10 +136,10 @@ module Phaser {
* @param trimmed {boolean} Whether this frame trimmed or not.
* @param actualWidth {number} Actual width of this frame.
* @param actualHeight {number} Actual height of this frame.
* @param destX {number} Destiny x position.
* @param destY {number} Destiny y position.
* @param destWidth {number} Destiny draw width.
* @param destHeight {number} Destiny draw height.
* @param destX {number} Destination x position.
* @param destY {number} Destination y position.
* @param destWidth {number} Destination draw width.
* @param destHeight {number} Destination draw height.
*/
public setTrim(trimmed: bool, actualWidth: number, actualHeight: number, destX: number, destY: number, destWidth: number, destHeight: number) {
Phaser/components/animation/FrameData.ts
+4 -3
View File
@@ -24,6 +24,7 @@ module Phaser {
* Local frame container.
*/
private _frames: Frame[];
/**
* Local frameName<->index container.
*/
@@ -76,7 +77,7 @@ module Phaser {
*/
public getFrameByName(name: string): Frame {
if (this._frameNames[name] >= 0)
if (this._frameNames[name] !== '')
{
return this._frames[this._frameNames[name]];
}
@@ -92,7 +93,7 @@ module Phaser {
*/
public checkFrameName(name: string): bool {
if (this._frameNames[name] >= 0)
if (this._frameNames[name])
{
return true;
}
@@ -138,7 +139,7 @@ module Phaser {
}
/**
* Get all names of frames by giving their indexes.
* Get the frame indexes by giving the frame names.
* @param [output] {number[]} result will be added into this array.
* @return {number[]} Names of specific frames in an array.
*/
Phaser/components/sprite/Input.ts
+89 -47
View File
@@ -223,6 +223,17 @@ module Phaser.Components {
}
public reset() {
this.enabled = false;
for (var i = 0; i < 10; i++)
{
this._pointerData[i] = { id: i, x: 0, y: 0, isDown: false, isUp: false, isOver: false, isOut: false, timeOver: 0, timeOut: 0, timeDown: 0, timeUp: 0, downDuration: 0, isDragged: false };
}
}
public stop() {
// Turning off
@@ -239,69 +250,94 @@ module Phaser.Components {
}
public checkPointerOver(pointer: Phaser.Pointer): bool {
if (this.enabled == false || this._sprite.visible == false)
{
return false;
}
else
{
return RectangleUtils.contains(this._sprite.frameBounds, pointer.x, pointer.y);
}
}
/**
* Update
*/
public update(pointer: Phaser.Pointer): bool {
if (this.enabled == false)
if (this.enabled == false || this._sprite.visible == false)
{
return false;
}
if (this.draggable && this._draggedPointerID == pointer.id)
{
this.updateDrag(pointer);
}
if (RectangleUtils.contains(this._sprite.frameBounds, pointer.x, pointer.y))
if (this.draggable && this._draggedPointerID == pointer.id)
{
// { id: i, x: 0, y: 0, isDown: false, isUp: false, isOver: false, isOut: false, timeOver: 0, timeOut: 0, isDragged: false }
this._pointerData[pointer.id].x = pointer.x - this._sprite.x;
this._pointerData[pointer.id].y = pointer.y - this._sprite.y;
if (this._pointerData[pointer.id].isOver == false)
{
this._pointerData[pointer.id].isOver = true;
this._pointerData[pointer.id].isOut = false;
this._pointerData[pointer.id].timeOver = this.game.time.now;
if (this.useHandCursor && this._pointerData[pointer.id].isDragged == false)
{
this.game.stage.canvas.style.cursor = "pointer";
}
this._sprite.events.onInputOver.dispatch(this._sprite, pointer);
}
return true;
return this.updateDrag(pointer);
}
else
else if (this._pointerData[pointer.id].isOver == true)
{
if (this._pointerData[pointer.id].isOver)
if (RectangleUtils.contains(this._sprite.frameBounds, pointer.x, pointer.y))
{
this._pointerData[pointer.id].isOver = false;
this._pointerData[pointer.id].isOut = true;
this._pointerData[pointer.id].timeOut = this.game.time.now;
if (this.useHandCursor && this._pointerData[pointer.id].isDragged == false)
{
this.game.stage.canvas.style.cursor = "default";
}
this._sprite.events.onInputOut.dispatch(this._sprite, pointer);
this._pointerData[pointer.id].x = pointer.x - this._sprite.x;
this._pointerData[pointer.id].y = pointer.y - this._sprite.y;
return true;
}
else
{
this._pointOutHandler(pointer);
return false;
}
return false;
}
}
public _touchedHandler(pointer: Pointer) {
public _pointerOverHandler(pointer: Pointer) {
// { id: i, x: 0, y: 0, isDown: false, isUp: false, isOver: false, isOut: false, timeOver: 0, timeOut: 0, isDragged: false }
if (this._pointerData[pointer.id].isOver == false)
{
this._pointerData[pointer.id].isOver = true;
this._pointerData[pointer.id].isOut = false;
this._pointerData[pointer.id].timeOver = this.game.time.now;
this._pointerData[pointer.id].x = pointer.x - this._sprite.x;
this._pointerData[pointer.id].y = pointer.y - this._sprite.y;
if (this.useHandCursor && this._pointerData[pointer.id].isDragged == false)
{
this.game.stage.canvas.style.cursor = "pointer";
}
this._sprite.events.onInputOver.dispatch(this._sprite, pointer);
}
}
public _pointOutHandler(pointer: Pointer) {
this._pointerData[pointer.id].isOver = false;
this._pointerData[pointer.id].isOut = true;
this._pointerData[pointer.id].timeOut = this.game.time.now;
if (this.useHandCursor && this._pointerData[pointer.id].isDragged == false)
{
this.game.stage.canvas.style.cursor = "default";
}
this._sprite.events.onInputOut.dispatch(this._sprite, pointer);
}
public consumePointerEvent: bool = false;
public _touchedHandler(pointer: Pointer): bool {
if (this._pointerData[pointer.id].isDown == false && this._pointerData[pointer.id].isOver == true)
{
console.log('touchDown on', this._sprite.texture.cacheKey,this._sprite.frameName, this._sprite.frameBounds.width,this._sprite.frameBounds.height);
this._pointerData[pointer.id].isDown = true;
this._pointerData[pointer.id].isUp = false;
this._pointerData[pointer.id].timeDown = this.game.time.now;
@@ -309,13 +345,17 @@ module Phaser.Components {
this._sprite.events.onInputDown.dispatch(this._sprite, pointer);
// Start drag
if (this.draggable && this.isDragged == false && pointer.draggedObject == null)
//if (this.draggable && this.isDragged == false && pointer.targetObject == null)
if (this.draggable && this.isDragged == false)
{
this.startDrag(pointer);
}
}
// Consume the event?
return this.consumePointerEvent;
}
public _releasedHandler(pointer: Pointer) {
@@ -347,12 +387,12 @@ module Phaser.Components {
/**
* Updates the Pointer drag on this Sprite.
*/
private updateDrag(pointer: Pointer):void
private updateDrag(pointer: Pointer):bool
{
if (pointer.isUp)
{
this.stopDrag(pointer);
return;
return false;
}
if (this.allowHorizontalDrag)
@@ -380,6 +420,8 @@ module Phaser.Components {
this._sprite.x = Math.floor(this._sprite.x / this.snapX) * this.snapX;
this._sprite.y = Math.floor(this._sprite.y / this.snapY) * this.snapY;
}
return true;
}
/**
@@ -516,7 +558,7 @@ module Phaser.Components {
this._dragPoint.setTo(this._sprite.x - pointer.x, this._sprite.y - pointer.y);
}
pointer.draggedObject = this._sprite;
//pointer.draggedObject = this._sprite;
}
@@ -535,7 +577,7 @@ module Phaser.Components {
this._sprite.y = Math.floor(this._sprite.y / this.snapY) * this.snapY;
}
pointer.draggedObject = null;
//pointer.draggedObject = null;
}
/**