model loading priority updates over time, takes into account out of bounds, avatar entities have higher priority, and fsts can specify to wait for wearables to load before rendering

HifiExperiments committed 2 years ago

Commit fe61d921 parent 93c1ed621 files · +156 −95Browse files

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

Unified · Split

         auto loadingRequests = ResourceCache::getLoadingRequests();
         QJsonArray loadingRequestsStats;
-        for (const auto& request : loadingRequests) {
+        for (const auto& requestPair : loadingRequests) {
             QJsonObject requestStats;
-            requestStats["filename"] = request->getURL().fileName();
+            requestStats["filename"] = requestPair.first->getURL().fileName();
-            requestStats["received"] = request->getBytesReceived();
+            requestStats["received"] = requestPair.first->getBytesReceived();
-            requestStats["total"] = request->getBytesTotal();
+            requestStats["total"] = requestPair.first->getBytesTotal();
-            requestStats["attempts"] = (int)request->getDownloadAttempts();
+            requestStats["attempts"] = (int)requestPair.first->getDownloadAttempts();
             loadingRequestsStats.append(requestStats);
         }
     getEntities()->init();
     getEntities()->setEntityLoadingPriorityFunction([this](const EntityItem& item) {
-        auto dims = item.getScaledDimensions();
+        if (item.getEntityHostType() == entity::HostType::AVATAR) {
-        auto maxSize = glm::compMax(dims);
+            return item.isMyAvatarEntity() ? Avatar::MYAVATAR_ENTITY_LOADING_PRIORITY : Avatar::OTHERAVATAR_ENTITY_LOADING_PRIORITY;
+        }
+        const float maxSize = glm::compMax(item.getScaledDimensions());
         if (maxSize <= 0.0f) {
             return 0.0f;
         }
-        auto distance = glm::distance(getMyAvatar()->getWorldPosition(), item.getWorldPosition());
+        const glm::vec3 itemPosition = item.getWorldPosition();
-        return atan2(maxSize, distance);
+        const float distance = glm::distance(getMyAvatar()->getWorldPosition(), itemPosition);
+        float result = atan2(maxSize, distance);
+        bool isInView = true;
+        {
+            QMutexLocker viewLocker(&_viewMutex);
+            isInView = _viewFrustum.sphereIntersectsKeyhole(itemPosition, maxSize);
+        }
+        if (!isInView) {
+            const float OUT_OF_VIEW_PENALTY = -M_PI_2;
+            result += OUT_OF_VIEW_PENALTY;
+        }
+        return result;
     });
     ObjectMotionState::setShapeManager(&_shapeManager);