Keep expired content while new content loads

CesiumGS · Apr 24, 2017 · 5fb5f91 · 5fb5f91
1 parent 6aaff1b
commit 5fb5f91
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js
@@ -212,6 +212,7 @@ define([
         this._contentState = contentState;
         this._contentReadyToProcessPromise = undefined;
         this._contentReadyPromise = undefined;
+        this._expiredContent = undefined;
 
         this._requestServer = requestServer;
 
@@ -445,6 +446,22 @@ define([
             }
         },
 
+        /**
+         * Determines if the tile has available content to render.  <code>true</code> if the tile's
+         * content is ready or if it has expired content that renders while new content loads; otherwise,
+         * <code>false</code>.
+         *
+         * @memberof Cesium3DTile.prototype
+         *
+         * @type {Boolean}
+         * @readonly
+         */
+        contentAvailable : {
+            get : function() {
+                return this.contentReady || defined(this._expiredContent);
+            }
+        },
+
         /**
          * Determines if the tile is ready to render. <code>true</code> if the tile
          * is ready to render; otherwise, <code>false</code>.
@@ -538,6 +555,7 @@ define([
             var now = JulianDate.now(scratchJulianDate);
             if (JulianDate.lessThan(tile.expireDate, now)) {
                 tile._contentState = Cesium3DTileContentState.EXPIRED;
+                tile._expiredContent = tile._content;
             }
         }
     }
@@ -605,9 +623,6 @@ define([
                 return when.reject('tileset is destroyed');
             }
 
-            // Destroy expired content to make way for the new content
-            that._content = that._content && that._content.destroy();
-
             var uint8Array = new Uint8Array(arrayBuffer);
             var magic = getMagic(uint8Array);
             var contentFactory = Cesium3DTileContentFactory[magic];
@@ -933,6 +948,20 @@ define([
         }
     }
 
+    function updateContent(tile, tileset, frameState) {
+        var content = tile._content;
+        var expiredContent = tile._expiredContent;
+
+        if (defined(expiredContent) && !tile.contentReady) {
+            // Render the expired content while the content loads
+            expiredContent.update(tileset, frameState);
+            return;
+        }
+
+        tile._expiredContent = tile._expiredContent && tile._expiredContent.destroy();
+        content.update(tileset, frameState);
+    }
+
     /**
      * Get the draw commands needed to render this tile.
      *
@@ -941,7 +970,7 @@ define([
     Cesium3DTile.prototype.update = function(tileset, frameState) {
         applyDebugSettings(this, tileset, frameState);
         updateExpiration(this);
-        this._content.update(tileset, frameState);
+        updateContent(this, tileset, frameState);
         this._transformDirty = false;
     };
 
@@ -977,6 +1006,7 @@ define([
      */
     Cesium3DTile.prototype.destroy = function() {
         this._content = this._content && this._content.destroy();
+        this._expiredContent = this._expiredContent && this._expiredContent.destroy();
         this._debugBoundingVolume = this._debugBoundingVolume && this._debugBoundingVolume.destroy();
         this._debugContentBoundingVolume = this._debugContentBoundingVolume && this._debugContentBoundingVolume.destroy();
         this._debugViewerRequestVolume = this._debugViewerRequestVolume && this._debugViewerRequestVolume.destroy();

diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js
@@ -1277,7 +1277,7 @@ define([
     function selectTile(tileset, tile, frameState) {
         // There may also be a tight box around just the tile's contents, e.g., for a city, we may be
         // zoomed into a neighborhood and can cull the skyscrapers in the root node.
-        if (tile.contentReady && (
+        if (tile.contentAvailable && (
                 (tile.visibilityPlaneMask === CullingVolume.MASK_INSIDE) ||
                 (tile.contentVisibility(frameState) !== Intersect.OUTSIDE)
             )) {
@@ -1357,8 +1357,8 @@ define([
             var tile = original;
             // traverse up the tree to find a ready ancestor
             if (!tile.hasEmptyContent) {
-                while (defined(tile) && !(tile.hasRenderableContent && tile.contentReady)) {
-                    if (!tile.contentReady) {
+                while (defined(tile) && !(tile.hasRenderableContent && tile.contentAvailable)) {
+                    if (!tile.contentAvailable) {
                         tileset._hasMixedContent = true;
                     }
                     tile = tile.parent;
@@ -1381,7 +1381,7 @@ define([
                     var childrenLength = children.length;
                     for (var j = 0; j < childrenLength; ++j) {
                         var child = children[j];
-                        if (child.contentReady) {
+                        if (child.contentAvailable) {
                             if (!child.selected) {
                                 child._finalResolution = true;
                                 child.selected = true;
@@ -1391,7 +1391,7 @@ define([
                             }
                         }
                         if (child._depth - original._depth < 2) { // prevent traversing too far
-                            if (!child.contentReady || child.refine === Cesium3DTileRefine.ADD) {
+                            if (!child.contentAvailable || child.refine === Cesium3DTileRefine.ADD) {
                                 descendantStack.push(child);
                             }
                         }