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

cleanup entity scripts when changing domains or entity is deleted

Browse source
This commit is contained in:
ZappoMan 2014-11-06 20:01:09 -08:00
parent 55576e7f9d
commit 542d671e54
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/entities/EntityTreeRenderer.cpp
View file

@ -61,11 +61,13 @@ EntityTreeRenderer::~EntityTreeRenderer() {
void EntityTreeRenderer::clear() { void EntityTreeRenderer::clear() {
OctreeRenderer::clear(); OctreeRenderer::clear();
_entityScripts.clear();
} }
void EntityTreeRenderer::init() { void EntityTreeRenderer::init() {
OctreeRenderer::init(); OctreeRenderer::init();
static_cast<EntityTree*>(_tree)->setFBXService(this); EntityTree* entityTree = static_cast<EntityTree*>(_tree);
entityTree->setFBXService(this);
if (_wantScripts) { if (_wantScripts) {
_entitiesScriptEngine = new ScriptEngine(NO_SCRIPT, "Entities", _entitiesScriptEngine = new ScriptEngine(NO_SCRIPT, "Entities",
@ -77,6 +79,8 @@ void EntityTreeRenderer::init() {
// first chance, we'll check for enter/leave entity events. // first chance, we'll check for enter/leave entity events.
glm::vec3 avatarPosition = Application::getInstance()->getAvatar()->getPosition(); glm::vec3 avatarPosition = Application::getInstance()->getAvatar()->getPosition();
_lastAvatarPosition = avatarPosition + glm::vec3(1.f, 1.f, 1.f); _lastAvatarPosition = avatarPosition + glm::vec3(1.f, 1.f, 1.f);
connect(entityTree, &EntityTree::deletingEntity, this, &EntityTreeRenderer::deletingEntity);
} }
QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) { QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) {
@ -762,4 +766,9 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event, unsigned int deviceI
} }
} }
void EntityTreeRenderer::deletingEntity(const EntityItemID& entityID) {
if (_entityScripts.contains(entityID)) {
_entityScripts.remove(entityID);
}
}

3
interface/src/entities/EntityTreeRenderer.h
View file

@ -101,6 +101,9 @@ signals:
void enterEntity(const EntityItemID& entityItemID); void enterEntity(const EntityItemID& entityItemID);
void leaveEntity(const EntityItemID& entityItemID); void leaveEntity(const EntityItemID& entityItemID);
public slots:
void deletingEntity(const EntityItemID& entityID);
private: private:
QList<Model*> _releasedModels; QList<Model*> _releasedModels;

3
libraries/entities/src/EntityTree.cpp
View file

@ -185,6 +185,8 @@ void EntityTree::trackDeletedEntity(const EntityItemID& entityID) {
} }
void EntityTree::deleteEntity(const EntityItemID& entityID) { void EntityTree::deleteEntity(const EntityItemID& entityID) {
emit deletingEntity(entityID);
// NOTE: callers must lock the tree before using this method // NOTE: callers must lock the tree before using this method
DeleteEntityOperator theOperator(this, entityID); DeleteEntityOperator theOperator(this, entityID);
recurseTreeWithOperator(&theOperator); recurseTreeWithOperator(&theOperator);
@ -197,6 +199,7 @@ void EntityTree::deleteEntities(QSet<EntityItemID> entityIDs) {
foreach(const EntityItemID& entityID, entityIDs) { foreach(const EntityItemID& entityID, entityIDs) {
// tell our delete operator about this entityID // tell our delete operator about this entityID
theOperator.addEntityIDToDeleteList(entityID); theOperator.addEntityIDToDeleteList(entityID);
emit deletingEntity(entityID);
} }
recurseTreeWithOperator(&theOperator); recurseTreeWithOperator(&theOperator);

3
libraries/entities/src/EntityTree.h
View file

@ -141,6 +141,9 @@ public:
void trackDeletedEntity(const EntityItemID& entityID); void trackDeletedEntity(const EntityItemID& entityID);
QList<EntityItem*>& getMovingEntities() { return _movingEntities; } QList<EntityItem*>& getMovingEntities() { return _movingEntities; }
signals:
void deletingEntity(const EntityItemID& entityID);
private: private: