cesium 0.13.2 → 0.14.0

data/app/assets/javascripts/DynamicScene/DynamicPolygonVisualizer.js

@@ -76,7 +76,7 @@ define([
         var oldCollection = this._dynamicObjectCollection;
         if (oldCollection !== dynamicObjectCollection) {
             if (typeof oldCollection !== 'undefined') {
-                oldCollection.objectsRemoved.removeEventListener(DynamicPolygonVisualizer.prototype._onObjectsRemoved);
+                oldCollection.objectsRemoved.removeEventListener(DynamicPolygonVisualizer.prototype._onObjectsRemoved, this);
                 this.removeAllPrimitives();
             }
             this._dynamicObjectCollection = dynamicObjectCollection;

data/app/assets/javascripts/DynamicScene/DynamicPolylineVisualizer.js

@@ -77,7 +77,7 @@ define([
         var oldCollection = this._dynamicObjectCollection;
         if (oldCollection !== dynamicObjectCollection) {
             if (typeof oldCollection !== 'undefined') {
-                oldCollection.objectsRemoved.removeEventListener(DynamicPolylineVisualizer.prototype._onObjectsRemoved);
+                oldCollection.objectsRemoved.removeEventListener(DynamicPolylineVisualizer.prototype._onObjectsRemoved, this);
                 this.removeAllPrimitives();
             }
             this._dynamicObjectCollection = dynamicObjectCollection;

data/app/assets/javascripts/DynamicScene/DynamicPyramidVisualizer.js

@@ -86,7 +86,7 @@ define([
         var oldCollection = this._dynamicObjectCollection;
         if (oldCollection !== dynamicObjectCollection) {
             if (typeof oldCollection !== 'undefined') {
-                oldCollection.objectsRemoved.removeEventListener(DynamicPyramidVisualizer.prototype._onObjectsRemoved);
+                oldCollection.objectsRemoved.removeEventListener(DynamicPyramidVisualizer.prototype._onObjectsRemoved, this);
                 this.removeAllPrimitives();
             }
             this._dynamicObjectCollection = dynamicObjectCollection;

data/app/assets/javascripts/Renderer/ClearCommand.js

@@ -5,7 +5,7 @@ define(['../Core/DeveloperError'], function(DeveloperError) {
     /**
      * Represents a command to the renderer for clearing.
      *
-     * @alias Command
+     * @alias ClearCommand
      * @constructor
      *
      * @param {ClearState} [clearState] The clear state.

data/app/assets/javascripts/Renderer/Context.js

@@ -254,6 +254,18 @@ define([
 
         this._defaultTexture = undefined;
         this._defaultCubeMap = undefined;
+
+        /**
+         * A cache of objects tied to this context.  Just before the Context is destroyed,
+         * <code>destroy</code> will be invoked on each object in this object literal that has
+         * such a method.  This is useful for caching any objects that might otherwise
+         * be stored globally, except they're tied to a particular context, and to manage
+         * their lifetime.
+         *
+         * @private
+         * @type {Object}
+         */
+        this.cache = {};
     };
 
     Context.prototype._enableOrDisable = function(glEnum, enable) {
@@ -2794,6 +2806,17 @@ define([
     };
 
     Context.prototype.destroy = function() {
+        // Destroy all objects in the cache that have a destroy method.
+        var cache = this.cache;
+        for (var property in cache) {
+            if (cache.hasOwnProperty(property)) {
+                var propertyValue = cache[property];
+                if (typeof propertyValue.destroy !== 'undefined') {
+                    propertyValue.destroy();
+                }
+            }
+        }
+
         this._shaderCache = this._shaderCache.destroy();
         this._defaultTexture = this._defaultTexture && this._defaultTexture.destroy();
         this._defaultCubeMap = this._defaultCubeMap && this._defaultCubeMap.destroy();

data/app/assets/javascripts/Renderer/DrawCommand.js

@@ -5,7 +5,7 @@ define(['../Core/DeveloperError'], function(DeveloperError) {
     /**
      * Represents a command to the renderer for drawing.
      *
-     * @alias Command
+     * @alias DrawCommand
      * @constructor
      */
     var DrawCommand = function() {

data/app/assets/javascripts/Scene/BillboardCollection.js

@@ -551,18 +551,11 @@ define([
     function getDirectionsVertexBuffer(context) {
         var sixteenK = 16 * 1024;
 
-        // Per-context cache for billboard collections
-        context._primitivesCache = context._primitivesCache || {};
-        var primitivesCache = context._primitivesCache;
-        primitivesCache._billboardCollection = primitivesCache._billboardCollection || {};
-        var c = primitivesCache._billboardCollection;
-
-        if (c.directionsVertexBuffer) {
-            return c.directionsVertexBuffer;
+        var directionsVertexBuffer = context.cache.billboardCollection_directionsVertexBuffer;
+        if (typeof directionsVertexBuffer !== 'undefined') {
+            return directionsVertexBuffer;
         }
 
-        c.directionsVertexBuffer = c.directionsVertexBuffer && c.directionsVertexBuffer.destroy();
-
         var directions = new Uint8Array(sixteenK * 4 * 2);
         for (var i = 0, j = 0; i < sixteenK; ++i) {
             directions[j++] = 0;
@@ -580,22 +573,18 @@ define([
 
         // PERFORMANCE_IDEA:  Should we reference count billboard collections, and eventually delete this?
         // Is this too much memory to allocate up front?  Should we dynamically grow it?
-        c.directionsVertexBuffer = context.createVertexBuffer(directions, BufferUsage.STATIC_DRAW);
-        c.directionsVertexBuffer.setVertexArrayDestroyable(false);
-        return c.directionsVertexBuffer;
+        directionsVertexBuffer = context.createVertexBuffer(directions, BufferUsage.STATIC_DRAW);
+        directionsVertexBuffer.setVertexArrayDestroyable(false);
+        context.cache.billboardCollection_directionsVertexBuffer = directionsVertexBuffer;
+        return directionsVertexBuffer;
     }
 
     function getIndexBuffer(context) {
         var sixteenK = 16 * 1024;
 
-        // Per-context cache for billboard collections
-        context._primitivesCache = context._primitivesCache || {};
-        var primitivesCache = context._primitivesCache;
-        primitivesCache._billboardCollection = primitivesCache._billboardCollection || {};
-        var c = primitivesCache._billboardCollection;
-
-        if (c.indexBuffer) {
-            return c.indexBuffer;
+        var indexBuffer = context.cache.billboardCollection_indexBuffer;
+        if (typeof indexBuffer !== 'undefined') {
+            return indexBuffer;
         }
 
         var length = sixteenK * 6;
@@ -612,9 +601,10 @@ define([
 
         // PERFORMANCE_IDEA:  Should we reference count billboard collections, and eventually delete this?
         // Is this too much memory to allocate up front?  Should we dynamically grow it?
-        c.indexBuffer = context.createIndexBuffer(indices, BufferUsage.STATIC_DRAW, IndexDatatype.UNSIGNED_SHORT);
-        c.indexBuffer.setVertexArrayDestroyable(false);
-        return c.indexBuffer;
+        indexBuffer = context.createIndexBuffer(indices, BufferUsage.STATIC_DRAW, IndexDatatype.UNSIGNED_SHORT);
+        indexBuffer.setVertexArrayDestroyable(false);
+        context.cache.billboardCollection_indexBuffer = indexBuffer;
+        return indexBuffer;
     }
 
     BillboardCollection.prototype.computeNewBuffersUsage = function() {

data/app/assets/javascripts/Scene/EllipsoidPrimitive.js

@@ -190,47 +190,25 @@ define([
         };
     };
 
-    // Per-context cache for ellipsoids
-    var vertexArrayCache = {};
-
     function getVertexArray(context) {
-        var c = vertexArrayCache[context.getId()];
-
-        if (typeof c !== 'undefined' &&
-            typeof c.vertexArray !== 'undefined') {
+        var vertexArray = context.cache.ellipsoidPrimitive_vertexArray;
 
-            ++c.referenceCount;
-            return c;
+        if (typeof vertexArray !== 'undefined') {
+            return vertexArray;
         }
 
         var mesh = BoxTessellator.compute({
             dimensions : new Cartesian3(2.0, 2.0, 2.0)
         });
 
-        var va = context.createVertexArrayFromMesh({
+        vertexArray = context.createVertexArrayFromMesh({
             mesh: mesh,
             attributeIndices: attributeIndices,
             bufferUsage: BufferUsage.STATIC_DRAW
         });
 
-        var cachedVA = {
-            vertexArray : va,
-            referenceCount : 1,
-
-            release : function() {
-                if (typeof this.vertexArray !== 'undefined' &&
-                    --this.referenceCount === 0) {
-
-                    // PERFORMANCE_IDEA: Schedule this for a few hundred frames later so we don't thrash the cache
-                    this.vertexArray = this.vertexArray.destroy();
-                }
-
-                return undefined;
-            }
-        };
-
-        vertexArrayCache[context.getId()] = cachedVA;
-        return cachedVA;
+        context.cache.ellipsoidPrimitive_vertexArray = vertexArray;
+        return vertexArray;
     }
 
     /**
@@ -314,7 +292,7 @@ define([
                 this._sp = context.getShaderCache().getShaderProgram(EllipsoidVS, fsSource, attributeIndices);
 
                 colorCommand.primitiveType = PrimitiveType.TRIANGLES;
-                colorCommand.vertexArray = this._va.vertexArray;
+                colorCommand.vertexArray = this._va;
                 colorCommand.renderState = this._rs;
                 colorCommand.shaderProgram = this._sp;
                 colorCommand.uniformMap = combine([this._uniforms, this._material._uniforms], false, false);
@@ -349,7 +327,7 @@ define([
                 this._pickSP = context.getShaderCache().getShaderProgram(EllipsoidVS, pickFS, attributeIndices);
 
                 pickCommand.primitiveType = PrimitiveType.TRIANGLES;
-                pickCommand.vertexArray = this._va.vertexArray;
+                pickCommand.vertexArray = this._va;
                 pickCommand.renderState = this._rs;
                 pickCommand.shaderProgram = this._pickSP;
                 pickCommand.uniformMap = combine([this._uniforms, pickMaterial._uniforms], false, false);
@@ -402,7 +380,6 @@ define([
      */
     EllipsoidPrimitive.prototype.destroy = function() {
         this._sp = this._sp && this._sp.release();
-        this._va = this._va && this._va.release();
         this._pickSP = this._pickSP && this._pickSP.release();
         this._pickId = this._pickId && this._pickId.destroy();
         return destroyObject(this);

data/app/assets/javascripts/Scene/PerformanceDisplay.js

@@ -3,11 +3,13 @@ define([
         '../Core/destroyObject',
         '../Core/BoundingRectangle',
         '../Renderer/PixelFormat',
+        './Material',
         './ViewportQuad'
     ], function(
         destroyObject,
         BoundingRectangle,
         PixelFormat,
+        Material,
         ViewportQuad) {
     "use strict";
 
@@ -59,8 +61,7 @@ define([
         this._lastFpsSampleTime = undefined;
         this._frameCount = 0;
 
-        this._quad = new ViewportQuad(new BoundingRectangle(0, 0, 0, 0));
-        this._quad.enableBlending = true;
+        this._quad = undefined;
 
         this._time = undefined;
         this._texture = undefined;
@@ -132,12 +133,16 @@ define([
             }
         }
 
+        if (typeof this._quad === 'undefined') {
+            this._quad = new ViewportQuad(undefined, Material.fromType(context, Material.ImageType));
+        }
+
         if (typeof this._texture === 'undefined') {
             this._texture = context.createTexture2D({
                 source : this._canvas,
                 pixelFormat : PixelFormat.RGBA
             });
-            this._quad.setTexture(this._texture);
+            this._quad.material.uniforms.image = this._texture;
         } else {
             this._texture.copyFrom(this._canvas);
         }
@@ -145,7 +150,11 @@ define([
         var viewportHeight = context.getCanvas().clientHeight;
         if (viewportHeight !== this._viewportHeight) {
             this._viewportHeight = viewportHeight;
-            this._quad.setRectangle(new BoundingRectangle(this._rectangle.x, viewportHeight - canvasHeight - this._rectangle.y, canvasWidth, canvasHeight));
+            var rect = this._quad.rectangle;
+            rect.x = this._rectangle.x;
+            rect.y = viewportHeight - canvasHeight - this._rectangle.y;
+            rect.width = canvasWidth;
+            rect.height = canvasHeight;
         }
 
         this._quad.update(context, frameState, commandList);

data/app/assets/javascripts/Scene/Tile.js

@@ -652,18 +652,23 @@ define([
         return parent.terrainData.isChildAvailable(parent.x, parent.y, tile.x, tile.y);
     }
 
-    var waterMaskDataByContext = {};
-
     function createWaterMaskTexture(context, waterMask) {
         var result;
 
-        var contextID = context.getId();
-        var waterMaskData = waterMaskDataByContext[contextID];
+        var waterMaskData = context.cache.tile_waterMaskData;
         if (typeof waterMaskData === 'undefined') {
-            waterMaskData = waterMaskDataByContext[contextID] = {
+            waterMaskData = context.cache.tile_waterMaskData = {
                     allWaterTexture : undefined,
                     allLandTexture : undefined,
-                    sampler : undefined
+                    sampler : undefined,
+                    destroy : function() {
+                        if (typeof this.allWaterTexture !== 'undefined') {
+                            this.allWaterTexture.destroy();
+                        }
+                        if (typeof this.allLandTexture !== 'undefined') {
+                            this.allLandTexture.destroy();
+                        }
+                    }
             };
         }
 

data/app/assets/javascripts/Scene/ViewportQuad.js

@@ -41,14 +41,14 @@ define([
      * @alias ViewportQuad
      * @constructor
      *
-     * @param {BoundingRectangle} rectangle The BoundingRectangle defining the quad's position within the viewport.
+     * @param {BoundingRectangle} [rectangle] The {@link BoundingRectangle} defining the quad's position within the viewport.
+     * @param {Material} [material] The {@link Material} defining the surface appearance of the viewport quad.
      *
      * @example
-     * var viewportQuad = new ViewportQuad();
-     * var viewportQuad = new BoundingRectangle(0, 0, 80, 40);
+     * var viewportQuad = new ViewportQuad(new BoundingRectangle(0, 0, 80, 40));
      * viewportQuad.material.uniforms.color = new Color(1.0, 0.0, 0.0, 1.0);
      */
-    var ViewportQuad = function(rectangle) {
+    var ViewportQuad = function(rectangle, material) {
 
         this._va = undefined;
         this._overlayCommand = new DrawCommand();
@@ -66,6 +66,10 @@ define([
         */
         this.show = true;
 
+        if (typeof rectangle === 'undefined') {
+            rectangle = new BoundingRectangle();
+        }
+
         /**
          * The BoundingRectangle defining the quad's position within the viewport.
          *
@@ -74,8 +78,12 @@ define([
          * @example
          * viewportQuad.rectangle = new BoundingRectangle(0, 0, 80, 40);
          */
-        this.rectangle = new BoundingRectangle(0, 0, 10, 10);
+        this.rectangle = BoundingRectangle.clone(rectangle);
 
+        if (typeof material === 'undefined') {
+            material = Material.fromType(undefined, Material.ColorType);
+            material.uniforms.color = new Color(1.0, 1.0, 1.0, 1.0);
+        }
 
         /**
          * The surface appearance of the viewport quad.  This can be one of several built-in {@link Material} objects or a custom material, scripted with
@@ -95,8 +103,7 @@ define([
          *
          * @see <a href='https://github.com/AnalyticalGraphicsInc/cesium/wiki/Fabric'>Fabric</a>
          */
-        this.material = Material.fromType(undefined, Material.ColorType);
-        this.material.uniforms.color = new Color(1.0, 1.0, 1.0, 1.0);
+        this.material = material;
         this._material = undefined;
     };
 
@@ -105,17 +112,12 @@ define([
         textureCoordinates : 1
     };
 
-    var vertexArrayCache = {};
-
     function getVertexArray(context) {
         // Per-context cache for viewport quads
-        var c = vertexArrayCache[context.getId()];
-
-        if (typeof c !== 'undefined' &&
-            typeof c.vertexArray !== 'undefined') {
+        var vertexArray = context.cache.viewportQuad_vertexArray;
 
-            ++c.referenceCount;
-            return c;
+        if (typeof vertexArray !== 'undefined') {
+            return vertexArray;
         }
 
         var mesh = {
@@ -144,30 +146,14 @@ define([
             }
         };
 
-        var va = context.createVertexArrayFromMesh({
+        vertexArray = context.createVertexArrayFromMesh({
             mesh : mesh,
             attributeIndices : attributeIndices,
             bufferUsage : BufferUsage.STATIC_DRAW
         });
 
-        var cachedVA = {
-            vertexArray : va,
-            referenceCount : 1,
-
-            release : function() {
-                if (typeof this.vertexArray !== 'undefined' &&
-                    --this.referenceCount === 0) {
-
-                    // TODO: Schedule this for a few hundred frames later so we don't thrash the cache
-                    this.vertexArray = this.vertexArray.destroy();
-                }
-
-                return undefined;
-            }
-        };
-
-        vertexArrayCache[context.getId()] = cachedVA;
-        return cachedVA;
+        context.cache.viewportQuad_vertexArray = vertexArray;
+        return vertexArray;
     }
 
     /**
@@ -194,7 +180,7 @@ define([
 
         if (typeof this._va === 'undefined') {
             this._va = getVertexArray(context);
-            this._overlayCommand.vertexArray = this._va.vertexArray;
+            this._overlayCommand.vertexArray = this._va;
             this._overlayCommand.renderState = context.createRenderState({
                 blending : BlendingState.ALPHA_BLEND
             });
@@ -260,7 +246,6 @@ define([
      * quad = quad && quad.destroy();
      */
     ViewportQuad.prototype.destroy = function() {
-        this._va = this._va && this._va.release();
         this._overlayCommand.shaderProgram = this._overlayCommand.shaderProgram && this._overlayCommand.shaderProgram.release();
 
         return destroyObject(this);

data/app/assets/javascripts/Shaders/BillboardCollectionFS.js

@@ -3,29 +3,33 @@
 define(function() {
     "use strict";
     return "uniform sampler2D u_atlas;\n\
+\n\
 varying vec2 v_textureCoordinates;\n\
+\n\
 #ifdef RENDER_FOR_PICK\n\
 varying vec4 v_pickColor;\n\
 #else\n\
 varying vec4 v_color;\n\
 #endif\n\
+\n\
 void main()\n\
 {\n\
 #ifdef RENDER_FOR_PICK\n\
-vec4 vertexColor = vec4(1.0, 1.0, 1.0, 1.0);\n\
+    vec4 vertexColor = vec4(1.0, 1.0, 1.0, 1.0);\n\
 #else\n\
-vec4 vertexColor = v_color;\n\
+    vec4 vertexColor = v_color;\n\
 #endif\n\
-vec4 color = texture2D(u_atlas, v_textureCoordinates) * vertexColor;\n\
-if (color.a == 0.0)\n\
-{\n\
-discard;\n\
-}\n\
+    \n\
+    vec4 color = texture2D(u_atlas, v_textureCoordinates) * vertexColor;\n\
+    if (color.a == 0.0)\n\
+    {\n\
+        discard;\n\
+    }\n\
+    \n\
 #ifdef RENDER_FOR_PICK\n\
-gl_FragColor = v_pickColor;\n\
+    gl_FragColor = v_pickColor;\n\
 #else\n\
-gl_FragColor = color;\n\
+    gl_FragColor = color;\n\
 #endif\n\
-}\n\
-";
+}";
 });