Merge pull request CesiumGS#831 from CesiumGS/fix-compute-load-progre…

…ss-main-thread-q Fix Tileset::ComputeLoadProgress incorrectly reporting done, when main thread loading exists
DiligentGraphics · Mar 30, 2024 · e0a1bea · e0a1bea
2 parents bcdf4b6 + fd742c2
commit e0a1bea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,7 @@
 ##### Fixes :wrench:
 
 - Fixed a bug where coordinates returned from `SimplePlanarEllipsoidCurve` were inverted if one of the input points had a negative height.
+- Fixed a bug where `Tileset::ComputeLoadProgress` could incorrectly report 100% before all tiles finished their main thread loading.
 
 ### v0.33.0 - 2024-03-01
 

diff --git a/Cesium3DTilesSelection/src/Tileset.cpp b/Cesium3DTilesSelection/src/Tileset.cpp
@@ -434,7 +434,8 @@ int32_t Tileset::getNumberOfTilesLoaded() const {
 
 float Tileset::computeLoadProgress() noexcept {
   int32_t queueSizeSum = static_cast<int32_t>(
-      this->_workerThreadLoadQueue.size() + this->_mainThreadLoadQueue.size());
+      this->_updateResult.workerThreadTileLoadQueueLength +
+      this->_updateResult.mainThreadTileLoadQueueLength);
   int32_t numOfTilesLoading =
       this->_pTilesetContentManager->getNumberOfTilesLoading();
   int32_t numOfTilesLoaded =