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

Animation and Input related fixes

Browse Source
This commit is contained in:
Richard Davey
2013-08-16 00:14:57 +01:00
parent 619b8415ed
commit f76ba6840f
10 changed files with 103 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/phaser-debug.js
+21 -10
View File
@@ -5088,7 +5088,7 @@ var Phaser;
if(this.enabled == false || this._parent.visible == false) {
return false;
} else {
return Phaser.SpriteUtils.overlapsXY(this._parent, pointer.worldX, pointer.worldY);
return Phaser.SpriteUtils.overlapsPointer(this._parent, pointer);
}
};
InputHandler.prototype.update = function (pointer) {
@@ -5099,7 +5099,7 @@ var Phaser;
if(this.draggable && this._draggedPointerID == pointer.id) {
return this.updateDrag(pointer);
} else if(this._pointerData[pointer.id].isOver == true) {
if(Phaser.SpriteUtils.overlapsXY(this._parent, pointer.worldX, pointer.worldY)) {
if(Phaser.SpriteUtils.overlapsPointer(this._parent, pointer)) {
this._pointerData[pointer.id].x = pointer.x - this._parent.x;
this._pointerData[pointer.id].y = pointer.y - this._parent.y;
return true;
@@ -5152,7 +5152,7 @@ var Phaser;
this._pointerData[pointer.id].isUp = true;
this._pointerData[pointer.id].timeUp = this.game.time.now;
this._pointerData[pointer.id].downDuration = this._pointerData[pointer.id].timeUp - this._pointerData[pointer.id].timeDown;
if(Phaser.SpriteUtils.overlapsXY(this._parent, pointer.worldX, pointer.worldY)) {
if(Phaser.SpriteUtils.overlapsPointer(this._parent, pointer)) {
this._parent.events.onInputUp.dispatch(this._parent, pointer);
} else {
if(this.useHandCursor) {
@@ -6929,11 +6929,14 @@ var Phaser;
});
Animation.prototype.play = function (frameRate, loop) {
if (typeof frameRate === "undefined") { frameRate = null; }
if (typeof loop === "undefined") { loop = false; }
if (typeof loop === "undefined") { loop = null; }
if(frameRate !== null) {
this.delay = 1000 / frameRate;
}
this.looped = loop;
if(loop !== null) {
console.log('play loop override', loop);
this.looped = loop;
}
this.isPlaying = true;
this.isFinished = false;
this._timeLastFrame = this.game.time.now;
@@ -6963,7 +6966,9 @@ var Phaser;
this._frameIndex = 0;
this.currentFrame = this._frameData.getFrame(this._frames[this._frameIndex]);
this._parent.events.onAnimationLoop.dispatch(this._parent, this);
console.log('anim loop core');
} else {
console.log('anim complete core');
this.onComplete();
}
} else {
@@ -10693,7 +10698,6 @@ var Phaser;
this.worldView = new Phaser.Rectangle(x, y, this.width, this.height);
this.cameraView = new Phaser.Rectangle(x, y, this.width, this.height);
this.transform.setCache();
this.body = new Phaser.Physics.Body(this, 0);
this.outOfBounds = false;
this.outOfBoundsAction = Phaser.Types.OUT_OF_BOUNDS_PERSIST;
this.scale = this.transform.scale;
@@ -10791,7 +10795,6 @@ var Phaser;
Sprite.prototype.postUpdate = function () {
this.animations.update();
this.checkBounds();
this.transform.centerOn(this.body.aabb.pos.x, this.body.aabb.pos.y);
if(this.modified == true && this.transform.scale.equals(1) && this.transform.skew.equals(0) && this.transform.rotation == 0 && this.transform.rotationOffset == 0 && this.texture.flippedX == false && this.texture.flippedY == false) {
this.modified = false;
}
@@ -11940,10 +11943,18 @@ var Phaser;
out.push(new Phaser.Point(sprite.x, sprite.y + sprite.height));
return out;
};
SpriteUtils.overlapsXY = function overlapsXY(sprite, x, y) {
if(sprite.transform.rotation == 0) {
return Phaser.RectangleUtils.contains(sprite.worldView, x, y);
SpriteUtils.overlapsPointer = function overlapsPointer(sprite, pointer) {
if(sprite.transform.scrollFactor.equals(1)) {
return Phaser.SpriteUtils.overlapsXY(sprite, pointer.worldX, pointer.worldY);
} else if(sprite.transform.scrollFactor.equals(0)) {
return Phaser.SpriteUtils.overlapsXY(sprite, pointer.x, pointer.y);
} else {
var px = pointer.worldX * sprite.transform.scrollFactor.x;
var py = pointer.worldY * sprite.transform.scrollFactor.y;
return Phaser.SpriteUtils.overlapsXY(sprite, px, py);
}
};
SpriteUtils.overlapsXY = function overlapsXY(sprite, x, y) {
if((x - sprite.transform.upperLeft.x) * (sprite.transform.upperRight.x - sprite.transform.upperLeft.x) + (y - sprite.transform.upperLeft.y) * (sprite.transform.upperRight.y - sprite.transform.upperLeft.y) < 0) {
return false;
}