Groups can now be added to other Groups as children via group.add() and group.addAt().

Groups now have an 'alive' property, which can be useful when iterating through child groups with functions like forEachAlive.
This commit is contained in:
photonstorm 2014-01-06 01:39:23 +00:00
parent aa3a86df6e
commit 428e331a11
6 changed files with 209 additions and 49 deletions

View file

@ -77,6 +77,8 @@ New features:
* Buttons now properly use their upFrame if set. * Buttons now properly use their upFrame if set.
* InputHandler now has snapOffsetX and snapOffsetY properties so your snap grid doesn't have to be 0,0 aligned (thanks srmeier) * InputHandler now has snapOffsetX and snapOffsetY properties so your snap grid doesn't have to be 0,0 aligned (thanks srmeier)
* Loader.progressFloat contains the actual non-rounded progress value, where-as Loader.progress contains a rounded value. Use progressFloat if you've > 100 files to load. * Loader.progressFloat contains the actual non-rounded progress value, where-as Loader.progress contains a rounded value. Use progressFloat if you've > 100 files to load.
* Groups can now be added to other Groups as children via group.add() and group.addAt()
* Groups now have an 'alive' property, which can be useful when iterating through child groups with functions like forEachAlive.
New Examples: New Examples:
@ -99,6 +101,7 @@ New Examples:
* Animation - Group Creation, showing how to create animations across all Group children in one call. * Animation - Group Creation, showing how to create animations across all Group children in one call.
* Particles - Rain by Jens Anders Bakke. * Particles - Rain by Jens Anders Bakke.
* Particles - Snow by Jens Anders Bakke. * Particles - Snow by Jens Anders Bakke.
* Groups - Nested Groups - showing how to embed one Group into another Group.
Updates: Updates:

View file

@ -1,9 +1,7 @@
window.onload = function() { // Here is a custom group
// It will automatically create 30 sprites of the given image when created.
// Here is a custom group MonsterGroup = function (game, image, action) {
// It will automatically create 30 sprites of the given image when created.
MonsterGroup = function (game, image, action) {
Phaser.Group.call(this, game); Phaser.Group.call(this, game);
@ -22,28 +20,26 @@ window.onload = function() {
} }
}; };
MonsterGroup.prototype = Object.create(Phaser.Group.prototype); MonsterGroup.prototype = Object.create(Phaser.Group.prototype);
MonsterGroup.prototype.constructor = MonsterGroup; MonsterGroup.prototype.constructor = MonsterGroup;
var game = new Phaser.Game(800, 600, Phaser.CANVAS, 'phaser-example', { preload: preload, create: create }); var game = new Phaser.Game(800, 600, Phaser.CANVAS, 'phaser-example', { preload: preload, create: create });
var customGroup1; var customGroup1;
var customGroup2; var customGroup2;
function preload() { function preload() {
game.load.image('ufo', 'assets/sprites/ufo.png'); game.load.image('ufo', 'assets/sprites/ufo.png');
game.load.image('baddie', 'assets/sprites/space-baddie.png'); game.load.image('baddie', 'assets/sprites/space-baddie.png');
} }
function create() { function create() {
customGroup1 = new MonsterGroup(game, 'ufo', 'bounce'); customGroup1 = new MonsterGroup(game, 'ufo', 'bounce');
customGroup2 = new MonsterGroup(game, 'baddie', 'slide'); customGroup2 = new MonsterGroup(game, 'baddie', 'slide');
} }
}();

View file

@ -0,0 +1,40 @@
var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update });
function preload() {
game.load.image('ball', 'assets/sprites/pangball.png');
game.load.image('arrow', 'assets/sprites/asteroids_ship.png');
}
var ballsGroup;
var shipsGroup;
function create() {
ballsGroup = game.add.group();
shipsGroup = game.add.group();
for (var i = 0; i < 20; i++)
{
// Create some randomly placed sprites in both Groups
ballsGroup.create(game.rnd.integerInRange(0, 128), game.world.randomY, 'ball');
shipsGroup.create(game.rnd.integerInRange(0, 128), game.world.randomY, 'arrow');
}
// Now make the ships group a child of the balls group - so anything that happens to the balls group
// will happen to the ships group too
ballsGroup.add(shipsGroup);
}
function update() {
ballsGroup.x += 0.1;
// Because shipsGroup is a child of ballsGroup it has already been moved 0.1px by the line above
// So the following line of code will make it appear to move twice as fast as ballsGroup
shipsGroup.x += 0.1;
}

