cesium 0.21 → 0.21.1

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

@@ -16,6 +16,14 @@ define(['Core/DeveloperError'], function(
      */
     var DataSource = throwInstantiationError;
 
+    /**
+     * Gets the name of this data source.
+     * @memberof DataSource
+     *
+     * @returns {String} The name.
+     */
+    DataSource.prototype.getName = throwInstantiationError;
+
     /**
      * Gets an event that will be raised when non-time-Varying data changes
      * or if the return value of getIsTimeVarying changes.

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

@@ -27,6 +27,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this._eyeOffset = undefined;
         this._pixelOffset = undefined;
         this._show = undefined;
+        this._scaleByDistance = undefined;
+        this._translucencyByDistance = undefined;
         this._propertyChanged = new Event();
     };
 
@@ -134,7 +136,15 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          * @memberof DynamicBillboard.prototype
          * @type {Property}
          */
-        nearFarScalar : createDynamicPropertyDescriptor('nearFarScalar', '_nearFarScalar')
+        scaleByDistance : createDynamicPropertyDescriptor('scaleByDistance', '_scaleByDistance'),
+
+        /**
+         * Gets or sets the {@link NearFarScalar} {@link Property} used to set translucency based on distance.
+         * If undefined, a constant size is used.
+         * @memberof DynamicBillboard.prototype
+         * @type {Property}
+         */
+        translucencyByDistance : createDynamicPropertyDescriptor('translucencyByDistance', '_translucencyByDistance')
     });
 
     /**
@@ -160,7 +170,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         result.verticalOrigin = this._verticalOrigin;
         result.width = this._width;
         result.height = this._height;
-        result.nearFarScalar = this._nearFarScalar;
+        result.scaleByDistance = this._scaleByDistance;
+        result.translucencyByDistance = this._translucencyByDistance;
         return result;
     };
 
@@ -188,7 +199,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this.verticalOrigin = defaultValue(this._verticalOrigin, source._verticalOrigin);
         this.width = defaultValue(this._width, source._width);
         this.height = defaultValue(this._height, source._height);
-        this.nearFarScalar = defaultValue(this._nearFarScalar, source._nearFarScalar);
+        this.scaleByDistance = defaultValue(this._scaleByDistance, source._scaleByDistance);
+        this.translucencyByDistance = defaultValue(this._translucencyByDistance, source._translucencyByDistance);
     };
 
     return DynamicBillboard;

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

@@ -341,10 +341,15 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Color
             billboard.setHeight(property.getValue(time));
         }
 
-        property = dynamicBillboard._nearFarScalar;
+        property = dynamicBillboard._scaleByDistance;
         if (defined(property)) {
             billboard.setScaleByDistance(property.getValue(time));
         }
+
+        property = dynamicBillboard._translucencyByDistance;
+        if (defined(property)) {
+            billboard.setTranslucencyByDistance(property.getValue(time));
+        }
     }
 
     DynamicBillboardVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, added, dynamicObjects) {

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

@@ -269,7 +269,7 @@ define(['Core/Cartesian3', 'Core/Color', 'Core/defined', 'Core/destroyObject', '
 
             // CZML_TODO Determine official defaults
             cone.material = Material.fromType(Material.ColorType);
-            cone.intersectionColor = Color.YELLOW.clone();
+            cone.intersectionColor = Color.clone(Color.YELLOW);
             cone.intersectionWidth = 5.0;
             cone.radius = Number.POSITIVE_INFINITY;
             cone.showIntersection = true;

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

@@ -26,6 +26,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this._pixelOffset = undefined;
         this._scale = undefined;
         this._show = undefined;
+        this._translucencyByDistance = undefined;
         this._propertyChanged = new Event();
     };
 
@@ -123,7 +124,15 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          * @memberof DynamicLabel.prototype
          * @type {Property}
          */
