cesium 0.21 → 0.21.1

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

@@ -1,10 +1,11 @@
 /*global define*/
-define(['Core/createGuid', 'Core/Cartographic', 'Core/Color', 'Core/defined', 'Core/DeveloperError', 'Core/RuntimeError', 'Core/Ellipsoid', 'Core/Event', 'Core/loadJson', 'DynamicScene/ConstantProperty', 'DynamicScene/DynamicObject', 'DynamicScene/DynamicPoint', 'DynamicScene/DynamicPolyline', 'DynamicScene/DynamicPolygon', 'DynamicScene/ColorMaterialProperty', 'DynamicScene/DynamicObjectCollection', 'ThirdParty/when', 'ThirdParty/topojson'], function(
+define(['Core/createGuid', 'Core/Cartographic', 'Core/Color', 'Core/defined', 'Core/DeveloperError', 'Core/getFilenameFromUri', 'Core/RuntimeError', 'Core/Ellipsoid', 'Core/Event', 'Core/loadJson', 'DynamicScene/ConstantProperty', 'DynamicScene/DynamicObject', 'DynamicScene/DynamicPoint', 'DynamicScene/DynamicPolyline', 'DynamicScene/DynamicPolygon', 'DynamicScene/ColorMaterialProperty', 'DynamicScene/DynamicObjectCollection', 'ThirdParty/when', 'ThirdParty/topojson'], function(
         createGuid,
         Cartographic,
         Color,
         defined,
         DeveloperError,
+        getFilenameFromUri,
         RuntimeError,
         Ellipsoid,
         Event,
@@ -203,26 +204,26 @@ define(['Core/createGuid', 'Core/Cartographic', 'Core/Color', 'Core/defined', 'C
         //default line
         var defaultLine = new DynamicObject('GeoJsonDataSource.defaultLine');
         var polyline = new DynamicPolyline();
-        polyline.color = new ConstantProperty(Color.YELLOW);
+        var material = new ColorMaterialProperty();
+        material.color = new ConstantProperty(Color.YELLOW);
+        polyline.material = material;
         polyline.width = new ConstantProperty(2);
-        polyline.outlineColor = new ConstantProperty(Color.BLACK);
-        polyline.outlineWidth = new ConstantProperty(1);
         defaultLine.polyline = polyline;
 
         //default polygon
         var defaultPolygon = new DynamicObject('GeoJsonDataSource.defaultPolygon');
 
         polyline = new DynamicPolyline();
-        polyline.color = new ConstantProperty(Color.YELLOW);
+        material = new ColorMaterialProperty();
+        material.color = new ConstantProperty(Color.YELLOW);
+        polyline.material = material;
         polyline.width = new ConstantProperty(1);
-        polyline.outlineColor = new ConstantProperty(Color.BLACK);
-        polyline.outlineWidth = new ConstantProperty(0);
         defaultPolygon.polyline = polyline;
 
         var polygon = new DynamicPolygon();
         defaultPolygon.polygon = polygon;
 
-        var material = new ColorMaterialProperty();
+        material = new ColorMaterialProperty();
         material.color = new ConstantProperty(new Color(1.0, 1.0, 0.0, 0.1));
         polygon.material = material;
 
@@ -247,6 +248,18 @@ define(['Core/createGuid', 'Core/Cartographic', 'Core/Color', 'Core/defined', 'C
          * @type {DynamicObject}
          */
         this.defaultPolygon = defaultPolygon;
+
+        this._name = undefined;
+    };
+
+    /**
+     * Gets the name of this data source.
+     * @memberof GeoJsonDataSource
+     *
+     * @returns {String} The name.
+     */
+    GeoJsonDataSource.prototype.getName = function() {
+        return this._name;
     };
 
     /**
@@ -343,6 +356,11 @@ define(['Core/createGuid', 'Core/Cartographic', 'Core/Color', 'Core/defined', 'C
             throw new DeveloperError('geoJson is required.');
         }
 
+        this._name = undefined;
+        if (defined(source)) {
+            this._name = getFilenameFromUri(source);
+        }
+
         var typeHandler = geoJsonObjectTypes[geoJson.type];
         if (!defined(typeHandler)) {
             throw new DeveloperError('Unsupported GeoJSON object type: ' + geoJson.type);

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

@@ -43,7 +43,7 @@ define(['Core/Cartesian2', 'Core/Color', 'Core/defined', 'DynamicScene/ConstantP
 
     /**
      * Gets the {@link Material} type at the provided time.
-     * @memberof MaterialProperty
+     * @memberof GridMaterialProperty
      *
      * @param {JulianDate} time The time for which to retrieve the type.
      * @type {String} The type of material.
@@ -54,7 +54,7 @@ define(['Core/Cartesian2', 'Core/Color', 'Core/defined', 'DynamicScene/ConstantP
 
     /**
      * Gets the value of the property at the provided time.
-     * @memberof MaterialProperty
+     * @memberof GridMaterialProperty
      *
      * @param {JulianDate} time The time for which to retrieve the value.
      * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.

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

@@ -26,7 +26,7 @@ define(['Core/Cartesian2', 'Core/defined', 'DynamicScene/ConstantProperty'], fun
 
     /**
      * Gets the {@link Material} type at the provided time.
-     * @memberof MaterialProperty
+     * @memberof ImageMaterialProperty
      *
      * @param {JulianDate} time The time for which to retrieve the type.
      * @type {String} The type of material.
@@ -37,7 +37,7 @@ define(['Core/Cartesian2', 'Core/defined', 'DynamicScene/ConstantProperty'], fun
 
     /**
      * Gets the value of the property at the provided time.
-     * @memberof MaterialProperty
+     * @memberof ImageMaterialProperty
      *
      * @param {JulianDate} time The time for which to retrieve the value.
      * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.

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

@@ -0,0 +1,66 @@
+/*global define*/
+define(['Core/Color', 'Core/defined', 'DynamicScene/ConstantProperty'], function(
+        Color,
+        defined,
+        ConstantProperty) {
+    "use strict";
+
+    /**
+     * A {@link MaterialProperty} that maps to polyline outline {@link Material} uniforms.
+     * @alias PolylineOutlineMaterialProperty
+     * @constructor
+     */
+    var PolylineOutlineMaterialProperty = function() {
+        /**
+         * A {@link Color} {@link Property} which determines the polyline's color.
+         * @type {Property}
+         * @default new ConstantProperty(Color.WHITE)
+         */
+        this.color = new ConstantProperty(Color.WHITE);
+        /**
+         * A {@link Color} {@link Property} which determines the polyline's outline color.
+         * @type {Property}
+         * @default new ConstantProperty(Color.BLACK)
+         */
+        this.outlineColor = new ConstantProperty(Color.BLACK);
+        /**
+         * A Number {@link Property} which determines the polyline's outline width.
+         * @type {Property}
+         * @default new ConstantProperty(1)
+         */
+        this.outlineWidth = new ConstantProperty(1);
+    };
+
+    /**
+     * Gets the {@link Material} type at the provided time.
+     * @memberof PolylineOutlineMaterialProperty
+     *
+     * @param {JulianDate} time The time for which to retrieve the type.
+     * @type {String} The type of material.
+     */
+    PolylineOutlineMaterialProperty.prototype.getType = function(time) {
+        return 'PolylineOutline';
+    };
+
+    /**
+     * Gets the value of the property at the provided time.
+     * @memberof PolylineOutlineMaterialProperty
+     *
+     * @param {JulianDate} time The time for which to retrieve the value.
+     * @param {Object} [result] The object to store the value into, if omitted, a new instance is created and returned.
+     * @returns {Object} The modified result parameter or a new instance if the result parameter was not supplied.
+     *
+     * @exception {DeveloperError} time is required.
+     */
+    PolylineOutlineMaterialProperty.prototype.getValue = function(time, result) {
+        if (!defined(result)) {
+            result = {};
+        }
+        result.color = defined(this.color) ? this.color.getValue(time, result.color) : undefined;
+        result.outlineColor = defined(this.outlineColor) ? this.outlineColor.getValue(time, result.outlineColor) : undefined;
+        result.outlineWidth = defined(this.outlineWidth) ? this.outlineWidth.getValue(time) : undefined;
+        return result;
+    };
+
+    return PolylineOutlineMaterialProperty;
+});

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

@@ -83,12 +83,12 @@ define(['Core/Cartesian3', 'Core/defined', 'Core/defineProperties', 'Core/Develo
             icrfToFixed = Transforms.computeTemeToPseudoFixedMatrix(time, scratchMatrix3);
         }
         if (inputFrame === ReferenceFrame.INERTIAL) {
-            return icrfToFixed.multiplyByVector(value, result);
+            return Matrix3.multiplyByVector(icrfToFixed, value, result);
         }
         if (inputFrame === ReferenceFrame.FIXED) {
-            return icrfToFixed.transpose(scratchMatrix3).multiplyByVector(value, result);
+            return Matrix3.multiplyByVector(Matrix3.transpose(icrfToFixed, scratchMatrix3), value, result);
         }
     };
 
     return PositionProperty;
-});
+});

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

@@ -103,4 +103,4 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError'], function(
     };
 
     return ReferenceProperty;
-});
+});

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

