attempt to get imported entities into the correct octree-element

libraries/entities/src/EntityItem.cpp

@@ -1369,9 +1369,12 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(lastEditedBy, setLastEditedBy);
 
     AACube saveQueryAACube = _queryAACube;
-    checkAndAdjustQueryAACube();
-    if (saveQueryAACube != _queryAACube) {
-        somethingChanged = true;
+    if (checkAndAdjustQueryAACube()) {
+        if (saveQueryAACube != _queryAACube) {
+            somethingChanged = true;
+        }
+    } else {
+        markAncestorMissing(true);
     }
 
     // Now check the sub classes 

libraries/entities/src/EntityTree.cpp

@@ -1584,25 +1584,46 @@ QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSen
     args.ourTree = this;
     args.otherTree = localTree;
     args.root = glm::vec3(x, y, z);
-    // If this is called repeatedly (e.g., multiple pastes with the same data), the new elements will clash unless we use new identifiers.
-    // We need to keep a map so that we can map parent identifiers correctly.
+    // If this is called repeatedly (e.g., multiple pastes with the same data), the new elements will clash unless we
+    // use new identifiers.  We need to keep a map so that we can map parent identifiers correctly.
     QHash<EntityItemID, EntityItemID> map;
     args.map = &map;
     withReadLock([&] {
         recurseTreeWithOperation(sendEntitiesOperation, &args);
     });
 
-    // the values from map are used as the list of successfully "sent" entities.  If some didn't actually make it,
+    // The values from map are used as the list of successfully "sent" entities.  If some didn't actually make it,
     // pull them out.  Bogus entries could happen if part of the imported data makes some reference to an entity
     // that isn't in the data being imported.  For those that made it, fix up their queryAACubes and send an
     // add-entity packet to the server.
+
+    // fix the queryAACubes of any children that were read in before their parents, get them into the correct element
+    MovingEntitiesOperator moveOperator(localTree);
     QHash<EntityItemID, EntityItemID>::iterator i = map.begin();
     while (i != map.end()) {
         EntityItemID newID = i.value();
         EntityItemPointer entity = localTree->findEntityByEntityItemID(newID);
         if (entity) {
-            entity->computePuffedQueryAACube();
+            entity->forceQueryAACubeUpdate();
+            moveOperator.addEntityToMoveList(entity, entity->getQueryAACube());
+            i++;
+        } else {
+            i = map.erase(i);
+        }
+    }
+    if (moveOperator.hasMovingEntities()) {
+        PerformanceTimer perfTimer("recurseTreeWithOperator");
+        localTree->recurseTreeWithOperator(&moveOperator);
+    }
+
+    // send add-entity packets to the server
+    i = map.begin();
+    while (i != map.end()) {
+        EntityItemID newID = i.value();
+        EntityItemPointer entity = localTree->findEntityByEntityItemID(newID);
+        if (entity) {
             // queue the packet to send to the server
+            entity->computePuffedQueryAACube();
             EntityItemProperties properties = entity->getProperties();
             properties.markAllChanged(); // so the entire property set is considered new, since we're making a new entity
             packetSender->queueEditEntityMessage(PacketType::EntityAdd, localTree, newID, properties);
@@ -1611,7 +1632,6 @@ QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSen
             i = map.erase(i);
         }
     }
-
     packetSender->releaseQueuedMessages();
 
     return map.values().toVector();

libraries/shared/src/SpatiallyNestable.cpp

@@ -946,12 +946,13 @@ AACube SpatiallyNestable::getMaximumAACube(bool& success) const {
     return AACube(getPosition(success) - glm::vec3(defaultAACubeSize / 2.0f), defaultAACubeSize);
 }
 
-void SpatiallyNestable::checkAndAdjustQueryAACube() {
+bool SpatiallyNestable::checkAndAdjustQueryAACube() {
     bool success;
     AACube maxAACube = getMaximumAACube(success);
     if (success && (!_queryAACubeSet || !_queryAACube.contains(maxAACube))) {
         setQueryAACube(maxAACube);
     }
+    return success;
 }
 
 void SpatiallyNestable::setQueryAACube(const AACube& queryAACube) {

libraries/shared/src/SpatiallyNestable.h

@@ -102,11 +102,12 @@ public:
     virtual glm::vec3 getParentAngularVelocity(bool& success) const;
 
     virtual AACube getMaximumAACube(bool& success) const;
-    virtual void checkAndAdjustQueryAACube();
+    virtual bool checkAndAdjustQueryAACube();
     virtual bool computePuffedQueryAACube();
 
     virtual void setQueryAACube(const AACube& queryAACube);
     virtual bool queryAABoxNeedsUpdate() const;
+    void forceQueryAACubeUpdate() { _queryAACubeSet = false; }
     virtual AACube getQueryAACube(bool& success) const;
     virtual AACube getQueryAACube() const;