Merge pull request CesiumGS#8028 from sfariaNG/imagery-timeouts

Render globe tiles if any layer is loaded
longxiutmm · Sep 20, 2019 · d521ad1 · d521ad1
2 parents ae24f15 + 764526c
commit d521ad1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -27,6 +27,7 @@ Change Log
 * Fixed labels not showing for individual entities in data sources when clustering is enabled. [#6087](https://github.com/AnalyticalGraphicsInc/cesium/issues/6087)
 * Fixed a crash for 3D Tiles that have zero volume. [#7945](https://github.com/AnalyticalGraphicsInc/cesium/pull/7945)
 * Fixed a bug where dynamic polylines did not use the given arcType. [#8191](https://github.com/AnalyticalGraphicsInc/cesium/issues/8191)
+* Fixed a bug where GlobeSurfaceTile would not render the tile until all layers completed loading causing globe to appear to hang. [#7974](https://github.com/AnalyticalGraphicsInc/cesium/issues/7974)
 
 ### 1.61 - 2019-09-03
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -62,6 +62,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Raytheon Intelligence and Information Systems](http://www.raytheon.com/)
    * [David Hudlow](https://github.com/DavidHudlow)
    * [Ashley Mort](https://github.com/mortac8)
+   * [Sherwin Faria](https://github.com/sfariaNG)
 * [Evax Software](http://www.evax.fr)
    * [Evax Software](https://github.com/evax)
 * [Aviture](http://aviture.us.com)

diff --git a/Source/Scene/GlobeSurfaceTile.js b/Source/Scene/GlobeSurfaceTile.js
@@ -304,7 +304,7 @@ define([
     GlobeSurfaceTile.prototype.processImagery = function(tile, terrainProvider, frameState, skipLoading) {
         var surfaceTile = tile.data;
         var isUpsampledOnly = tile.upsampledFromParent;
-        var isRenderable = tile.renderable;
+        var isAnyTileLoaded = false;
         var isDoneLoading = true;
 
         // Transition imagery states
@@ -337,14 +337,16 @@ define([
             isDoneLoading = isDoneLoading && thisTileDoneLoading;
 
             // The imagery is renderable as soon as we have any renderable imagery for this region.
-            isRenderable = isRenderable && (thisTileDoneLoading || defined(tileImagery.readyImagery));
+            isAnyTileLoaded = isAnyTileLoaded || (thisTileDoneLoading || defined(tileImagery.readyImagery));
 
             isUpsampledOnly = isUpsampledOnly && defined(tileImagery.loadingImagery) &&
                               (tileImagery.loadingImagery.state === ImageryState.FAILED || tileImagery.loadingImagery.state === ImageryState.INVALID);
         }
 
         tile.upsampledFromParent = isUpsampledOnly;
-        tile.renderable = isRenderable;
+
+        // Allow rendering if any available layers are loaded
+        tile.renderable = tile.renderable && (isAnyTileLoaded || isDoneLoading);
 
         return isDoneLoading;
     };