* Fixed issue 135 - Added typeof checks into most ArcadePhysics functions to avoid errors with zero values.

* Fixed issue 136 - distanceTo using worldX/Y instead of x/y.
This commit is contained in:
photonstorm
2013-10-28 10:17:36 +00:00
parent ea651113df
commit a814cc26cc
12 changed files with 79 additions and 41 deletions
+10 -2
View File
@@ -364,8 +364,16 @@ Phaser.Sprite.prototype.preUpdate = function() {
this.renderOrderID = this.game.world.currentRenderOrderID++;
}
this.prevX = this.x;
this.prevY = this.y;
if (this.fixedToCamera)
{
this.prevX = this.game.camera.view.x + this.x;
this.prevY = this.game.camera.view.y + this.y;
}
else
{
this.prevX = this.x;
this.prevY = this.y;
}
this.updateCache();
this.updateAnimation();
+36 -30
View File
@@ -404,28 +404,25 @@ Phaser.Physics.Arcade.prototype = {
this._mapData = tilemapLayer.getTiles(sprite.body.x, sprite.body.y, sprite.body.width, sprite.body.height, true);
if (this._mapData.length > 1)
// console.log('getTiles', this._tx, this._ty);
if (this.game.input.keyboard.isDown(Phaser.Keyboard.SHIFT))
{
for (var i = 1; i < this._mapData.length; i++)
console.log('cst', this._mapData, sprite.body.x, sprite.body.y);
}
if (this._mapData.length == 0)
{
return;
}
for (var i = 0; i < this._mapData.length; i++)
{
if (this.separateTile(sprite.body, this._mapData[i]))
{
this.separateTile(sprite.body, this._mapData[i]);
if (this._result)
// They collided, is there a custom process callback?
if (processCallback)
{
// They collided, is there a custom process callback?
if (processCallback)
{
if (processCallback.call(callbackContext, sprite, this._mapData[i]))
{
this._total++;
if (collideCallback)
{
collideCallback.call(callbackContext, sprite, this._mapData[i]);
}
}
}
else
if (processCallback.call(callbackContext, sprite, this._mapData[i]))
{
this._total++;
@@ -435,6 +432,15 @@ Phaser.Physics.Arcade.prototype = {
}
}
}
else
{
this._total++;
if (collideCallback)
{
collideCallback.call(callbackContext, sprite, this._mapData[i]);
}
}
}
}
@@ -1025,8 +1031,8 @@ Phaser.Physics.Arcade.prototype = {
*/
moveToObject: function (displayObject, destination, speed, maxTime) {
speed = speed || 60;
maxTime = maxTime || 0;
if (typeof speed === 'undefined') { speed = 60; }
if (typeof maxTime === 'undefined') { maxTime = 0; }
this._angle = Math.atan2(destination.y - displayObject.y, destination.x - displayObject.x);
@@ -1059,9 +1065,9 @@ Phaser.Physics.Arcade.prototype = {
*/
moveToPointer: function (displayObject, speed, pointer, maxTime) {
speed = speed || 60;
if (typeof speed === 'undefined') { speed = 60; }
pointer = pointer || this.game.input.activePointer;
maxTime = maxTime || 0;
if (typeof maxTime === 'undefined') { maxTime = 0; }
this._angle = this.angleToPointer(displayObject, pointer);
@@ -1096,8 +1102,8 @@ Phaser.Physics.Arcade.prototype = {
*/
moveToXY: function (displayObject, x, y, speed, maxTime) {
speed = speed || 60;
maxTime = maxTime || 0;
if (typeof speed === 'undefined') { speed = 60; }
if (typeof maxTime === 'undefined') { maxTime = 0; }
this._angle = Math.atan2(y - displayObject.y, x - displayObject.x);
@@ -1126,7 +1132,7 @@ Phaser.Physics.Arcade.prototype = {
*/
velocityFromAngle: function (angle, speed, point) {
speed = speed || 60;
if (typeof speed === 'undefined') { speed = 60; }
point = point || new Phaser.Point;
return point.setTo((Math.cos(this.game.math.degToRad(angle)) * speed), (Math.sin(this.game.math.degToRad(angle)) * speed));
@@ -1145,7 +1151,7 @@ Phaser.Physics.Arcade.prototype = {
*/
velocityFromRotation: function (rotation, speed, point) {
speed = speed || 60;
if (typeof speed === 'undefined') { speed = 60; }
point = point || new Phaser.Point;
return point.setTo((Math.cos(rotation) * speed), (Math.sin(rotation) * speed));
@@ -1164,7 +1170,7 @@ Phaser.Physics.Arcade.prototype = {
*/
accelerationFromRotation: function (rotation, speed, point) {
speed = speed || 60;
if (typeof speed === 'undefined') { speed = 60; }
point = point || new Phaser.Point;
return point.setTo((Math.cos(rotation) * speed), (Math.sin(rotation) * speed));
@@ -1311,8 +1317,8 @@ Phaser.Physics.Arcade.prototype = {
pointer = pointer || this.game.input.activePointer;
this._dx = displayObject.worldX - pointer.x;
this._dy = displayObject.worldY - pointer.y;
this._dx = displayObject.x - pointer.x;
this._dy = displayObject.y - pointer.y;
return Math.sqrt(this._dx * this._dx + this._dy * this._dy);
+2
View File
@@ -350,6 +350,8 @@ Phaser.Physics.Arcade.Body.prototype = {
this.embedded = false;
this.screenX = (this.sprite.worldTransform[2] - (this.sprite.anchor.x * this.width)) + this.offset.x;
this.screenY = (this.sprite.worldTransform[5] - (this.sprite.anchor.y * this.height)) + this.offset.y;
+5 -2
View File
@@ -311,10 +311,13 @@ Phaser.TilemapLayer.prototype.getTiles = function (x, y, width, height, collides
this._tw = (this.game.math.snapToCeil(width, tileWidth) + tileWidth) / tileWidth;
this._th = (this.game.math.snapToCeil(height, tileHeight) + tileHeight) / tileHeight;
this._results.length = 0;
// This should apply the layer x/y here
// this._results.length = 0;
this._results = [];
// pretty sure we don't use this any more?
this._results.push( { x: x, y: y, width: width, height: height, tx: this._tx, ty: this._ty, tw: this._tw, th: this._th });
// this._results.push( { x: x, y: y, width: width, height: height, tx: this._tx, ty: this._ty, tw: this._tw, th: this._th });
var _index = 0;
var _tile = null;
+2
View File
@@ -559,6 +559,8 @@ Phaser.Utils.Debug.prototype = {
this.line(sprite.name);
this.line('x: ' + sprite.x);
this.line('y: ' + sprite.y);
this.line('pos x: ' + sprite.position.x);
this.line('pos y: ' + sprite.position.y);
this.line('local x: ' + sprite.localTransform[2]);
this.line('local y: ' + sprite.localTransform[5]);
this.line('world x: ' + sprite.worldTransform[2]);