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

Merge branch 'dev' of https://github.com/photonstorm/phaser into dev

Browse Source
This commit is contained in:
jcs
2014-01-13 20:20:06 -08:00
parent ab02040bea 32f5a2fa36
commit 6cde583e82
9 changed files with 572 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Game.js
-1
View File
@@ -581,7 +581,6 @@ Phaser.Game.prototype = {
else
{
this.plugins.preUpdate();
this.physics.preUpdate();
this.world.preUpdate();
this.stage.update();
src/physics/arcade/ArcadePhysics.js
+25 -37
View File
@@ -34,6 +34,16 @@ Phaser.Physics.Arcade = function (game) {
*/
this.bounds = new Phaser.Rectangle(0, 0, game.world.width, game.world.height);
/**
* @property {number} OVERLAP_BIAS - A value added to the delta values during collision checks.
*/
this.OVERLAP_BIAS = 4;
/**
* @property {Phaser.QuadTree} quadTree - The world QuadTree.
*/
this.quadTree = new Phaser.QuadTree(this.game.world.bounds.x, this.game.world.bounds.y, this.game.world.bounds.width, this.game.world.bounds.height, this.maxObjects, this.maxLevels);
/**
* @property {number} maxObjects - Used by the QuadTree to set the maximum number of objects per quad.
*/
@@ -44,21 +54,6 @@ Phaser.Physics.Arcade = function (game) {
*/
this.maxLevels = 4;
/**
* @property {number} OVERLAP_BIAS - A value added to the delta values during collision checks.
*/
this.OVERLAP_BIAS = 4;
/**
* @property {Phaser.QuadTree} quadTree - The world QuadTree.
*/
this.quadTree = new Phaser.QuadTree(this, this.game.world.bounds.x, this.game.world.bounds.y, this.game.world.bounds.width, this.game.world.bounds.height, this.maxObjects, this.maxLevels);
/**
* @property {number} quadTreeID - The QuadTree ID.
*/
this.quadTreeID = 0;
// Avoid gc spikes by caching these values for re-use
/**
@@ -157,6 +152,17 @@ Phaser.Physics.Arcade = function (game) {
*/
this._dy = 0;
/**
* @property {number} _gravityX - Internal cache var.
* @private
*/
this._gravityX = 0;
/**
* @property {number} _gravityY - Internal cache var.
* @private
*/
this._gravityY = 0;
};
Phaser.Physics.Arcade.prototype = {
@@ -173,13 +179,13 @@ Phaser.Physics.Arcade.prototype = {
if (body.allowGravity)
{
this._gravityX = (this.gravity.x + body.gravity.x);
this._gravityY = (this.gravity.y + body.gravity.y);
this._gravityX = this.gravity.x + body.gravity.x;
this._gravityY = this.gravity.y + body.gravity.y;
}
else
{
this._gravityX = 0;
this._gravityY = 0;
this._gravityX = body.gravity.x;
this._gravityY = body.gravity.y;
}
// Rotation
@@ -223,24 +229,6 @@ Phaser.Physics.Arcade.prototype = {
},
/**
* Called automatically by the core game loop.
*
* @method Phaser.Physics.Arcade#preUpdate
* @protected
*/
preUpdate: function () {
},
/**
* Called automatically by the core game loop.
*
* @method Phaser.Physics.Arcade#postUpdate
* @protected
*/
postUpdate: function () {
},
/**
* Checks for overlaps between two game objects. The objects can be Sprites, Groups or Emitters.
* You can perform Sprite vs. Sprite, Sprite vs. Group and Group vs. Group overlap checks.