@@ -52,28 +52,29 @@ define(['Core/binarySearch', 'Core/defaultValue', 'Core/defined', 'Core/definePr
         return epoch.addSeconds(date);
     }
 
+    var timesSpliceArgs = [];
+    var valuesSpliceArgs = [];
+
     var mergeNewSamples = function(epoch, times, values, newData, packedLength) {
         var newDataIndex = 0;
         var i;
         var prevItem;
         var timesInsertionPoint;
         var valuesInsertionPoint;
-        var timesSpliceArgs;
-        var valuesSpliceArgs;
         var currentTime;
         var nextTime;
 
         while (newDataIndex < newData.length) {
             currentTime = convertDate(newData[newDataIndex], epoch);
             timesInsertionPoint = binarySearch(times, currentTime, JulianDate.compare);
+            var timesSpliceArgsCount = 0;
+            var valuesSpliceArgsCount = 0;
 
             if (timesInsertionPoint < 0) {
                 //Doesn't exist, insert as many additional values as we can.
                 timesInsertionPoint = ~timesInsertionPoint;
-                timesSpliceArgs = [];
 
                 valuesInsertionPoint = timesInsertionPoint * packedLength;
-                valuesSpliceArgs = [];
                 prevItem = undefined;
                 nextTime = times[timesInsertionPoint];
                 while (newDataIndex < newData.length) {
@@ -81,17 +82,22 @@ define(['Core/binarySearch', 'Core/defaultValue', 'Core/defined', 'Core/definePr
                     if ((defined(prevItem) && JulianDate.compare(prevItem, currentTime) >= 0) || (defined(nextTime) && JulianDate.compare(currentTime, nextTime) >= 0)) {
                         break;
                     }
-                    timesSpliceArgs.push(currentTime);
+                    timesSpliceArgs[timesSpliceArgsCount++] = currentTime;
                     newDataIndex = newDataIndex + 1;
                     for (i = 0; i < packedLength; i++) {
-                        valuesSpliceArgs.push(newData[newDataIndex]);
+                        valuesSpliceArgs[valuesSpliceArgsCount++] = newData[newDataIndex];
                         newDataIndex = newDataIndex + 1;
                     }
                     prevItem = currentTime;
                 }
 
-                arrayInsert(values, valuesInsertionPoint, valuesSpliceArgs);
-                arrayInsert(times, timesInsertionPoint, timesSpliceArgs);
+                if (timesSpliceArgsCount > 0) {
+                    valuesSpliceArgs.length = valuesSpliceArgsCount;
+                    arrayInsert(values, valuesInsertionPoint, valuesSpliceArgs);
+
+                    timesSpliceArgs.length = timesSpliceArgsCount;
+                    arrayInsert(times, timesInsertionPoint, timesSpliceArgs);
+                }
             } else {
                 //Found an exact match
                 for (i = 0; i < packedLength; i++) {

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

@@ -1,6 +1,7 @@
 /*global define*/
-define(['Core/Cartesian3', 'Renderer/UniformDatatype'],function(
+define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
         Cartesian3,
+        Matrix4,
         UniformDatatype) {
     "use strict";
 
@@ -1398,7 +1399,7 @@ define(['Core/Cartesian3', 'Renderer/UniformDatatype'],function(
             },
 
             getValue : function(uniformState) {
-                return uniformState.getInverseView().getTranslation(viewerPositionWCScratch);
+                return Matrix4.getTranslation(uniformState.getInverseView(), viewerPositionWCScratch);
             }
         },
 
@@ -1522,4 +1523,4 @@ define(['Core/Cartesian3', 'Renderer/UniformDatatype'],function(
             }
         }
     };
-});
+});

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

@@ -83,6 +83,20 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/destro
         }
     }
 
+    function makeGetterSetter(gl, propertyName, logFunc) {
+        return {
+            get : function() {
+                var value = gl[propertyName];
+                logFunc(gl, 'get: ' + propertyName, value);
+                return gl[propertyName];
+            },
+            set : function(value) {
+                gl[propertyName] = value;
+                logFunc(gl, 'set: ' + propertyName, value);
+            }
+        };
+    }
+
     function wrapGL(gl, logFunc) {
         if (!logFunc) {
             return gl;
@@ -110,7 +124,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/destro
             if (typeof property === 'function') {
                 glWrapper[propertyName] = wrapFunction(property);
             } else {
-                glWrapper[propertyName] = property;
+                Object.defineProperty(glWrapper, propertyName, makeGetterSetter(gl, propertyName, logFunc));
             }
         }
 
@@ -2495,7 +2509,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/destro
      *
      * @memberof Context
      *
-     * @see Context#pick
+     * @see Scene#pick
      */
     Context.prototype.createPickFramebuffer = function() {
         return new PickFramebuffer(this);

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

@@ -25,20 +25,20 @@ define(['Core/Matrix3', 'Core/Matrix4', 'Core/Cartesian2', 'Core/Cartesian3', 'C
     var UniformState = function() {
         this._viewport = new BoundingRectangle();
         this._viewportDirty = false;
-        this._viewportOrthographicMatrix = Matrix4.IDENTITY.clone();
-        this._viewportTransformation = Matrix4.IDENTITY.clone();
-
-        this._model = Matrix4.IDENTITY.clone();
-        this._view = Matrix4.IDENTITY.clone();
-        this._inverseView = Matrix4.IDENTITY.clone();
-        this._projection = Matrix4.IDENTITY.clone();
-        this._infiniteProjection = Matrix4.IDENTITY.clone();
+        this._viewportOrthographicMatrix = Matrix4.clone(Matrix4.IDENTITY);
+        this._viewportTransformation = Matrix4.clone(Matrix4.IDENTITY);
+
+        this._model = Matrix4.clone(Matrix4.IDENTITY);
+        this._view = Matrix4.clone(Matrix4.IDENTITY);
+        this._inverseView = Matrix4.clone(Matrix4.IDENTITY);
+        this._projection = Matrix4.clone(Matrix4.IDENTITY);
+        this._infiniteProjection = Matrix4.clone(Matrix4.IDENTITY);
         this._entireFrustum = new Cartesian2();
         this._currentFrustum = new Cartesian2();
         this._pixelSize = 0.0;
 
         this._frameState = undefined;
-        this._temeToPseudoFixed = Matrix3.IDENTITY.clone();
+        this._temeToPseudoFixed = Matrix3.clone(Matrix4.IDENTITY);
 
         // Derived members
         this._view3DDirty = true;
@@ -378,7 +378,7 @@ define(['Core/Matrix3', 'Core/Matrix4', 'Core/Cartesian2', 'Core/Cartesian3', 'C
         if (this._inverseModelDirty) {
             this._inverseModelDirty = false;
 
-            this._model.inverse(this._inverseModel);
+            Matrix4.inverse(this._model, this._inverseModel);
         }
 
         return this._inverseModel;
@@ -1015,7 +1015,7 @@ define(['Core/Matrix3', 'Core/Matrix4', 'Core/Cartesian2', 'Core/Cartesian3', 'C
         if (uniformState._encodedCameraPositionMCDirty) {
             uniformState._encodedCameraPositionMCDirty = false;
 
-            uniformState.getInverseModel().multiplyByPoint(uniformState._cameraPosition, cameraPositionMC);
+            Matrix4.multiplyByPoint(uniformState.getInverseModel(), uniformState._cameraPosition, cameraPositionMC);
             EncodedCartesian3.fromCartesian(cameraPositionMC, uniformState._encodedCameraPositionMC);
         }
     }
@@ -1131,9 +1131,9 @@ define(['Core/Matrix3', 'Core/Matrix4', 'Core/Cartesian2', 'Core/Cartesian3', 'C
         var enuToFixed = Transforms.eastNorthUpToFixedFrame(position3D, ellipsoid, view2Dto3DMatrix4Scratch);
 
         // Transform each camera direction to the fixed axes.
-        enuToFixed.multiplyByVector(r, r);
-        enuToFixed.multiplyByVector(u, u);
-        enuToFixed.multiplyByVector(d, d);
+        Matrix4.multiplyByVector(enuToFixed, r, r);
+        Matrix4.multiplyByVector(enuToFixed, u, u);
+        Matrix4.multiplyByVector(enuToFixed, d, d);
 
         // Compute the view matrix based on the new fixed-frame camera position and directions.
         if (!defined(result)) {

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/NearFarScalar', 'Scene/HorizontalOrigin', 'Scene/VerticalOrigin', 'Scene/SceneMode', 'Scene/SceneTransforms'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/NearFarScalar', 'Core/Matrix4', 'Scene/HorizontalOrigin', 'Scene/VerticalOrigin', 'Scene/SceneMode', 'Scene/SceneTransforms'], function(
         defaultValue,
         defined,
         DeveloperError,
@@ -8,6 +8,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
         Cartesian3,
         Cartesian4,
         NearFarScalar,
+        Matrix4,
         HorizontalOrigin,
         VerticalOrigin,
         SceneMode,
@@ -38,6 +39,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
      * and add new billboards instead of modifying each one.
      *
      * @exception {DeveloperError} scaleByDistance.far must be greater than scaleByDistance.near
+     * @exception {DeveloperError} translucencyByDistance.far must be greater than translucencyByDistance.near
      *
      * @see BillboardCollection
      * @see BillboardCollection#add
@@ -47,33 +49,39 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
      *
      * @demo <a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html?src=Billboards.html">Cesium Sandcastle Billboard Demo</a>
      */
-    var Billboard = function(description, billboardCollection) {
-        description = defaultValue(description, EMPTY_OBJECT);
+    var Billboard = function(options, billboardCollection) {
+        options = defaultValue(options, EMPTY_OBJECT);
 
-        if (defined(description.scaleByDistance) && description.scaleByDistance.far <= description.scaleByDistance.near) {
+        if (defined(options.scaleByDistance) && options.scaleByDistance.far <= options.scaleByDistance.near) {
             throw new DeveloperError('scaleByDistance.far must be greater than scaleByDistance.near.');
         }
+        if (defined(options.translucencyByDistance) &&
+                options.translucencyByDistance.far <= options.translucencyByDistance.near) {
+            throw new DeveloperError('translucencyByDistance.far must be greater than translucencyByDistance.near.');
+        }
 
-        this._show = defaultValue(description.show, true);
+        this._show = defaultValue(options.show, true);
 
-        this._position = Cartesian3.clone(defaultValue(description.position, Cartesian3.ZERO));
+        this._position = Cartesian3.clone(defaultValue(options.position, Cartesian3.ZERO));
         this._actualPosition = Cartesian3.clone(this._position); // For columbus view and 2D
 
-        this._pixelOffset = Cartesian2.clone(defaultValue(description.pixelOffset, Cartesian2.ZERO));
-        this._eyeOffset = Cartesian3.clone(defaultValue(description.eyeOffset, Cartesian3.ZERO));
-        this._verticalOrigin = defaultValue(description.verticalOrigin, VerticalOrigin.CENTER);
-        this._horizontalOrigin = defaultValue(description.horizontalOrigin, HorizontalOrigin.CENTER);
-        this._scale = defaultValue(description.scale, 1.0);
-        this._imageIndex = defaultValue(description.imageIndex, -1);
-        this._color = Color.clone(defaultValue(description.color, Color.WHITE));
-        this._rotation = defaultValue(description.rotation, 0.0);
-        this._alignedAxis = Cartesian3.clone(defaultValue(description.alignedAxis, Cartesian3.ZERO));
-        this._width = description.width;
-        this._height = description.height;
-        this._scaleByDistance = description.scaleByDistance;
+        this._pixelOffset = Cartesian2.clone(defaultValue(options.pixelOffset, Cartesian2.ZERO));
+        this._eyeOffset = Cartesian3.clone(defaultValue(options.eyeOffset, Cartesian3.ZERO));
+        this._verticalOrigin = defaultValue(options.verticalOrigin, VerticalOrigin.CENTER);
+        this._horizontalOrigin = defaultValue(options.horizontalOrigin, HorizontalOrigin.CENTER);
+        this._scale = defaultValue(options.scale, 1.0);
+        this._imageIndex = defaultValue(options.imageIndex, -1);
+        this._color = Color.clone(defaultValue(options.color, Color.WHITE));
+        this._rotation = defaultValue(options.rotation, 0.0);
+        this._alignedAxis = Cartesian3.clone(defaultValue(options.alignedAxis, Cartesian3.ZERO));
+        this._width = options.width;
+        this._height = options.height;
+        this._scaleByDistance = options.scaleByDistance;
+        this._translucencyByDistance = options.translucencyByDistance;
+        this._id = options.id;
 
         this._pickId = undefined;
-        this._pickIdThis = description._pickIdThis;
+        this._pickIdThis = options._pickIdThis;
         this._billboardCollection = billboardCollection;
         this._dirty = false;
         this._index = -1; //Used only by BillboardCollection
@@ -91,7 +99,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
     var ROTATION_INDEX = Billboard.ROTATION_INDEX = 9;
     var ALIGNED_AXIS_INDEX = Billboard.ALIGNED_AXIS_INDEX = 10;
     var SCALE_BY_DISTANCE_INDEX = Billboard.SCALE_BY_DISTANCE_INDEX = 11;
-    Billboard.NUMBER_OF_PROPERTIES = 12;
+    var TRANSLUCENCY_BY_DISTANCE_INDEX = Billboard.TRANSLUCENCY_BY_DISTANCE_INDEX = 12;
+    Billboard.NUMBER_OF_PROPERTIES = 13;
 
     function makeDirty(billboard, propertyChanged) {
         var billboardCollection = billboard._billboardCollection;
@@ -104,7 +113,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
     Billboard.prototype.getPickId = function(context) {
         if (!defined(this._pickId)) {
             this._pickId = context.createPickId({
-                primitive : defaultValue(this._pickIdThis, this)
+                primitive : defaultValue(this._pickIdThis, this),
+                id : this._id
             });
         }
 
@@ -317,6 +327,59 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
         this._scaleByDistance = NearFarScalar.clone(scale, this._scaleByDistance);
     };
 
+    /**
+     * Returns the near and far translucency properties of a Billboard based on the billboard's distance from the camera.
+     *
+     * @memberof Billboard
+     *
+     * @returns {NearFarScalar} The near/far translucency values based on camera distance to the billboard
+     *
+     * @see Billboard#setTranslucencyByDistance
+     */
+    Billboard.prototype.getTranslucencyByDistance = function() {
+        return this._translucencyByDistance;
+    };
+
+    /**
+     * Sets near and far translucency properties of a Billboard based on the billboard's distance from the camera.
+     * A billboard's translucency will interpolate between the {@link NearFarScalar#nearValue} and
+     * {@link NearFarScalar#farValue} while the camera distance falls within the upper and lower bounds
+     * of the specified {@link NearFarScalar#near} and {@link NearFarScalar#far}.
+     * Outside of these ranges the billboard's translucency remains clamped to the nearest bound.  If undefined,
+     * translucencyByDistance will be disabled.
+     *
+     * @memberof Billboard
+     *
+     * @param {NearFarScalar} translucency The configuration of near and far distances and their respective translucency values
+     *
+     * @exception {DeveloperError} far distance must be greater than near distance.
+     *
+     * @see Billboard#getTranslucencyByDistance
+     *
+     * @example
+     * // Example 1.
+     * // Set a billboard's translucency to 1.0 when the
+     * // camera is 1500 meters from the billboard and disappear as
+     * // the camera distance approaches 8.0e6 meters.
+     * b.setTranslucencyByDistance(new NearFarScalar(1.5e2, 1.0, 8.0e6, 0.0));
+     *
+     * // Example 2.
+     * // disable translucency by distance
+     * b.setTranslucencyByDistance(undefined);
+     */
+    Billboard.prototype.setTranslucencyByDistance = function(translucency) {
+        if (NearFarScalar.equals(this._translucencyByDistance, translucency)) {
+            return;
+        }
+
+        if (translucency.far <= translucency.near) {
+            throw new DeveloperError('far distance must be greater than near distance.');
+        }
+
+        makeDirty(this, TRANSLUCENCY_BY_DISTANCE_INDEX);
+        this._translucencyByDistance = NearFarScalar.clone(translucency, this._translucencyByDistance);
+    };
+
     /**
      * Returns the 3D Cartesian offset applied to this billboard in eye coordinates.
      *
@@ -773,13 +836,24 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
         }
     };
 
+    /**
+     * Returns the user-defined object returned when the billboard is picked.
+     *
+     * @memberof Billboard
+     *
+     * @returns {Object} The user-defined object returned when the billboard is picked.
+     */
+    Billboard.prototype.getId = function() {
+        return this._id;
+    };
+
     var tempCartesian4 = new Cartesian4();
     Billboard._computeActualPosition = function(position, frameState, modelMatrix) {
         if (frameState.mode === SceneMode.SCENE3D) {
             return position;
         }
 
-        modelMatrix.multiplyByPoint(position, tempCartesian4);
+        Matrix4.multiplyByPoint(modelMatrix, position, tempCartesian4);
         return SceneTransforms.computeActualWgs84Position(frameState, tempCartesian4);
     };
 
@@ -790,8 +864,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
         var projection = camera.frustum.projectionMatrix;
 
         // Model to eye coordinates
-        var mv = view.multiply(modelMatrix);
-        var positionEC = mv.multiplyByPoint(position);
+        var mv = Matrix4.multiply(view, modelMatrix);
+        var positionEC = Matrix4.multiplyByPoint(mv, position);
 
         // Apply eye offset, e.g., czm_eyeOffset
         var zEyeOffset = Cartesian3.multiplyComponents(eyeOffset, Cartesian3.normalize(positionEC));
@@ -799,7 +873,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
         positionEC.y += eyeOffset.y + zEyeOffset.y;
         positionEC.z += zEyeOffset.z;
 
-        var positionCC = projection.multiplyByVector(positionEC); // clip coordinates
+        var positionCC = Matrix4.multiplyByVector(projection, positionEC); // clip coordinates
         var positionWC = SceneTransforms.clipToWindowCoordinates(context, positionCC);
 
         // Apply pixel offset
@@ -873,7 +947,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
                Color.equals(this._color, other._color) &&
                Cartesian2.equals(this._pixelOffset, other._pixelOffset) &&
                Cartesian3.equals(this._eyeOffset, other._eyeOffset) &&
-               NearFarScalar.equals(this._scaleByDistance, other._scaleByDistance);
+               NearFarScalar.equals(this._scaleByDistance, other._scaleByDistance) &&
+               NearFarScalar.equals(this._translucencyByDistance, other._translucencyByDistance) &&
+               this._id === other._id;
     };
 
     Billboard.prototype._destroy = function() {