-        show : createDynamicPropertyDescriptor('show', '_show')
+        show : createDynamicPropertyDescriptor('show', '_show'),
+
+        /**
+         * Gets or sets the {@link NearFarScalar} {@link Property} used to set translucency based on distance.
+         * If undefined, a constant size is used.
+         * @memberof DynamicLabel.prototype
+         * @type {Property}
+         */
+        translucencyByDistance : createDynamicPropertyDescriptor('translucencyByDistance', '_translucencyByDistance')
     });
 
     /**
@@ -149,6 +158,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         result.verticalOrigin = this.verticalOrigin;
         result.eyeOffset = this.eyeOffset;
         result.pixelOffset = this.pixelOffset;
+        result.translucencyByDistance = this._translucencyByDistance;
         return result;
     };
 
@@ -176,6 +186,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this.verticalOrigin = defaultValue(this.verticalOrigin, source.verticalOrigin);
         this.eyeOffset = defaultValue(this.eyeOffset, source.eyeOffset);
         this.pixelOffset = defaultValue(this.pixelOffset, source.pixelOffset);
+        this.translucencyByDistance = defaultValue(this._translucencyByDistance, source._translucencyByDistance);
     };
 
     return DynamicLabel;

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

@@ -320,6 +320,11 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Color
                 label.setVerticalOrigin(verticalOrigin);
             }
         }
+
+        property = dynamicLabel._translucencyByDistance;
+        if (defined(property)) {
+            label.setTranslucencyByDistance(property.getValue(time));
+        }
     }
 
     DynamicLabelVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, added, dynamicObjects) {

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

@@ -21,7 +21,7 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
      * @alias DynamicObject
      * @constructor
      *
-     * @param {Object} [id] A unique identifier for this object.  If no id is provided, a GUID is generated.
+     * @param {String} [id] A unique identifier for this object.  If no id is provided, a GUID is generated.
      *
      * @see Property
      * @see DynamicObjectCollection
@@ -43,6 +43,8 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
         this._ellipsoid = undefined;
         this._ellipse = undefined;
         this._label = undefined;
+        this._name = undefined;
+        this._parent = undefined;
         this._path = undefined;
         this._point = undefined;
         this._polygon = undefined;
@@ -53,7 +55,7 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
         this._viewFrom = undefined;
 
         this._propertyChanged = new Event();
-        this._propertyNames = ['availability', 'position', 'orientation', 'billboard', //
+        this._propertyNames = ['parent', 'position', 'orientation', 'billboard', //
                                'cone', 'ellipsoid', 'ellipse', 'label', 'path', 'point', 'polygon', //
                                'polyline', 'pyramid', 'vertexPositions', 'vector', 'viewFrom'];
     };
@@ -82,13 +84,32 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
         /**
          * Gets the unique ID associated with this object.
          * @memberof DynamicObject.prototype
-         * @type {Object}
+         * @type {String}
          */
         id : {
             get : function() {
                 return this._id;
             }
         },
+        /**
+         * Gets or sets the name of the object.  The name is intended for end-user
+         * consumption and does not need to be unique.
+         * @memberof DynamicObject.prototype
+         * @type {String}
+         */
+        name : {
+            configurable : false,
+            get : function() {
+                return this._name;
+            },
+            set : function(value) {
+                var oldValue = this._name;
+                if (oldValue !== value) {
+                    this._name = value;
+                    this._propertyChanged.raiseEvent(this, 'name', value, oldValue);
+                }
+            }
+        },
         /**
          * The availability TimeInterval, if any, associated with this object.
          * If availability is undefined, it is assumed that this object's
@@ -149,6 +170,12 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
          * @type {DynamicLabel}
          */
         label : createDynamicPropertyDescriptor('label', '_label'),
+        /**
+         * Gets or sets the parent object.
+         * @memberof DynamicObject.prototype
+         * @type {DynamicObject}
+         */
+        parent : createDynamicPropertyDescriptor('parent', '_parent'),
         /**
          * Gets or sets the path.
          * @memberof DynamicObject.prototype
@@ -279,30 +306,30 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
         if (!defined(source)) {
             throw new DeveloperError('source is required.');
         }
+
+        //Name and availability are not Property objects and are currently handled differently.
+        this.name = defaultValue(this.name, source.name);
         this.availability = defaultValue(source.availability, this.availability);
 
         var propertyNames = this._propertyNames;
         var propertyNamesLength = propertyNames.length;
         for ( var i = 0; i < propertyNamesLength; i++) {
             var name = propertyNames[i];
-            //TODO Remove this once availability is refactored.
-            if (name !== 'availability') {
-                var targetProperty = this[name];
-                var sourceProperty = source[name];
-                if (defined(sourceProperty)) {
-                    if (defined(targetProperty)) {
-                        if (defined(targetProperty.merge)) {
-                            targetProperty.merge(sourceProperty);
-                        }
-                    } else if (defined(sourceProperty.merge) && defined(sourceProperty.clone)) {
-                        this[name] = sourceProperty.clone();
-                    } else {
-                        this[name] = sourceProperty;
+            var targetProperty = this[name];
+            var sourceProperty = source[name];
+            if (defined(sourceProperty)) {
+                if (defined(targetProperty)) {
+                    if (defined(targetProperty.merge)) {
+                        targetProperty.merge(sourceProperty);
                     }
+                } else if (defined(sourceProperty.merge) && defined(sourceProperty.clone)) {
+                    this[name] = sourceProperty.clone();
+                } else {
+                    this[name] = sourceProperty;
                 }
             }
         }
     };
 
     return DynamicObject;
-});
+});

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

@@ -164,7 +164,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Math',
             updateColumbusCartesian4.z = projectedPosition.y;
 
             var tranform = camera.transform;
-            tranform.setColumn(3, updateColumbusCartesian4, tranform);
+            Matrix4.setColumn(tranform, 3, updateColumbusCartesian4, tranform);
 
             var controller = that._screenSpaceCameraController;
             controller.enableTranslate = false;
@@ -209,9 +209,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Math',
                 first2dUp.x = 0.0;
                 first2dUp.y = 0.0;
 
-                var theta = startTheta - endTheta;
+                var theta = endTheta - startTheta;
                 var rotation = Quaternion.fromAxisAngle(Cartesian3.UNIT_Z, theta, update3DControllerQuaternion);
-                Matrix3.fromQuaternion(rotation, update3DControllerMatrix3).multiplyByVector(offset, offset);
+                Matrix3.multiplyByVector(Matrix3.fromQuaternion(rotation, update3DControllerMatrix3), offset, offset);
             }
             Cartesian3.multiplyByScalar(Cartesian3.normalize(offset, offset), that._lastDistance, offset);
             camera.controller.lookAt(offset, Cartesian3.ZERO, Cartesian3.UNIT_Z);

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

@@ -19,6 +19,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this._outlineColor = undefined;
         this._outlineWidth = undefined;
         this._show = undefined;
+        this._scaleByDistance = undefined;
         this._propertyChanged = new Event();
     };
 
@@ -67,7 +68,15 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          * @memberof DynamicPoint.prototype
          * @type {Property}
          */
