Skip to content

Commit 59e89fa

Browse files
committed
All Game Objects will now listen for ADDED_TO_SCENE and REMOVED_FROM_SCENE events and call the handlers. Therefore, removed GO specific implementations.
1 parent 519afd0 commit 59e89fa

9 files changed

Lines changed: 4 additions & 30 deletions

File tree

src/gameobjects/GameObject.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ var GameObject = new Class({
205205
*/
206206
this.ignoreDestroy = false;
207207

208+
this.on(Events.ADDED_TO_SCENE, this.addedToScene, this);
209+
this.on(Events.REMOVED_FROM_SCENE, this.removedFromScene, this);
210+
208211
// Tell the Scene to re-sort the children
209212
scene.sys.queueDepthSort();
210213
},
@@ -555,6 +558,7 @@ var GameObject = new Class({
555558
*/
556559
addedToScene: function ()
557560
{
561+
console.log('addedToScene', this);
558562
},
559563

560564
/**

src/gameobjects/domelement/DOMElement.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ var Class = require('../../utils/Class');
88
var Components = require('../components');
99
var DOMElementRender = require('./DOMElementRender');
1010
var GameObject = require('../GameObject');
11-
var GameObjectEvents = require('../events');
1211
var IsPlainObject = require('../../utils/object/IsPlainObject');
1312
var RemoveFromDOM = require('../../dom/RemoveFromDOM');
1413
var SCENE_EVENTS = require('../../scene/events');
@@ -291,9 +290,6 @@ var DOMElement = new Class({
291290

292291
scene.sys.events.on(SCENE_EVENTS.SLEEP, this.handleSceneEvent, this);
293292
scene.sys.events.on(SCENE_EVENTS.WAKE, this.handleSceneEvent, this);
294-
295-
this.on(GameObjectEvents.ADDED_TO_SCENE, this.addedToScene, this);
296-
this.on(GameObjectEvents.REMOVED_FROM_SCENE, this.removedFromScene, this);
297293
},
298294

299295
// Overrides Game Object method

src/gameobjects/extern/Extern.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
var Class = require('../../utils/Class');
88
var Components = require('../components');
99
var GameObject = require('../GameObject');
10-
var GameObjectEvents = require('../events');
1110
var ExternRender = require('./ExternRender');
1211

1312
/**
@@ -72,9 +71,6 @@ var Extern = new Class({
7271
function Extern (scene)
7372
{
7473
GameObject.call(this, scene, 'Extern');
75-
76-
this.on(GameObjectEvents.ADDED_TO_SCENE, this.addedToScene, this);
77-
this.on(GameObjectEvents.REMOVED_FROM_SCENE, this.removedFromScene, this);
7874
},
7975

8076
// Overrides Game Object method

src/gameobjects/group/Group.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,6 @@ var Group = new Class({
251251
{
252252
this.createMultiple(config);
253253
}
254-
255-
this.on(Events.ADDED_TO_SCENE, this.addedToScene, this);
256-
this.on(Events.REMOVED_FROM_SCENE, this.removedFromScene, this);
257254
},
258255

259256
// Overrides Game Object method

src/gameobjects/mesh/Mesh.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ var Components = require('../components');
99
var DegToRad = require('../../math/DegToRad');
1010
var Face = require('../../geom/mesh/Face');
1111
var GameObject = require('../GameObject');
12-
var GameObjectEvents = require('../events');
1312
var GenerateVerts = require('../../geom/mesh/GenerateVerts');
1413
var GenerateObjVerts = require('../../geom/mesh/GenerateObjVerts');
1514
var GetCalcMatrix = require('../GetCalcMatrix');
@@ -357,9 +356,6 @@ var Mesh = new Class({
357356
{
358357
this.addVertices(vertices, uvs, indicies, containsZ, normals, colors, alphas);
359358
}
360-
361-
this.on(GameObjectEvents.ADDED_TO_SCENE, this.addedToScene, this);
362-
this.on(GameObjectEvents.REMOVED_FROM_SCENE, this.removedFromScene, this);
363359
},
364360

365361
// Overrides Game Object method

src/gameobjects/particles/ParticleEmitterManager.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
var Class = require('../../utils/Class');
88
var Components = require('../components');
99
var GameObject = require('../GameObject');
10-
var GameObjectEvents = require('../events');
1110
var GravityWell = require('./GravityWell');
1211
var List = require('../../structs/List');
1312
var ParticleEmitter = require('./ParticleEmitter');
@@ -148,9 +147,6 @@ var ParticleEmitterManager = new Class({
148147
this.createEmitter(emitters[i]);
149148
}
150149
}
151-
152-
this.on(GameObjectEvents.ADDED_TO_SCENE, this.addedToScene, this);
153-
this.on(GameObjectEvents.REMOVED_FROM_SCENE, this.removedFromScene, this);
154150
},
155151

156152
// Overrides Game Object method

src/gameobjects/rope/Rope.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ var AnimationState = require('../../animations/AnimationState');
88
var Class = require('../../utils/Class');
99
var Components = require('../components');
1010
var GameObject = require('../GameObject');
11-
var GameObjectEvents = require('../events');
1211
var PIPELINE_CONST = require('../../renderer/webgl/pipelines/const');
1312
var RopeRender = require('./RopeRender');
1413
var Vector2 = require('../../math/Vector2');
@@ -285,9 +284,6 @@ var Rope = new Class({
285284
this.setPoints(points, colors, alphas);
286285

287286
this.updateVertices();
288-
289-
this.on(GameObjectEvents.ADDED_TO_SCENE, this.addedToScene, this);
290-
this.on(GameObjectEvents.REMOVED_FROM_SCENE, this.removedFromScene, this);
291287
},
292288

293289
// Overrides Game Object method

src/gameobjects/sprite/Sprite.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ var AnimationState = require('../../animations/AnimationState');
88
var Class = require('../../utils/Class');
99
var Components = require('../components');
1010
var GameObject = require('../GameObject');
11-
var GameObjectEvents = require('../events');
1211
var SpriteRender = require('./SpriteRender');
1312

1413
/**
@@ -106,9 +105,6 @@ var Sprite = new Class({
106105
this.setSizeToFrame();
107106
this.setOriginFromFrame();
108107
this.initPipeline();
109-
110-
this.on(GameObjectEvents.ADDED_TO_SCENE, this.addedToScene, this);
111-
this.on(GameObjectEvents.REMOVED_FROM_SCENE, this.removedFromScene, this);
112108
},
113109

114110
// Overrides Game Object method

src/gameobjects/video/Video.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,6 @@ var Video = new Class({
396396
{
397397
sound.on(SoundEvents.GLOBAL_MUTE, this.globalMute, this);
398398
}
399-
400-
this.on(Events.ADDED_TO_SCENE, this.addedToScene, this);
401-
this.on(Events.REMOVED_FROM_SCENE, this.removedFromScene, this);
402399
},
403400

404401
// Overrides Game Object method

0 commit comments

Comments
 (0)