Move loading terrain and imagery to the end of the quadtree update. Q…

…ueue any texture re-projections to be executed the next frame.
CesiumGS · Mar 10, 2016 · 71bcd26 · 71bcd26
1 parent 750dfc3
commit 71bcd26
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 5 deletions.
diff --git a/Source/Scene/Globe.js b/Source/Scene/Globe.js
@@ -426,7 +426,7 @@ define([
 
                     that._oceanNormalMap = that._oceanNormalMap && that._oceanNormalMap.destroy();
                     that._oceanNormalMap = new Texture({
-                        context : context,
+                        context : frameState.context,
                         source : image
                     });
                 });

diff --git a/Source/Scene/GlobeSurfaceTileProvider.js b/Source/Scene/GlobeSurfaceTileProvider.js
@@ -314,6 +314,8 @@ define([
                 creditDisplay.addCredit(imageryProvider.credit);
             }
         }
+
+        imageryLayers.update(frameState);
     };
 
     /**
@@ -407,6 +409,13 @@ define([
         }
     };
 
+    /**
+     * Cancels any imagery re-projections in the queue.
+     */
+    GlobeSurfaceTileProvider.prototype.cancelReprojections = function() {
+        this._imageryLayers.cancelReprojections();
+    };
+
     /**
      * Gets the maximum geometric error allowed in a tile at a given level, in meters.  This function should not be
      * called before {@link GlobeSurfaceTileProvider#ready} returns true.

diff --git a/Source/Scene/ImageryLayer.js b/Source/Scene/ImageryLayer.js
@@ -235,6 +235,8 @@ define([
         this._isBaseLayer = false;
 
         this._requestImageError = undefined;
+
+        this._reprojectComputeCommands = [];
     }
 
     defineProperties(ImageryLayer.prototype, {
@@ -739,7 +741,7 @@ define([
     }
 
     /**
-     * Reproject a texture to a {@link GeographicProjection}, if necessary, and generate
+     * Enqueues a command re-projecting a texture to a {@link GeographicProjection} on the next update, if necessary, and generate
      * mipmaps for the geographic texture.
      *
      * @private
@@ -773,12 +775,37 @@ define([
                         finalizeReprojectTexture(that, context, imagery, outputTexture);
                     }
                 });
-                frameState.commandList.push(computeCommand);
+                this._reprojectComputeCommands.push(computeCommand);
         } else {
             finalizeReprojectTexture(this, context, imagery, texture);
         }
     };
 
+    /**
+     * Updates frame state to execute any queued texture re-projections.
+     *
+     * @private
+     *
+     * @param {FrameState} frameState The frameState.
+     */
+    ImageryLayer.prototype.update = function(frameState) {
+        var computeCommands = this._reprojectComputeCommands;
+        var length = computeCommands.length;
+        for (var i = 0; i < length; ++i) {
+            frameState.commandList.push(computeCommands[i]);
+        }
+        computeCommands.length = 0;
+    };
+
+    /**
+     * Cancels re-projection commands queued for the next frame.
+     *
+     * @private
+     */
+    ImageryLayer.prototype.cancelReprojections = function() {
+        this._reprojectComputeCommands.length = 0;
+    };
+
     ImageryLayer.prototype.getImageryFromCache = function(x, y, level, imageryRectangle) {
         var cacheKey = getImageryCacheKey(x, y, level);
         var imagery = this._imageryCache[cacheKey];

diff --git a/Source/Scene/ImageryLayerCollection.js b/Source/Scene/ImageryLayerCollection.js
@@ -459,6 +459,32 @@ define([
         });
     };
 
+    /**
+     * Updates frame state to execute any queued texture re-projections.
+     *
+     * @private
+     *
+     * @param {FrameState} frameState The frameState.
+     */
+    ImageryLayerCollection.prototype.update = function(frameState) {
+        var layers = this._layers;
+        for (var i = 0, len = layers.length; i < len; ++i) {
+            layers[i].update(frameState);
+        }
+    };
+
+    /**
+     * Cancels re-projection commands queued for the next frame.
+     *
+     * @private
+     */
+    ImageryLayerCollection.prototype.cancelReprojections = function() {
+        var layers = this._layers;
+        for (var i = 0, len = layers.length; i < len; ++i) {
+            layers[i].cancelReprojections();
+        }
+    };
+
     /**
      * Returns true if this object was destroyed; otherwise, false.
      * <br /><br />

diff --git a/Source/Scene/QuadtreePrimitive.js b/Source/Scene/QuadtreePrimitive.js
@@ -193,6 +193,8 @@ define([
         }
 
         this._levelZeroTiles = undefined;
+
+        this._tileProvider.cancelReprojections();
     };
 
     /**
@@ -268,6 +270,7 @@ define([
             return;
         }
 
+        // Gets commands for any texture re-projections and updates the credit display
         this._tileProvider.initialize(frameState);
 
         var debug = this._debug;
@@ -281,8 +284,6 @@ define([
         debug.tilesRendered = 0;
         debug.tilesWaitingForChildren = 0;
 
-        processTileLoadQueue(this, frameState);
-
         this._tileLoadQueue.length = 0;
         this._tileReplacementQueue.markStartOfRenderFrame();
     };
@@ -316,6 +317,8 @@ define([
             return;
         }
 
+        // Load/create resources for terrain and imagery. Prepare texture re-projections for the next frame.
+        processTileLoadQueue(this, frameState);
         updateHeights(this, frameState);
 
         var debug = this._debug;

diff --git a/Specs/Scene/ImageryLayerSpec.js b/Specs/Scene/ImageryLayerSpec.js
@@ -176,6 +176,7 @@ defineSuite([
                 }).then(function() {
                     var textureBeforeReprojection = imagery.texture;
                     layer._reprojectTexture(frameState, imagery);
+                    layer.update(frameState);
                     frameState.commandList[0].execute(computeEngine);
 
                     return pollToPromise(function() {