-        show : createDynamicPropertyDescriptor('show', '_show')
+        show : createDynamicPropertyDescriptor('show', '_show'),
+
+        /**
+         * Gets or sets the {@link NearFarScalar} {@link Property} used to scale billboards based on distance.
+         * If undefined, a constant size is used.
+         * @memberof DynamicBillboard.prototype
+         * @type {Property}
+         */
+        scaleByDistance : createDynamicPropertyDescriptor('scaleByDistance', '_scaleByDistance')
     });
 
     /**
@@ -86,6 +95,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         result.outlineColor = this.outlineColor;
         result.outlineWidth = this.outlineWidth;
         result.show = this.show;
+        result.scaleByDistance = this.scaleByDistance;
         return result;
     };
 
@@ -106,6 +116,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
         this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
         this.show = defaultValue(this.show, source.show);
+        this.scaleByDistance = defaultValue(this.scaleByDistance, source.scaleByDistance);
     };
 
     return DynamicPoint;

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

@@ -165,6 +165,7 @@ define(['Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/destroyObject',
     var color;
     var position;
     var outlineColor;
+    var scaleByDistance;
     function updateObject(dynamicPointVisualizer, time, dynamicObject) {
         var dynamicPoint = dynamicObject._point;
         if (!defined(dynamicPoint)) {
@@ -208,8 +209,8 @@ define(['Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/destroyObject',
             billboard.dynamicObject = dynamicObject;
 
             // CZML_TODO Determine official defaults
-            billboard._visualizerColor = Color.WHITE.clone(billboard._visualizerColor);
-            billboard._visualizerOutlineColor = Color.BLACK.clone(billboard._visualizerOutlineColor);
+            billboard._visualizerColor = Color.clone(Color.WHITE, billboard._visualizerColor);
+            billboard._visualizerOutlineColor = Color.clone(Color.BLACK, billboard._visualizerOutlineColor);
             billboard._visualizerOutlineWidth = 0;
             billboard._visualizerPixelSize = 1;
             needRedraw = true;
@@ -260,6 +261,14 @@ define(['Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/destroyObject',
             }
         }
 
+        property = dynamicPoint._scaleByDistance;
+        if (defined(property)) {
+            scaleByDistance = property.getValue(time, scaleByDistance);
+            if (defined(scaleByDistance)) {
+                billboard.setScaleByDistance(scaleByDistance);
+            }
+        }
+
         if (needRedraw) {
             var cssColor = defaultValue(billboard._visualizerColor, Color.WHITE).toCssColorString();
             var cssOutlineColor = defaultValue(billboard._visualizerOutlineColor, Color.BLACK).toCssColorString();

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

@@ -14,10 +14,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
      * @constructor
      */
     var DynamicPolyline = function() {
-        this._color = undefined;
-        this._outlineColor = undefined;
-        this._outlineWidth = undefined;
         this._show = undefined;
+        this._material = undefined;
         this._width = undefined;
         this._propertyChanged = new Event();
     };
