cesium 0.15.0 → 0.16.0

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

@@ -1,5 +1,8 @@
 /*global define*/
-define(function() {
+define([
+        '../Core/defaultValue'
+    ], function(
+        defaultValue) {
     "use strict";
 
     /**
@@ -10,7 +13,7 @@ define(function() {
      * @see DynamicProperty
      * @see CzmlCartesian2
      * @see CzmlCartesian3
-     * @see CzmlCartographic
+     * @see CzmlPosition
      * @see CzmlColor
      * @see CzmlHorizontalOrigin
      * @see CzmlLabelStyle
@@ -29,8 +32,7 @@ define(function() {
          * @param {Object} czmlInterval The CZML interval to unwrap.
          */
         unwrapInterval : function(czmlInterval) {
-            var result = czmlInterval.string;
-            return typeof result === 'undefined' ? czmlInterval : result;
+            return defaultValue(czmlInterval.string, czmlInterval);
         },
 
         /**

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

@@ -18,7 +18,7 @@ define([
      * @see CzmlBoolean
      * @see CzmlCartesian2
      * @see CzmlCartesian3
-     * @see CzmlCartographic
+     * @see CzmlPosition
      * @see CzmlColor
      * @see CzmlHorizontalOrigin
      * @see CzmlLabelStyle

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

@@ -25,7 +25,7 @@ define([
      * @see CzmlBoolean
      * @see CzmlCartesian2
      * @see CzmlCartesian3
-     * @see CzmlCartographic
+     * @see CzmlPosition
      * @see CzmlColor
      * @see CzmlHorizontalOrigin
      * @see CzmlLabelStyle

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

@@ -17,7 +17,7 @@ define([
      * @see CzmlBoolean
      * @see CzmlCartesian2
      * @see CzmlCartesian3
-     * @see CzmlCartographic
+     * @see CzmlPosition
      * @see CzmlColor
      * @see CzmlHorizontalOrigin
      * @see CzmlLabelStyle

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

@@ -1,8 +1,10 @@
 /*global define*/
 define([
+        '../Core/defaultValue',
         '../Scene/VerticalOrigin'
-       ], function(
-         VerticalOrigin) {
+    ], function(
+        defaultValue,
+        VerticalOrigin) {
     "use strict";
 
     /**
@@ -15,7 +17,7 @@ define([
      * @see CzmlBoolean
      * @see CzmlCartesian2
      * @see CzmlCartesian3
-     * @see CzmlCartographic
+     * @see CzmlPosition
      * @see CzmlColor
      * @see CzmlHorizontalOrigin
      * @see CzmlLabelStyle
@@ -33,8 +35,7 @@ define([
          * @param {Object} czmlInterval The CZML interval to unwrap.
          */
         unwrapInterval : function(czmlInterval) {
-            var result = czmlInterval.verticalOrigin;
-            return typeof result === 'undefined' ? czmlInterval : result;
+            return defaultValue(czmlInterval.verticalOrigin, czmlInterval);
         },
 
         /**

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

@@ -0,0 +1,202 @@
+/*global define*/
+define([
+        './DynamicProperty',
+        './CzmlColor',
+        './CzmlNumber',
+        '../Scene/Material'
+    ], function(
+         DynamicProperty,
+         CzmlColor,
+         CzmlNumber,
+         Material) {
+    "use strict";
+
+    /**
+     * A utility class for processing CZML grid materials.
+     * @alias DynamicGridMaterial
+     * @constructor
+     */
+    var DynamicGridMaterial = function() {
+        /**
+         * A DynamicProperty of type CzmlColor which determines the grid's color.
+         * @type DynamicProperty
+         */
+        this.color = undefined;
+
+        /**
+         * A DynamicProperty of type CzmlNumber which determines the grid cells alpha value, when combined with the color alpha.
+         * @type DynamicProperty
+         */
+        this.cellAlpha = undefined;
+
+        /**
+         * A DynamicProperty of type CzmlNumber which determines the number of horizontal rows.
+         * @type DynamicProperty
+         */
+        this.rowCount = undefined;
+
+        /**
+         * A DynamicProperty of type CzmlNumber which determines the number of vertical columns.
+         * @type DynamicProperty
+         */
+        this.columnCount = undefined;
+
+        /**
+         * A DynamicProperty of type CzmlNumber which determines the width of each horizontal line, in pixels.
+         * @type DynamicProperty
+         */
+        this.rowThickness = undefined;
+
+        /**
+         * A DynamicProperty of type CzmlNumber which determines the width of each vertical line, in pixels.
+         * @type DynamicProperty
+         */
+        this.columnThickness = undefined;
+    };
+
+    /**
+     * Returns true if the provided CZML interval contains grid material data.
+     * @param czmlInterval The CZML interval to check.
+     * @returns {Boolean} true if the interval contains CZML grid material data, false otherwise.
+     */
+    DynamicGridMaterial.isMaterial = function(czmlInterval) {
+        return typeof czmlInterval.grid !== 'undefined';
+    };
+
+    /**
+     * Returns true if the provided CZML interval contains grid material data.
+     * @param czmlInterval The CZML interval to check.
+     * @returns {Boolean} true if the interval contains CZML grid material data, false otherwise.
+     */
+    DynamicGridMaterial.prototype.isMaterial = DynamicGridMaterial.isMaterial;
+
+    /**
+     * Provided a CZML interval containing grid material data, processes the
+     * interval into a new or existing instance of this class.
+     *
+     * @param {Object} czmlInterval The interval to process.
+     * @param {String} [sourceUri] The originating url of the CZML being processed.
+     * @returns The modified existingMaterial parameter or a new DynamicGridMaterial instance if existingMaterial was undefined or not a DynamicGridMaterial.
+     */
+    DynamicGridMaterial.prototype.processCzmlIntervals = function(czmlInterval, sourceUri) {
+        var materialData = czmlInterval.grid;
+        if (typeof materialData === 'undefined') {
+            return;
+        }
+
+        if (typeof materialData.color !== 'undefined') {
+            var color = this.color;
+            if (typeof color === 'undefined') {
+                this.color = color = new DynamicProperty(CzmlColor);
+            }
+            color.processCzmlIntervals(materialData.color, undefined, sourceUri);
+        }
+
+        if (typeof materialData.cellAlpha !== 'undefined') {
+            var cellAlpha = this.cellAlpha;
+            if (typeof cellAlpha === 'undefined') {
+                this.cellAlpha = cellAlpha = new DynamicProperty(CzmlNumber);
+            }
+            cellAlpha.processCzmlIntervals(materialData.cellAlpha, undefined, sourceUri);
+        }
+
+        if (typeof materialData.rowCount !== 'undefined') {
+            var rowCount = this.rowCount;
+            if (typeof rowCount === 'undefined') {
+                this.rowCount = rowCount = new DynamicProperty(CzmlNumber);
+            }
+            rowCount.processCzmlIntervals(materialData.rowCount, undefined, sourceUri);
+        }
+
+        if (typeof materialData.columnCount !== 'undefined') {
+            var columnCount = this.columnCount;
+            if (typeof columnCount === 'undefined') {
+                this.columnCount = columnCount = new DynamicProperty(CzmlNumber);
+            }
+            columnCount.processCzmlIntervals(materialData.columnCount, undefined, sourceUri);
+        }
+
+        if (typeof materialData.rowThickness !== 'undefined') {
+            var rowThickness = this.rowThickness;
+            if (typeof rowThickness === 'undefined') {
+                this.rowThickness = rowThickness = new DynamicProperty(CzmlNumber);
+            }
+            rowThickness.processCzmlIntervals(materialData.rowThickness, undefined, sourceUri);
+        }
+
+        if (typeof materialData.columnThickness !== 'undefined') {
+            var columnThickness = this.columnThickness;
+            if (typeof columnThickness === 'undefined') {
+                this.columnThickness = columnThickness = new DynamicProperty(CzmlNumber);
+            }
+            columnThickness.processCzmlIntervals(materialData.columnThickness, undefined, sourceUri);
+        }
+    };
+
+    /**
+     * Gets an Grid Material that represents this dynamic material at the provided time.
+     *
+     * @param {JulianDate} time The desired time.
+     * @param {Context} context The context in which this material exists.
+     * @param {Material} [existingMaterial] An existing material to be modified.  If the material is undefined or not an Grid Material, a new instance is created.
+     * @returns The modified existingMaterial parameter or a new Grid Material instance if existingMaterial was undefined or not a Grid Material.
+     */
+    DynamicGridMaterial.prototype.getValue = function(time, context, existingMaterial) {
+        if (typeof existingMaterial === 'undefined' || (existingMaterial.type !== Material.GridType)) {
+            existingMaterial = Material.fromType(context, Material.GridType);
+        }
+
+        var property = this.color;
+        if (typeof property !== 'undefined') {
+            property.getValue(time, existingMaterial.uniforms.color);
+        }
+
+        property = this.cellAlpha;
+        if (typeof property !== 'undefined') {
+            var cellAlpha = property.getValue(time);
+            if (typeof cellAlpha !== 'undefined') {
+                existingMaterial.uniforms.cellAlpha = cellAlpha;
+            }
+        }
+
+        var lineCount = existingMaterial.uniforms.lineCount;
+
+        property = this.rowCount;
+        if (typeof property !== 'undefined') {
+            var rowCount = property.getValue(time);
+            if (typeof rowCount !== 'undefined') {
+                lineCount.x = rowCount;
+            }
+        }
+
+        property = this.columnCount;
+        if (typeof property !== 'undefined') {
+            var columnCount = property.getValue(time);
+            if (typeof columnCount !== 'undefined') {
+                lineCount.y = columnCount;
+            }
+        }
+
+        var lineThickness = existingMaterial.uniforms.lineThickness;
+
+        property = this.rowThickness;
+        if (typeof property !== 'undefined') {
+            var rowThickness = property.getValue(time);
+            if (typeof rowThickness !== 'undefined') {
+                lineThickness.x = rowThickness;
+            }
+        }
+
+        property = this.columnThickness;
+        if (typeof property !== 'undefined') {
+            var columnThickness = property.getValue(time);
+            if (typeof columnThickness !== 'undefined') {
+                lineThickness.y = columnThickness;
+            }
+        }
+
+        return existingMaterial;
+    };
+
+    return DynamicGridMaterial;
+});

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

@@ -5,17 +5,19 @@ define([
         '../Core/TimeIntervalCollection',
         '../Core/Iso8601',
         './DynamicColorMaterial',
-        './DynamicImageMaterial'
+        './DynamicImageMaterial',
+        './DynamicGridMaterial'
     ], function(
         JulianDate,
         TimeInterval,
         TimeIntervalCollection,
         Iso8601,
         DynamicColorMaterial,
-        DynamicImageMaterial) {
+        DynamicImageMaterial,
+        DynamicGridMaterial) {
     "use strict";
 
-    var potentialMaterials = [DynamicColorMaterial, DynamicImageMaterial];
+    var potentialMaterials = [DynamicColorMaterial, DynamicImageMaterial, DynamicGridMaterial];
 
     /**
      * A dynamic property which stores data for multiple types of materials

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

@@ -180,9 +180,8 @@ define([
         }
 
         var availabilityValue = availability.contains(time);
-
         this._cachedAvailabilityDate = JulianDate.clone(time, this._cachedAvailabilityDate);
-        this._cachedAvailabilityValue = availability.contains(time);
+        this._cachedAvailabilityValue = availabilityValue;
 
         return availabilityValue;
     };

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

@@ -7,6 +7,7 @@ define([
         '../Core/Color',
         '../Core/Transforms',
         '../Core/ReferenceFrame',
+        '../Scene/Material',
         '../Scene/SceneMode',
         '../Scene/PolylineCollection'
        ], function(
@@ -17,6 +18,7 @@ define([
          Color,
          Transforms,
          ReferenceFrame,
+         Material,
          SceneMode,
          PolylineCollection) {
     "use strict";
@@ -62,7 +64,7 @@ define([
         var sampleStop;
         var showProperty = dynamicPath.show;
         var pathVisualizerIndex = dynamicObject._pathVisualizerIndex;
-        var show = (typeof showProperty === 'undefined' || showProperty.getValue(time));
+        var show = typeof showProperty === 'undefined' || showProperty.getValue(time);
 
         //While we want to show the path, there may not actually be anything to show
         //depending on lead/trail settings.  Compute the interval of the path to
@@ -121,6 +123,7 @@ define([
             return;
         }
 
+        var uniforms;
         if (typeof pathVisualizerIndex === 'undefined') {
             var unusedIndexes = this._unusedIndexes;
             var length = unusedIndexes.length;
@@ -135,12 +138,19 @@ define([
             polyline.dynamicObject = dynamicObject;
 
             // CZML_TODO Determine official defaults
-            polyline.setColor(Color.WHITE);
-            polyline.setOutlineColor(Color.BLACK);
-            polyline.setOutlineWidth(1);
             polyline.setWidth(1);
+            var material = polyline.getMaterial();
+            if (typeof material === 'undefined' || (material.type !== Material.PolylineOutlineType)) {
+                material = Material.fromType(this._scene.getContext(), Material.PolylineOutlineType);
+                polyline.setMaterial(material);
+            }
+            uniforms = material.uniforms;
+            Color.clone(Color.WHITE, uniforms.color);
+            Color.clone(Color.BLACK, uniforms.outlineColor);
+            uniforms.outlineWidth = 0;
         } else {
             polyline = this._polylineCollection.get(pathVisualizerIndex);
+            uniforms = polyline.getMaterial().uniforms;
         }
 
         polyline.setShow(true);
@@ -155,20 +165,17 @@ define([
 
         property = dynamicPath.color;
         if (typeof property !== 'undefined') {
-            polyline.setColor(property.getValue(time, polyline.getColor()));
+            uniforms.color = property.getValue(time, uniforms.color);
         }
 
         property = dynamicPath.outlineColor;
         if (typeof property !== 'undefined') {
-            polyline.setOutlineColor(property.getValue(time, polyline.getOutlineColor()));
+            uniforms.outlineColor = property.getValue(time, uniforms.outlineColor);
         }
 
         property = dynamicPath.outlineWidth;
         if (typeof property !== 'undefined') {
-            var outlineWidth = property.getValue(time);
-            if (typeof outlineWidth !== 'undefined') {
-                polyline.setOutlineWidth(outlineWidth);
-            }
+            uniforms.outlineWidth = property.getValue(time, uniforms.outlineWidth);
         }
 
         property = dynamicPath.width;
@@ -227,10 +234,7 @@ define([
             throw new DeveloperError('scene is required.');
         }
         this._scene = scene;
-        this._updaters = {
-            FIXED : new PolylineUpdater(scene, ReferenceFrame.FIXED),
-            INERTIAL : new PolylineUpdater(scene, ReferenceFrame.INERTIAL)
-        };
+        this._updaters = {};
         this._dynamicObjectCollection = undefined;
         this.setDynamicObjectCollection(dynamicObjectCollection);
     };
@@ -410,4 +414,4 @@ define([
     };
 
     return DynamicPathVisualizer;
-});
+});

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

@@ -1,16 +1,18 @@
 /*global define*/
 define([
-        '../Core/Event',
-        '../Core/DeveloperError',
-        '../Core/destroyObject',
         '../Core/Color',
+        '../Core/defaultValue',
+        '../Core/destroyObject',
+        '../Core/DeveloperError',
+        '../Core/Event',
         '../Scene/BillboardCollection',
         '../Renderer/TextureAtlasBuilder'
        ], function(
-         Event,
-         DeveloperError,
-         destroyObject,
          Color,
+         defaultValue,
+         destroyObject,
+         DeveloperError,
+         Event,
          BillboardCollection,
          TextureAtlasBuilder) {
     "use strict";
@@ -267,10 +269,10 @@ define([
         }
 
         if (needRedraw) {
-            var cssColor = typeof billboard._visualizerColor !== 'undefined' ? billboard._visualizerColor.toCssColorString() : '#FFFFFF';
-            var cssOutlineColor = typeof billboard._visualizerOutlineColor !== 'undefined' ? billboard._visualizerOutlineColor.toCssColorString() : '#000000';
-            var cssPixelSize = typeof billboard._visualizerPixelSize !== 'undefined' ? billboard._visualizerPixelSize : 3;
-            var cssOutlineWidth = typeof billboard._visualizerOutlineWidth !== 'undefined' ? billboard._visualizerOutlineWidth : 2;
+            var cssColor = defaultValue(billboard._visualizerColor, Color.WHITE).toCssColorString();
+            var cssOutlineColor = defaultValue(billboard._visualizerOutlineColor, Color.BLACK).toCssColorString();
+            var cssPixelSize = defaultValue(billboard._visualizerPixelSize, 3);
+            var cssOutlineWidth = defaultValue(billboard._visualizerOutlineWidth, 2);
             var textureId = JSON.stringify([cssColor, cssPixelSize, cssOutlineColor, cssOutlineWidth]);
 
             this._textureAtlasBuilder.addTextureFromFunction(textureId, function(id, loadedCallback) {