From 3781c23480816671f47769b55a5b8184fab2fd1d Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 26 Nov 2014 17:09:53 -0800
Subject: [PATCH] add entities to simulation after unpacking

---
 libraries/entities/src/EntityTree.cpp        | 31 ++++++--------------
 libraries/entities/src/EntityTree.h          |  3 +-
 libraries/entities/src/EntityTreeElement.cpp |  2 +-
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 5d4c5b0fc4..6ac3c31939 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -76,25 +76,14 @@ EntityItem* EntityTree::getOrCreateEntityItem(const EntityItemID& entityID, cons
 }
 
 /// Adds a new entity item to the tree
-void EntityTree::addEntityItem(EntityItem* entityItem) {
-    // You should not call this on existing entities that are already part of the tree! Call updateEntity()
-    EntityItemID entityID = entityItem->getEntityItemID();
-    EntityTreeElement* containingElement = getContainingElement(entityID);
-    if (containingElement) {
-        qDebug() << "UNEXPECTED!!!! don't call addEntityItem() on existing EntityItems. entityID=" << entityID;
-        return;
-    }
-
-    // Recurse the tree and store the entity in the correct tree element
-    AddEntityOperator theOperator(this, entityItem);
-    recurseTreeWithOperator(&theOperator);
-
+void EntityTree::postAddEntity(EntityItem* entity) {
+    assert(entity);
     // check to see if we need to simulate this entity..
     if (_simulation) {
-        _simulation->addEntity(entityItem);
+        _simulation->addEntity(entity);
     }
-
     _isDirty = true;
+    emit addingEntity(entity->getEntityItemID());
 }
 
 bool EntityTree::updateEntity(const EntityItemID& entityID, const EntityItemProperties& properties) {
@@ -177,9 +166,11 @@ EntityItem* EntityTree::addEntity(const EntityItemID& entityID, const EntityItem
     result = EntityTypes::constructEntityItem(type, entityID, properties);
 
     if (result) {
-        // this does the actual adding of the entity
-        addEntityItem(result);
-        emitAddingEntity(entityID);
+        // Recurse the tree and store the entity in the correct tree element
+        AddEntityOperator theOperator(this, result);
+        recurseTreeWithOperator(&theOperator);
+
+        postAddEntity(result);
     }
     return result;
 }
@@ -199,10 +190,6 @@ void EntityTree::trackDeletedEntity(EntityItem* entity) {
     }
 }
 
-void EntityTree::emitAddingEntity(const EntityItemID& entityItemID) {
-    emit addingEntity(entityItemID);
-}
-
 void EntityTree::emitEntityScriptChanging(const EntityItemID& entityItemID) {
     emit entityScriptChanging(entityItemID);
 }
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index db128e4563..5dccfd7709 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -79,7 +79,7 @@ public:
 
     // The newer API...
     EntityItem* getOrCreateEntityItem(const EntityItemID& entityID, const EntityItemProperties& properties);
-    void addEntityItem(EntityItem* entityItem);
+    void postAddEntity(EntityItem* entityItem);
 
     EntityItem* addEntity(const EntityItemID& entityID, const EntityItemProperties& properties);
     bool updateEntity(const EntityItemID& entityID, const EntityItemProperties& properties);
@@ -142,7 +142,6 @@ public:
 
     void trackDeletedEntity(EntityItem* entity);
 
-    void emitAddingEntity(const EntityItemID& entityItemID);
     void emitEntityScriptChanging(const EntityItemID& entityItemID);
 
     void setSimulation(EntitySimulation* simulation);
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 17f7456670..f0eeb40ede 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -768,7 +768,7 @@ int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int
                         addEntityItem(entityItem); // add this new entity to this elements entities
                         entityItemID = entityItem->getEntityItemID();
                         _myTree->setContainingElement(entityItemID, this);
-                        _myTree->emitAddingEntity(entityItemID); // we just added an entity
+                        _myTree->postAddEntity(entityItem);
                     }
                 }
                 // Move the buffer forward to read more entities