@@ -35,32 +33,18 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         },
 
         /**
-         * Gets or sets the {@link Color} {@link Property} specifying the the line's color.
-         * @memberof DynamicPolyline.prototype
-         * @type {Property}
-         */
-        color : createDynamicPropertyDescriptor('color', '_color'),
-
-        /**
-         * Gets or sets the {@link Color} {@link Property} specifying the the line's outline color.
-         * @memberof DynamicPolyline.prototype
-         * @type {Property}
-         */
-        outlineColor : createDynamicPropertyDescriptor('outlineColor', '_outlineColor'),
-
-        /**
-         * Gets or sets the numeric {@link Property} specifying the the line's outline width.
+         * Gets or sets the boolean {@link Property} specifying the line's visibility.
          * @memberof DynamicPolyline.prototype
          * @type {Property}
          */
-        outlineWidth : createDynamicPropertyDescriptor('outlineWidth', '_outlineWidth'),
+        show : createDynamicPropertyDescriptor('show', '_show'),
 
         /**
+         * Gets or sets the {@link MaterialProperty} specifying the appearance of the polyline.
          * @memberof DynamicPolyline.prototype
-         * Gets or sets the boolean {@link Property} specifying the line's visibility.
-         * @type {Property}
+         * @type {MaterialProperty}
          */
-        show : createDynamicPropertyDescriptor('show', '_show'),
+        material : createDynamicPropertyDescriptor('material', '_material'),
 
         /**
          * Gets or sets the numeric {@link Property} specifying the the line's width.
@@ -81,11 +65,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         if (!defined(result)) {
             result = new DynamicPolyline();
         }
-        result.color = this.color;
-        result.width = this.width;
-        result.outlineColor = this.outlineColor;
-        result.outlineWidth = this.outlineWidth;
         result.show = this.show;
+        result.material = this.material;
+        result.width = this.width;
         return result;
     };
 
@@ -101,11 +83,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         if (!defined(source)) {
             throw new DeveloperError('source is required.');
         }
-        this.color = defaultValue(this.color, source.color);
-        this.width = defaultValue(this.width, source.width);
-        this.outlineColor = defaultValue(this.outlineColor, source.outlineColor);
-        this.outlineWidth = defaultValue(this.outlineWidth, source.outlineWidth);
         this.show = defaultValue(this.show, source.show);
+        this.material = defaultValue(this.material, source.material);
+        this.width = defaultValue(this.width, source.width);
     };
 
     return DynamicPolyline;

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

@@ -1,10 +1,10 @@
 /*global define*/
-define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Cartesian3', 'Core/Color', 'Scene/Material', 'Scene/PolylineCollection'], function(
+define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Cartesian3', 'DynamicScene/MaterialProperty', 'Scene/Material', 'Scene/PolylineCollection'], function(
          DeveloperError,
          defined,
          destroyObject,
          Cartesian3,
-         Color,
+         MaterialProperty,
          Material,
          PolylineCollection) {
     "use strict";
@@ -177,6 +177,7 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
         var vertexPositionsProperty = dynamicObject._vertexPositions;
         var polylineVisualizerIndex = dynamicObject._polylineVisualizerIndex;
         var show = dynamicObject.isAvailable(time) && (!defined(showProperty) || showProperty.getValue(time));
+        var context = dynamicPolylineVisualizer._scene.getContext();
 
         if (!show || //
            (!defined(vertexPositionsProperty) && //
@@ -191,7 +192,6 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
             return;
         }
 
-        var uniforms;
         if (!defined(polylineVisualizerIndex)) {
             var unusedIndexes = dynamicPolylineVisualizer._unusedIndexes;
             var length = unusedIndexes.length;
@@ -212,13 +212,8 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
                 material = Material.fromType(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 = dynamicPolylineVisualizer._polylineCollection.get(polylineVisualizerIndex);
-            uniforms = polyline.getMaterial().uniforms;
         }
 
         polyline.setShow(true);
@@ -235,19 +230,9 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
             polyline._visualizerPositions = vertexPositions;
         }
 
-        var property = dynamicPolyline._color;
+        var property = dynamicPolyline._material;
         if (defined(property)) {
-            uniforms.color = property.getValue(time, uniforms.color);
-        }
-
-        property = dynamicPolyline._outlineColor;
-        if (defined(property)) {
-            uniforms.outlineColor = property.getValue(time, uniforms.outlineColor);
-        }
-
-        property = dynamicPolyline._outlineWidth;
-        if (defined(property)) {
-            uniforms.outlineWidth = property.getValue(time);
+            polyline.setMaterial(MaterialProperty.getValue(time, property, polyline.getMaterial()));
         }
 
         property = dynamicPolyline._width;