be picky when finding nearby entities at login

Andrew Meadows committed 9 years ago

Commit 0bcecdb1 parent 0f4e7fb5 files · +58 −16Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

         return false;
     }
-    AABox avatarBox(getMyAvatar()->getPosition() - glm::vec3(0.5f * PHYSICS_READY_RANGE), glm::vec3(PHYSICS_READY_RANGE));
+    // We don't want to use EntityTree::findEntities(AABox, ...) method because that scan will snarf parented entities
+    // whose bounding boxes cannot be computed (it is too loose for our purposes here).  Instead we manufacture
+    // custom filters and use the general-purpose EntityTree::findEntities(filter, ...)
     QVector<EntityItemPointer> entities;
     entityTree->withReadLock([&] {
-        entityTree->findEntities(avatarBox, entities);
+        AABox avatarBox(getMyAvatar()->getPosition() - glm::vec3(PHYSICS_READY_RANGE), glm::vec3(2 * PHYSICS_READY_RANGE));
+        // create two functions that use avatarBox (entityScan and elementScan), the second calls the first
+        std::function<bool (EntityItemPointer&)> entityScan = [=](EntityItemPointer& entity) {
+                if (entity->shouldBePhysical()) {
+                    bool success = false;
+                    AABox entityBox = entity->getAABox(success);
+                    // important: bail for entities that cannot supply a valid AABox
+                    return success && avatarBox.touches(entityBox);
+                }
+                return false;
+            };
+        std::function<bool(const OctreeElementPointer&, void*)> elementScan = [&](const OctreeElementPointer& element, void* unused) {
+            if (element->getAACube().touches(avatarBox)) {
+                EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
+                entityTreeElement->getEntities(entityScan, entities);
+                return true;
+            }
+            return false;
+        };
+        // Pass the second function to the general-purpose EntityTree::findEntities()
+        // which will traverse the tree, apply the two filter functions (to element, then to entities)
+        // as it traverses.  The end result will be a list of entities that match.
+        entityTree->findEntities(elementScan, entities);
     });
-    // For reasons I haven't found, we don't necessarily have the full scene when we receive a stats packet.  Apply
-    // a heuristic to try to decide when we actually know about all of the nearby entities.
     uint32_t nearbyCount = entities.size();
     if (nearbyCount == _nearbyEntitiesCountAtLastPhysicsCheck) {
         _nearbyEntitiesStabilityCount++;
         bool result = true;
         foreach (EntityItemPointer entity, entities) {
             if (entity->shouldBePhysical() && !entity->isReadyToComputeShape()) {
-                // BUG: the findEntities() query above is sometimes returning objects that don't actually overlap
+                static QString repeatedMessage =
-                // TODO: investigate and fix findQueries() but in the meantime...
+                    LogHandler::getInstance().addRepeatedMessageRegex("Physics disabled until entity loads: .*");
-                // WORKAROUND: test the overlap of each entity to verify it matters
+                qCDebug(interfaceapp) << "Physics disabled until entity loads: " << entity->getID() << entity->getName();
-                bool success = false;
+                // don't break here because we want all the relevant entities to start their downloads
-                AACube entityCube = entity->getQueryAACube(success);
+                result = false;
-                if (success && avatarBox.touches(entityCube)) {
-                    static QString repeatedMessage =
-                        LogHandler::getInstance().addRepeatedMessageRegex("Physics disabled until entity loads: .*");
-                    qCDebug(interfaceapp) << "Physics disabled until entity loads: " << entity->getID() << entity->getName();
-                    // don't break here because we want all the relevant entities to start their downloads
-                    result = false;
-                }
             }
         }
         return result;