View file

@ -0,0 +1,47 @@
// Here is a custom group with a property 'key'
// This isn't required, it's just an example of a custom group level property. Only 'game' is required.
MonsterGroup = function (game, key) {
Phaser.Group.call(this, game);
this.key = key;
};
MonsterGroup.prototype = Object.create(Phaser.Group.prototype);
MonsterGroup.prototype.constructor = MonsterGroup;
/**
* Generate some monsters on request, all spaced out evenly
*/
MonsterGroup.prototype.make = function(qty, x, y) {
for (var i = 0; i < qty; i++)
{
this.create(x, y, this.key);
x += 64;
}
}
// Boilerplate code below
var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create });
function preload() {
game.load.image('bunny', 'assets/sprites/bunny.png');
game.load.image('ball', 'assets/sprites/shinyball.png');
}
function create() {
var monsters = new MonsterGroup(game, 'bunny');
var balls = new MonsterGroup(game, 'ball');
monsters.make(6, 100, 100);
balls.make(10, 64, 500);
}

View file

@ -0,0 +1,41 @@
var game = new Phaser.Game(800, 600, Phaser.AUTO, 'phaser-example', { preload: preload, create: create, update: update });
function preload() {
game.load.image('ball', 'assets/sprites/pangball.png');
game.load.image('arrow', 'assets/sprites/asteroids_ship.png');
}
var ballsGroup;
var shipsGroup;
function create() {
ballsGroup = game.add.group();
shipsGroup = game.add.group();
for (var i = 0; i < 20; i++)
{
// Create some randomly placed sprites in both Groups
ballsGroup.create(game.rnd.integerInRange(0, 128), game.world.randomY, 'ball');
shipsGroup.create(game.rnd.integerInRange(0, 128), game.world.randomY, 'arrow');
}
// Now make the ships group a child of the balls group - so anything that happens to the balls group
// will happen to the ships group too
ballsGroup.add(shipsGroup);
}
function update() {
ballsGroup.x += 0.1;
// Because shipsGroup is a child of ballsGroup it has already been moved 0.1px by the line above
// So the following line of code will make it appear to move twice as fast as ballsGroup
shipsGroup.x += 0.1;
}

View file

@ -71,12 +71,23 @@ Phaser.Group = function (game, parent, name, useStage) {
*/ */
this.type = Phaser.GROUP; this.type = Phaser.GROUP;
/**
* @property {boolean} alive - The alive property is useful for Groups that are children of other Groups and need to be included/excluded in checks like forEachAlive.
* @default
*/
this.alive = true;
/** /**
* @property {boolean} exists - If exists is true the the Group is updated, otherwise it is skipped. * @property {boolean} exists - If exists is true the the Group is updated, otherwise it is skipped.
* @default * @default
*/ */
this.exists = true; this.exists = true;
/**
* @property {Phaser.Group} group - The parent Group of this Group, if a child of another.
*/
this.group = null;
// Replaces the PIXI.Point with a slightly more flexible one. // Replaces the PIXI.Point with a slightly more flexible one.
this._container.scale = new Phaser.Point(1, 1); this._container.scale = new Phaser.Point(1, 1);
@ -140,6 +151,16 @@ Phaser.Group.prototype = {
add: function (child) { add: function (child) {
if (child.group !== this) if (child.group !== this)
{
if (child.type && child.type === Phaser.GROUP)
{
child.group = this;
this._container.addChild(child._container);
child._container.updateTransform();
}
else
{ {
child.group = this; child.group = this;
@ -151,6 +172,7 @@ Phaser.Group.prototype = {
this._container.addChild(child); this._container.addChild(child);
child.updateTransform(); child.updateTransform();
}
if (this.cursor === null) if (this.cursor === null)
{ {
@ -174,6 +196,16 @@ Phaser.Group.prototype = {
addAt: function (child, index) { addAt: function (child, index) {
if (child.group !== this) if (child.group !== this)
{
if (child.type && child.type === Phaser.GROUP)
{
child.group = this;
this._container.addChildAt(child._container, index);
child._container.updateTransform();
}
else
{ {
child.group = this; child.group = this;
@ -185,6 +217,7 @@ Phaser.Group.prototype = {
this._container.addChildAt(child, index); this._container.addChildAt(child, index);
child.updateTransform(); child.updateTransform();
}
if (this.cursor === null) if (this.cursor === null)
{ {