Renamed Phaser.Physics.P2 const to Phaser.Physics.P2JS to avoid issue phaserjs#540

Author: photonstorm

examples/groups/depth sort.js

@@ -22,9 +22,9 @@ var locs = [];
 function create() {
 
     //  Create our tilemap to walk around
-    map = game.add.tilemap('desert');
-    map.addTilesetImage('ground_1x1');
-    layer = map.createLayer('Tile Layer 1');
+    // map = game.add.tilemap('desert');
+    // map.addTilesetImage('ground_1x1');
+    // layer = map.createLayer('Tile Layer 1');
 
     //  This group will hold the main player + all the tree sprites to depth sort against
     group = game.add.group();
@@ -35,12 +35,21 @@ function create() {
         createUniqueLocation();
     }
 
+    sprite = group.create(300, 32, 'phaser');
+
     //  The player
-    sprite = group.create(300, 200, 'phaser');
+    // group.create(128, 0, 'trees', game.rnd.integerInRange(0, 7));
+    // group.create(64, 0, 'trees', game.rnd.integerInRange(0, 7));
+    // group.create(256, 0, 'trees', game.rnd.integerInRange(0, 7));
+
+    // group.create(128, 32, 'trees', game.rnd.integerInRange(0, 7));
+    // group.create(64, 32, 'trees', game.rnd.integerInRange(0, 7));
+    // group.create(256, 32, 'trees', game.rnd.integerInRange(0, 7));
+
 
-    group.sort();
+    // group.sort();
 
-    dump();
+    // dump();
 
     // group.children[0].alpha = 0.2;
     // group.children[100].alpha = 0.2;
@@ -112,5 +121,6 @@ function update() {
 function render() {
 
     game.debug.text(sprite.y, 32, 32);
+    game.debug.text(group.getIndex(sprite), 32, 64);
 
 }

src/core/Group.js

@@ -1017,11 +1017,21 @@ Phaser.Group.prototype.forEachDead = function (callback, callbackContext) {
 */
 Phaser.Group.prototype.sort = function (index, order) {
 
+    if (this.children.length < 2)
+    {
+        //  Nothing to swap
+        return;
+    }
+
     if (typeof index === 'undefined') { index = 'y'; }
     if (typeof order === 'undefined') { order = Phaser.Group.SORT_ASCENDING; }
 
     this._sortProperty = index;
 
+        this.children.sort(this.ascendingSortHandler.bind(this));
+
+
+    /*
     if (order === Phaser.Group.SORT_ASCENDING)
     {
         this.children.sort(this.ascendingSortHandler.bind(this));
@@ -1030,6 +1040,7 @@ Phaser.Group.prototype.sort = function (index, order) {
     {
         this.children.sort(this.descendingSortHandler.bind(this));
     }
+    */
 
 }
 
@@ -1042,19 +1053,18 @@ Phaser.Group.prototype.sort = function (index, order) {
 */
 Phaser.Group.prototype.ascendingSortHandler = function (a, b) {
 
-    if (a[this._sortProperty] && b[this._sortProperty])
+    if (a[this._sortProperty] < b[this._sortProperty] && this.getIndex(a) > this.getIndex(b))
     {
-        if (a[this._sortProperty] < b[this._sortProperty])
-        {
-            return -1;
-        }
-        else if (a[this._sortProperty] > b[this._sortProperty])
-        {
-            return 1;
-        }
+        return -1;
+    }
+    else if (a[this._sortProperty] > b[this._sortProperty] && this.getIndex(a) < this.getIndex(b))
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
     }
-
-    return 0;
 
 }
 

src/physics/Physics.js

@@ -67,7 +67,7 @@ Phaser.Physics.ARCADE = 0;
 * @const
 * @type {number}
 */
-Phaser.Physics.P2 = 1;
+Phaser.Physics.P2JS = 1;
 
 /**
 * @const
@@ -93,7 +93,7 @@ Phaser.Physics.prototype = {
     * This will create an instance of the requested physics simulation.
     * Phaser.Physics.Arcade is running by default, but all others need activating directly.
     * You can start the following physics systems:
-    * Phaser.Physics.P2 - A full-body advanced physics system by Stefan Hedman.
+    * Phaser.Physics.P2JS - A full-body advanced physics system by Stefan Hedman.
     * Phaser.Physics.NINJA - A port of Metanet Softwares N+ physics system.
     * Phaser.Physics.BOX2D and Phaser.Physics.CHIPMUNK are still in development.
     *
@@ -106,7 +106,7 @@ Phaser.Physics.prototype = {
         {
             this.arcade = new Phaser.Physics.Arcade(this.game);
         }
-        else if (system === Phaser.Physics.P2 && this.p2 === null)
+        else if (system === Phaser.Physics.P2JS && this.p2 === null)
         {
             this.p2 = new Phaser.Physics.P2(this.game, this.config);
         }
@@ -131,7 +131,7 @@ Phaser.Physics.prototype = {
     * It can be for any of the physics systems that have been started:
     *
     * Phaser.Physics.Arcade - A light weight AABB based collision system with basic separation.
-    * Phaser.Physics.P2 - A full-body advanced physics system supporting multiple object shapes, polygon loading, contact materials, springs and constraints.
+    * Phaser.Physics.P2JS - A full-body advanced physics system supporting multiple object shapes, polygon loading, contact materials, springs and constraints.
     * Phaser.Physics.NINJA - A port of Metanet Softwares N+ physics system. Advanced AABB and Circle vs. Tile collision.
     * Phaser.Physics.BOX2D and Phaser.Physics.CHIPMUNK are still in development.
     *
@@ -171,7 +171,7 @@ Phaser.Physics.prototype = {
                     {
                         object[i].body = new Phaser.Physics.Arcade.Body(object[i]);
                     }
-                    else if (system === Phaser.Physics.P2)
+                    else if (system === Phaser.Physics.P2JS)
                     {
                         object[i].body = new Phaser.Physics.P2.Body(this.game, object[i], object[i].x, object[i].y, 1);
                         object[i].body.debug = debug