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

Group now extends PIXI.DisplayObjectContainer, rather than owning a _container property, which makes life a whole lot easier re: nesting.

Browse Source
This commit is contained in:
photonstorm
2014-02-06 02:31:36 +00:00
parent 9737710200
commit 4cfce8b4d2
89 changed files with 1176 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Group.js
+1042 -1387
View File
File diff suppressed because it is too large Load Diff
src/core/World.js
+16 -71
View File
@@ -54,38 +54,28 @@ Phaser.World.prototype.boot = function () {
this.camera = new Phaser.Camera(this.game, 0, 0, 0, this.game.width, this.game.height);
this.camera.displayObject = this._container;
this.camera.displayObject = this;
this.game.camera = this.camera;
this.game.stage._stage.addChild(this);
}
/**
* This is called automatically after the plugins preUpdate and before the State.update.
* Most objects have preUpdate methods and it's where initial movement, drawing and calculations are done.
*
* @method Phaser.World#update
* @method Phaser.World#preUpdate
*/
Phaser.World.prototype.preUpdate = function () {
if (this.game.stage._stage.first._iNext)
for (var i = 0, len = this.children.length; i < len; i++)
{
var currentNode = this.game.stage._stage.first._iNext;
do
if (this.children[i]['preUpdate'])
{
// If preUpdate exists, and it returns false, skip PIXI child objects
if (currentNode['preUpdate'] && !currentNode.preUpdate())
{
currentNode = currentNode.last._iNext;
}
else
{
currentNode = currentNode._iNext;
}
this.children[i].preUpdate();
}
while (currentNode != this.game.stage._stage.last._iNext)
}
}
@@ -98,26 +88,12 @@ Phaser.World.prototype.preUpdate = function () {
*/
Phaser.World.prototype.update = function () {
this.currentRenderOrderID = 0;
if (this.game.stage._stage.first._iNext)
for (var i = 0, len = this.children.length; i < len; i++)
{
var currentNode = this.game.stage._stage.first._iNext;
do
if (this.children[i]['update'])
{
// If update exists, and it returns false, skip PIXI child objects
if (currentNode['update'] && !currentNode.update())
{
currentNode = currentNode.last._iNext;
}
else
{
currentNode = currentNode._iNext;
}
this.children[i].update();
}
while (currentNode != this.game.stage._stage.last._iNext)
}
}
@@ -138,40 +114,24 @@ Phaser.World.prototype.postUpdate = function () {
this.camera.update();
if (this.game.stage._stage.first._iNext)
for (var i = 0, len = this.children.length; i < len; i++)
{
var currentNode = this.game.stage._stage.first._iNext;
do
if (this.children[i]['postUpdate'])
{
if (currentNode['postUpdate'] && currentNode !== this.camera.target)
{
currentNode.postUpdate();
}
currentNode = currentNode._iNext;
this.children[i].postUpdate();
}
while (currentNode != this.game.stage._stage.last._iNext)
}
}
else
{
this.camera.update();
if (this.game.stage._stage.first._iNext)
for (var i = 0, len = this.children.length; i < len; i++)
{
var currentNode = this.game.stage._stage.first._iNext;
do
if (this.children[i]['postUpdate'])
{
if (currentNode['postUpdate'])
{
currentNode.postUpdate();
}
currentNode = currentNode._iNext;
this.children[i].postUpdate();
}
while (currentNode != this.game.stage._stage.last._iNext)
}
}
@@ -327,18 +287,3 @@ Object.defineProperty(Phaser.World.prototype, "randomY", {
});
/**
* @name Phaser.World#visible
* @property {boolean} visible - Gets or sets the visible state of the World.
*/
Object.defineProperty(Phaser.World.prototype, "visible", {
get: function () {
return this._container.visible;
},
set: function (value) {
this._container.visible = value;
}
});