On destroy unsubscribe missing GameObjects from render event

fixes #71
This commit is contained in:
logsol 2016-10-01 16:44:40 +02:00
parent 8b8093b771
commit 8641a2dc0b
4 changed files with 36 additions and 21 deletions

View file

@ -177,25 +177,36 @@ function (Parent, PhysicsEngine, Settings, requestAnimFrame, Nc, Box2D, Player,
return spawnedPlayers;
};
GameController.prototype.getRuntimeItems = function() {
var objects = [];
GameController.prototype._getRuntimeItems = function() {
// This is using the level.createItem mechanism to
// create the RubeDoll from its ItemSettings
var runtimeItems = [];
for (var uid in this.worldUpdateObjects) {
if(this.worldUpdateObjects[uid] instanceof RubeDoll) {
var object = this.worldUpdateObjects[uid];
var options = object.options;
options.x = object.getPosition().x;
options.y = object.getPosition().y;
objects.push({
uid: object.uid,
options: object.options
});
runtimeItems.push(object);
}
}
return runtimeItems;
};
return objects;
GameController.prototype.gatherRuntimeItemsForWorldUpdate = function() {
var infos = [];
var runtimeItems = this._getRuntimeItems();
// On the other side this is using the level.createItem mechanism to
// create the RubeDoll from its ItemSettings
for (var i = 0; i < runtimeItems.length; i++) {
var object = runtimeItems[i];
var options = object.options;
options.x = object.getPosition().x;
options.y = object.getPosition().y;
infos.push({
uid: object.uid,
options: object.options
});
}
return infos;
};
GameController.prototype.onClientReady = function(userId) {
@ -204,7 +215,7 @@ function (Parent, PhysicsEngine, Settings, requestAnimFrame, Nc, Box2D, Player,
var options = {
spawnedPlayers: this.getSpawnedPlayersAndTheirPositions(),
worldUpdate: this.getWorldUpdateObject(true),
runtimeItems: this.getRuntimeItems(),
runtimeItems: this.gatherRuntimeItemsForWorldUpdate(),
userId: userId
};
@ -241,6 +252,11 @@ function (Parent, PhysicsEngine, Settings, requestAnimFrame, Nc, Box2D, Player,
clearTimeout(this.spawnTimeouts[i]);
};
var runtimeItems = this._getRuntimeItems();
for (var i = 0; i < runtimeItems.length; i++) {
runtimeItems[i].destroy();
}
Parent.prototype.destroy.call(this);
};

View file

@ -13,7 +13,9 @@ function (Parent, Settings, Nc, Layer) {
this.layerId = Layer.ID.ITEM;
Parent.call(this, physicsEngine, uid, options);
Nc.on(Nc.ns.client.game.events.render, this.render, this);
this.ncTokens = this.ncTokens.concat([
Nc.on(Nc.ns.client.game.events.render, this.render, this)
]);
}
Item.prototype = Object.create(Parent.prototype);

View file

@ -16,7 +16,9 @@ function (Parent, Nc, Settings) {
this.healthBarViewVisible = false;
this.initHealthBar();
Nc.on(Nc.ns.client.game.events.render, this.render, this);
this.ncTokens = [
Nc.on(Nc.ns.client.game.events.render, this.render, this)
];
}
Player.prototype = Object.create(Parent.prototype);
@ -109,6 +111,7 @@ function (Parent, Nc, Settings) {
Player.prototype.destroy = function() {
clearTimeout(this.healthBarViewVisibleTimeout);
Nc.trigger(Nc.ns.client.view.healthBar.remove, this.healthBarView);
Nc.off(this.ncTokens);
Parent.prototype.destroy.call(this);
};