Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

added cleanup before delete

Browse source
This commit is contained in:
AlessandroSigna 2015-11-13 15:03:36 -08:00
parent c8349dda6e
commit 5b66416b8c
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
examples/entityScripts/synchronizerEntityScript.js
View file

@ -24,16 +24,7 @@
var isJoiningTheEvent = false; var isJoiningTheEvent = false;
var _this; var _this;
function update(){
var userData = JSON.parse(Entities.getEntityProperties(_this.entityID, ["userData"]).userData);
var valueToCheck = userData.myKey.valueToCheck;
if(valueToCheck && !isJoiningTheEvent){
_this.sendMessage();
}else if((!valueToCheck && isJoiningTheEvent) || (isJoiningTheEvent && !insideArea)){
_this.stopMessage();
}
}
function ParamsEntity() { function ParamsEntity() {
_this = this; _this = this;
@ -42,10 +33,19 @@
ParamsEntity.prototype = { ParamsEntity.prototype = {
update: function(){
var userData = JSON.parse(Entities.getEntityProperties(_this.entityID, ["userData"]).userData);
var valueToCheck = userData.myKey.valueToCheck;
if(valueToCheck && !isJoiningTheEvent){
_this.sendMessage();
}else if((!valueToCheck && isJoiningTheEvent) || (isJoiningTheEvent && !insideArea)){
_this.stopMessage();
}
},
preload: function(entityID) { preload: function(entityID) {
print('entity loaded') print('entity loaded')
this.entityID = entityID; this.entityID = entityID;
Script.update.connect(update); Script.update.connect(_this.update);
}, },
enterEntity: function(entityID) { enterEntity: function(entityID) {
print("enterEntity("+entityID+")"); print("enterEntity("+entityID+")");
@ -75,6 +75,9 @@
print("The event ended"); print("The event ended");
isJoiningTheEvent = false; isJoiningTheEvent = false;
} }
},
clean: function(entityID) {
Script.update.disconnect(_this.update);
} }
} }

8
examples/entityScripts/synchronizerMaster.js
View file

@ -10,7 +10,7 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
var PARAMS_SCRIPT_URL = 'https://raw.githubusercontent.com/AlessandroSigna/hifi/27fbef3e873d11648faf0a592bb2314a90c71624/examples/entityScripts/synchronizerEntityScript.js'; var PARAMS_SCRIPT_URL = 'https://raw.githubusercontent.com/AlessandroSigna/hifi/05aa1d4ce49c719353007c245ae77ef2d2a8fc36/examples/entityScripts/synchronizerEntityScript.js';
HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/"; HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
@ -104,12 +104,10 @@ function mousePressEvent(event) {
} }
} }
Script.setTimeout(function() {
print('sending data to entity');
Entities.callEntityMethod(testEntity, 'testParams', data);
}, 1500)
function cleanup() { function cleanup() {
toolBar.cleanup();
Entities.callEntityMethod(testEntity, 'clean'); //have to call this before deleting to avoid the JSON warnings
Entities.deleteEntity(testEntity); Entities.deleteEntity(testEntity);
} }