cesium 0.23.0 → 0.24.0

data/app/assets/javascripts/Core/Shapes.js

@@ -63,7 +63,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Math',
      *
      * @exports Shapes
      *
-     * @demo <a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html?src=Circles%20and%20Ellipses.html">Cesium Sandcastle Circles and Ellipses Demo</a>
+     * @demo <a href="http://cesiumjs.org/Cesium/Apps/Sandcastle/index.html?src=Circles%20and%20Ellipses.html">Cesium Sandcastle Circles and Ellipses Demo</a>
      */
     var Shapes = {
         /**

data/app/assets/javascripts/Core/TaskProcessor.js

@@ -70,7 +70,9 @@ define(['require', 'Core/buildModuleUrl', 'Core/defaultValue', 'Core/defined', '
             workerModule : TaskProcessor._workerModulePrefix + processor._workerName
         };
 
-        if (defined(require.toUrl)) {
+        if (defined(TaskProcessor._loaderConfig)) {
+            bootstrapMessage.loaderConfig = TaskProcessor._loaderConfig;
+        } else if (defined(require.toUrl)) {
             var baseUrl = new Uri('..').resolve(new Uri(buildModuleUrl('Workers/cesiumWorkerBootstrapper.js'))).toString();
             bootstrapMessage.loaderConfig.baseUrl = baseUrl;
         } else {
@@ -196,6 +198,7 @@ define(['require', 'Core/buildModuleUrl', 'Core/defaultValue', 'Core/defined', '
     // exposed for testing purposes
     TaskProcessor._defaultWorkerModulePrefix = 'Workers/';
     TaskProcessor._workerModulePrefix = TaskProcessor._defaultWorkerModulePrefix;
+    TaskProcessor._loaderConfig = undefined;
 
     return TaskProcessor;
 });

data/app/assets/javascripts/Core/Transforms.js

@@ -55,9 +55,11 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
      * var transform = Transforms.eastNorthUpToFixedFrame(center);
      */
     Transforms.eastNorthUpToFixedFrame = function(origin, ellipsoid, result) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(origin)) {
             throw new DeveloperError('origin is required.');
         }
+        //>>includeEnd('debug');
 
         // If x and y are zero, assume origin is at a pole, which is a special case.
         if (CesiumMath.equalsEpsilon(origin.x, 0.0, CesiumMath.EPSILON14) &&
@@ -159,9 +161,11 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
      * var transform = Transforms.northEastDownToFixedFrame(center);
      */
     Transforms.northEastDownToFixedFrame = function(origin, ellipsoid, result) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(origin)) {
             throw new DeveloperError('origin is required.');
         }
+        //>>includeEnd('debug');
 
         if (CesiumMath.equalsEpsilon(origin.x, 0.0, CesiumMath.EPSILON14) &&
             CesiumMath.equalsEpsilon(origin.y, 0.0, CesiumMath.EPSILON14)) {
@@ -265,9 +269,11 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
      * updateAndRender();
      */
     Transforms.computeTemeToPseudoFixedMatrix = function (date, result) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(date)) {
             throw new DeveloperError('date is required.');
         }
+        //>>includeEnd('debug');
 
         // GMST is actually computed using UT1.  We're using UTC as an approximation of UT1.
         // We do not want to use the function like convertTaiToUtc in JulianDate because
@@ -405,9 +411,11 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
      * updateAndRender();
      */
     Transforms.computeIcrfToFixedMatrix = function(date, result) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(date)) {
             throw new DeveloperError('date is required.');
         }
+        //>>includeEnd('debug');
 
         var fixedToIcrfMtx = Transforms.computeFixedToIcrfMatrix(date, result);
         if (!defined(fixedToIcrfMtx)) {
@@ -451,9 +459,11 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
      * }
      */
     Transforms.computeFixedToIcrfMatrix = function(date, result) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(date)) {
             throw new DeveloperError('date is required.');
         }
+        //>>includeEnd('debug');
 
         // Compute pole wander
         var eop = Transforms.earthOrientationParameters.compute(date, eopScratch);
@@ -571,6 +581,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
      * @see czm_viewportTransformation
      */
     Transforms.pointToWindowCoordinates = function (modelViewProjectionMatrix, viewportTransformation, point, result) {
+        //>>includeStart('debug', pragmas.debug);
         if (!defined(modelViewProjectionMatrix)) {
             throw new DeveloperError('modelViewProjectionMatrix is required.');
         }
@@ -582,10 +593,11 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Iau200
         if (!defined(point)) {
             throw new DeveloperError('point is required.');
         }
+        //>>includeEnd('debug');
 
         var tmp = pointToWindowCoordinatesTemp;
 
-        Matrix4.multiplyByPoint(modelViewProjectionMatrix, point, tmp);
+        Matrix4.multiplyByVector(modelViewProjectionMatrix, Cartesian4.fromElements(point.x, point.y, point.z, 1, tmp), tmp);
         Cartesian4.multiplyByScalar(tmp, 1.0 / tmp.w, tmp);
         Matrix4.multiplyByVector(viewportTransformation, tmp, tmp);
         return Cartesian2.fromCartesian4(tmp, result);

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color', 'Core/ClockRange', 'Core/ClockStep', 'Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Event', 'Core/getFilenameFromUri', 'Core/HermitePolynomialApproximation', 'Core/Iso8601', 'Core/JulianDate', 'Core/LagrangePolynomialApproximation', 'Core/LinearApproximation', 'Core/loadJson', 'Core/Math', 'Core/Quaternion', 'Core/ReferenceFrame', 'Core/RuntimeError', 'Core/Spherical', 'Core/TimeInterval', 'Scene/HorizontalOrigin', 'Scene/LabelStyle', 'Scene/VerticalOrigin', 'DynamicScene/CompositeMaterialProperty', 'DynamicScene/CompositePositionProperty', 'DynamicScene/CompositeProperty', 'DynamicScene/ConstantPositionProperty', 'DynamicScene/ConstantProperty', 'DynamicScene/DynamicBillboard', 'DynamicScene/DynamicClock', 'DynamicScene/ColorMaterialProperty', 'DynamicScene/PolylineOutlineMaterialProperty', 'DynamicScene/DynamicCone', 'DynamicScene/DynamicLabel', 'DynamicScene/DynamicDirectionsProperty', 'DynamicScene/DynamicEllipse', 'DynamicScene/DynamicEllipsoid', 'DynamicScene/GridMaterialProperty', 'DynamicScene/ImageMaterialProperty', 'DynamicScene/DynamicObject', 'DynamicScene/DynamicObjectCollection', 'DynamicScene/DynamicPath', 'DynamicScene/DynamicPoint', 'DynamicScene/DynamicPolyline', 'DynamicScene/DynamicPolygon', 'DynamicScene/DynamicPyramid', 'DynamicScene/DynamicVector', 'DynamicScene/DynamicVertexPositionsProperty', 'DynamicScene/SampledPositionProperty', 'DynamicScene/SampledProperty', 'DynamicScene/TimeIntervalCollectionPositionProperty', 'DynamicScene/TimeIntervalCollectionProperty', 'ThirdParty/Uri', 'ThirdParty/when'], function(
+define(['Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color', 'Core/ClockRange', 'Core/ClockStep', 'Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Event', 'Core/getFilenameFromUri', 'Core/HermitePolynomialApproximation', 'Core/Iso8601', 'Core/JulianDate', 'Core/LagrangePolynomialApproximation', 'Core/LinearApproximation', 'Core/loadJson', 'Core/Math', 'Core/Quaternion', 'Core/ReferenceFrame', 'Core/RuntimeError', 'Core/Spherical', 'Core/TimeInterval', 'Core/TimeIntervalCollection', 'Scene/HorizontalOrigin', 'Scene/LabelStyle', 'Scene/VerticalOrigin', 'DynamicScene/CompositeMaterialProperty', 'DynamicScene/CompositePositionProperty', 'DynamicScene/CompositeProperty', 'DynamicScene/ConstantPositionProperty', 'DynamicScene/ConstantProperty', 'DynamicScene/DynamicBillboard', 'DynamicScene/DynamicClock', 'DynamicScene/ColorMaterialProperty', 'DynamicScene/PolylineOutlineMaterialProperty', 'DynamicScene/DynamicCone', 'DynamicScene/DynamicLabel', 'DynamicScene/DynamicDirectionsProperty', 'DynamicScene/DynamicEllipse', 'DynamicScene/DynamicEllipsoid', 'DynamicScene/GridMaterialProperty', 'DynamicScene/ImageMaterialProperty', 'DynamicScene/DynamicObject', 'DynamicScene/DynamicObjectCollection', 'DynamicScene/DynamicPath', 'DynamicScene/DynamicPoint', 'DynamicScene/DynamicPolyline', 'DynamicScene/DynamicPolygon', 'DynamicScene/DynamicPyramid', 'DynamicScene/DynamicVector', 'DynamicScene/DynamicVertexPositionsProperty', 'DynamicScene/SampledPositionProperty', 'DynamicScene/SampledProperty', 'DynamicScene/TimeIntervalCollectionPositionProperty', 'DynamicScene/TimeIntervalCollectionProperty', 'ThirdParty/Uri', 'ThirdParty/when'], function(
         Cartesian2,
         Cartesian3,
         Cartographic,
@@ -25,6 +25,7 @@ define(['Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color',
         RuntimeError,
         Spherical,
         TimeInterval,
+        TimeIntervalCollection,
         HorizontalOrigin,
         LabelStyle,
         VerticalOrigin,
@@ -223,7 +224,23 @@ define(['Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color',
         case Array:
             return czmlInterval.array;
         case Quaternion:
-            return czmlInterval.unitQuaternion;
+            //TODO: Currently Quaternion convention in CZML is the opposite of what Cesium expects.
+            //To avoid unecessary CZML churn, we conjugate manually for now.  During the next big CZML
+            //update, we should remove this code and change the convention.
+            var unitQuaternion = czmlInterval.unitQuaternion;
+            if (defined(unitQuaternion)) {
+                if (unitQuaternion.length === 4) {
+                    return [-unitQuaternion[0], -unitQuaternion[1], -unitQuaternion[2], unitQuaternion[3]];
+                }
+
+                unitQuaternion = unitQuaternion.slice(0);
+                for (var i = 0; i < unitQuaternion.length; i += 5) {
+                    unitQuaternion[i + 1] = -unitQuaternion[i + 1];
+                    unitQuaternion[i + 2] = -unitQuaternion[i + 2];
+                    unitQuaternion[i + 3] = -unitQuaternion[i + 3];
+                }
+            }
+            return unitQuaternion;
         case VerticalOrigin:
             return VerticalOrigin[defaultValue(czmlInterval.verticalOrigin, czmlInterval)];
         default:
@@ -683,15 +700,28 @@ define(['Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color',
     }
 
     function processAvailability(dynamicObject, packet, dynamicObjectCollection, sourceUri) {
-        var availability = packet.availability;
-        if (!defined(availability)) {
+        var interval;
+        var packetData = packet.availability;
+        if (!defined(packetData)) {
             return;
         }
 
-        var interval = TimeInterval.fromIso8601(availability);
-        if (defined(interval)) {
-            dynamicObject.availability = interval;
+        var intervals;
+        if (Array.isArray(packetData)) {
+            var length = packetData.length;
+            for (var i = 0; i < length; i++) {
+                if (!defined(intervals)) {
+                    intervals = new TimeIntervalCollection();
+                }
+                interval = TimeInterval.fromIso8601(packetData[i]);
+                intervals.addInterval(interval);
+            }
+        } else {
+            interval = TimeInterval.fromIso8601(packetData);
+            intervals = new TimeIntervalCollection();
+            intervals.addInterval(interval);
         }
+        dynamicObject.availability = intervals;
     }
 
     function processBillboard(dynamicObject, packet, dynamicObjectCollection, sourceUri) {
@@ -740,10 +770,8 @@ define(['Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartographic', 'Core/Color',
         }
         if (defined(clockPacket.interval)) {
             var interval = TimeInterval.fromIso8601(clockPacket.interval);
-            if (defined(interval)) {
-                clock.startTime = interval.start;
-                clock.stopTime = interval.stop;
-            }
+            clock.startTime = interval.start;
+            clock.stopTime = interval.stop;
         }
         if (defined(clockPacket.currentTime)) {
             clock.currentTime = JulianDate.fromIso8601(clockPacket.currentTime);

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/DeveloperError', 'Core/EventHelper', 'DynamicScene/DynamicBillboardVisualizer', 'DynamicScene/DynamicEllipsoidVisualizer', 'DynamicScene/DynamicConeVisualizerUsingCustomSensor', 'DynamicScene/DynamicLabelVisualizer', 'DynamicScene/DynamicPathVisualizer', 'DynamicScene/DynamicPointVisualizer', 'DynamicScene/DynamicPolygonVisualizer', 'DynamicScene/DynamicPolylineVisualizer', 'DynamicScene/DynamicPyramidVisualizer', 'DynamicScene/VisualizerCollection'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/DeveloperError', 'Core/EventHelper', 'DynamicScene/DynamicBillboardVisualizer', 'DynamicScene/DynamicEllipsoidVisualizer', 'DynamicScene/DynamicConeVisualizerUsingCustomSensor', 'DynamicScene/DynamicLabelVisualizer', 'DynamicScene/DynamicPathVisualizer', 'DynamicScene/DynamicPointVisualizer', 'DynamicScene/DynamicPolygonVisualizer', 'DynamicScene/DynamicPolylineVisualizer', 'DynamicScene/DynamicPyramidVisualizer', 'DynamicScene/DynamicVectorVisualizer', 'DynamicScene/VisualizerCollection'], function(
         defaultValue,
         defined,
         destroyObject,
@@ -14,6 +14,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         DynamicPolygonVisualizer,
         DynamicPolylineVisualizer,
         DynamicPyramidVisualizer,
+        DynamicVectorVisualizer,
         VisualizerCollection) {
     "use strict";
 
@@ -25,7 +26,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
                                   DynamicPolygonVisualizer,
                                   DynamicPolylineVisualizer,
                                   DynamicPyramidVisualizer,
-                                  DynamicPathVisualizer];
+                                  DynamicPathVisualizer,
+                                  DynamicVectorVisualizer];
 
     /**
      * Visualizes a collection of {@link DataSource} instances.

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

@@ -29,6 +29,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this._show = undefined;
         this._scaleByDistance = undefined;
         this._translucencyByDistance = undefined;
+        this._pixelOffsetScaleByDistance = undefined;
         this._propertyChanged = new Event();
     };
 
@@ -144,7 +145,16 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          * @memberof DynamicBillboard.prototype
          * @type {Property}
          */
-        translucencyByDistance : createDynamicPropertyDescriptor('translucencyByDistance', '_translucencyByDistance')
+        translucencyByDistance : createDynamicPropertyDescriptor('translucencyByDistance', '_translucencyByDistance'),
+
+        /**
+         * Gets or sets the {@link NearFarScalar} {@link Property} used to set pixel offset scaling based on distance.
+         * If undefined, no additional scale is applied to the pixel offset
+         * @memberof DynamicBillboard.prototype
+         * @type {Property}
+         */
+        pixelOffsetScaleByDistance : createDynamicPropertyDescriptor('pixelOffsetScaleByDistance', '_pixelOffsetScaleByDistance')
+
     });
 
     /**
@@ -172,6 +182,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         result.height = this._height;
         result.scaleByDistance = this._scaleByDistance;
         result.translucencyByDistance = this._translucencyByDistance;
+        result.pixelOffsetScaleByDistance = this._pixelOffsetScaleByDistance;
         return result;
     };
 
@@ -201,6 +212,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this.height = defaultValue(this._height, source._height);
         this.scaleByDistance = defaultValue(this._scaleByDistance, source._scaleByDistance);
         this.translucencyByDistance = defaultValue(this._translucencyByDistance, source._translucencyByDistance);
+        this.pixelOffsetScaleByDistance = defaultValue(this._pixelOffsetScaleByDistance, source._pixelOffsetScaleByDistance);
     };
 
     return DynamicBillboard;

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

@@ -350,6 +350,11 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Color
         if (defined(property)) {
             billboard.setTranslucencyByDistance(property.getValue(time));
         }
+
+        property = dynamicBillboard._pixelOffsetScaleByDistance;
+        if (defined(property)) {
+            billboard.setPixelOffsetScaleByDistance(property.getValue(time));
+        }
     }
 
     DynamicBillboardVisualizer.prototype._onObjectsRemoved = function(dynamicObjectCollection, added, dynamicObjects) {

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

@@ -27,6 +27,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this._scale = undefined;
         this._show = undefined;
         this._translucencyByDistance = undefined;
+        this._pixelOffsetScaleByDistance = undefined;
         this._propertyChanged = new Event();
     };
 
@@ -132,7 +133,16 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          * @memberof DynamicLabel.prototype
          * @type {Property}
          */
-        translucencyByDistance : createDynamicPropertyDescriptor('translucencyByDistance', '_translucencyByDistance')
+        translucencyByDistance : createDynamicPropertyDescriptor('translucencyByDistance', '_translucencyByDistance'),
+
+        /**
+         * Gets or sets the {@link NearFarScalar} {@link Property} used to set pixel offset scaling based on distance.
+         * If undefined, no additional scale is applied to the pixel offset
+         * @memberof DynamicLabel.prototype
+         * @type {Property}
+         */
+        pixelOffsetScaleByDistance : createDynamicPropertyDescriptor('pixelOffsetScaleByDistance', '_pixelOffsetScaleByDistance')
+
     });
 
     /**
@@ -159,6 +169,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         result.eyeOffset = this.eyeOffset;
         result.pixelOffset = this.pixelOffset;
         result.translucencyByDistance = this._translucencyByDistance;
+        result.pixelOffsetScaleByDistance = this._pixelOffsetScaleByDistance;
         return result;
     };
 
@@ -187,6 +198,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this.eyeOffset = defaultValue(this.eyeOffset, source.eyeOffset);
         this.pixelOffset = defaultValue(this.pixelOffset, source.pixelOffset);
         this.translucencyByDistance = defaultValue(this._translucencyByDistance, source._translucencyByDistance);
+        this.pixelOffsetScaleByDistance = defaultValue(this._pixelOffsetScaleByDistance, source._pixelOffsetScaleByDistance);
     };
 
     return DynamicLabel;

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

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

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

@@ -111,13 +111,13 @@ define(['Core/createGuid', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
             }
         },
         /**
-         * The availability TimeInterval, if any, associated with this object.
+         * The availability, if any, associated with this object.
          * If availability is undefined, it is assumed that this object's
          * other properties will return valid data for any provided time.
          * If availability exists, the objects other properties will only
          * provide valid data if queried within the given interval.
          * @memberof DynamicObject.prototype
-         * @type {TimeInterval}
+         * @type {TimeIntervalCollection}
          */
         availability : createDynamicPropertyDescriptor('availability', '_availability'),
         /**

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

@@ -128,13 +128,13 @@ define(['Core/createGuid', 'Core/defined', 'Core/defineProperties', 'Core/Event'
             var object = dynamicObjects[i];
             var availability = object.availability;
             if (defined(availability)) {
-                var start = availability.start;
-                var stop = availability.stop;
+                var start = availability.getStart();
+                var stop = availability.getStop();
                 if (start.lessThan(startTime) && !start.equals(Iso8601.MINIMUM_VALUE)) {
-                    startTime = object.availability.start;
+                    startTime = start;
                 }
                 if (stop.greaterThan(stopTime) && !stop.equals(Iso8601.MAXIMUM_VALUE)) {
-                    stopTime = object.availability.stop;
+                    stopTime = stop;
                 }
             }
         }

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

@@ -251,15 +251,21 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/destroyObject', 'Core/Carte
                 if (hasTrailTime) {
                     sampleStart = time.addSeconds(-trailTime);
                 }
-                if (hasAvailability && (!hasTrailTime || availability.start.greaterThan(sampleStart))) {
-                    sampleStart = availability.start;
-                }
-
                 if (hasLeadTime) {
                     sampleStop = time.addSeconds(leadTime);
                 }
-                if (hasAvailability && (!hasLeadTime || availability.stop.lessThan(sampleStop))) {
-                    sampleStop = availability.stop;
+
+                if (hasAvailability) {
+                    var start = availability.getStart();
+                    var stop = availability.getStop();
+
+                    if (!hasTrailTime || start.greaterThan(sampleStart)) {
+                        sampleStart = start;
+                    }
+
+                    if (!hasLeadTime || stop.lessThan(sampleStop)) {
+                        sampleStop = stop;
+                    }
                 }
                 show = sampleStart.lessThan(sampleStop);
             }

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

@@ -7,7 +7,26 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
 
     var viewerPositionWCScratch = new Cartesian3();
 
-    return {
+    var AutomaticUniform = function(options) {
+        this.getSize = options.getSize;
+        this.getDatatype = options.getDatatype;
+        this.getValue = options.getValue;
+    };
+
+    AutomaticUniform.prototype.getDeclaration = function(name) {
+        var declaration = 'uniform ' + this.getDatatype().getGLSL() + ' ' + name;
+
+        var size = this.getSize();
+        if (size === 1) {
+            declaration += ';';
+        } else {
+            declaration += '[' + size.toString() + '];';
+        }
+
+        return declaration;
+    };
+
+    var AutomaticUniforms = {
         /**
          * An automatic GLSL uniform containing the viewport's <code>x</code>, <code>y</code>, <code>width</code>,
          * and <code>height</code> properties in an <code>vec4</code>'s <code>x</code>, <code>y</code>, <code>z</code>,
@@ -26,7 +45,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // by the viewport's width and height.
          * vec2 v = gl_FragCoord.xy / czm_viewport.zw;
          */
-        czm_viewport : {
+        czm_viewport : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -44,7 +63,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
                     w : v.height
                 };
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 orthographic projection matrix that
@@ -73,7 +92,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * gl_Position = czm_viewportOrthographic * vec4(windowPosition, 0.0, 1.0);
          */
-        czm_viewportOrthographic : {
+        czm_viewportOrthographic : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -85,7 +104,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getViewportOrthographic();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 transformation matrix that
@@ -121,7 +140,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * q.xyz /= q.w;                                                // clip to normalized device coordinates (ndc)
          * q.xyz = (czm_viewportTransformation * vec4(q.xyz, 1.0)).xyz; // ndc to window coordinates
          */
-        czm_viewportTransformation : {
+        czm_viewportTransformation : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -133,7 +152,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getViewportTransformation();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model transformation matrix that
@@ -154,7 +173,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 worldPosition = czm_model * modelPosition;
          */
-        czm_model : {
+        czm_model : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -166,7 +185,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModel();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model transformation matrix that
@@ -186,7 +205,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 modelPosition = czm_inverseModel * worldPosition;
          */
-        czm_inverseModel : {
+        czm_inverseModel : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -198,7 +217,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseModel();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 view transformation matrix that
@@ -221,7 +240,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 eyePosition = czm_view * worldPosition;
          */
-        czm_view : {
+        czm_view : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -233,7 +252,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getView();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 view transformation matrix that
@@ -255,7 +274,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 eyePosition3D = czm_view3D * worldPosition3D;
          */
-        czm_view3D : {
+        czm_view3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -267,7 +286,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getView3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 view rotation matrix that
@@ -288,7 +307,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 eyeVector = czm_viewRotation * worldVector;
          */
-        czm_viewRotation : {
+        czm_viewRotation : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -300,7 +319,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getViewRotation();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 view rotation matrix that
@@ -322,7 +341,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 eyeVector = czm_viewRotation3D * worldVector;
          */
-        czm_viewRotation3D : {
+        czm_viewRotation3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -334,7 +353,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getViewRotation3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 transformation matrix that
@@ -354,7 +373,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 worldPosition = czm_inverseView * eyePosition;
          */
-        czm_inverseView : {
+        czm_inverseView : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -366,7 +385,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseView();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 transformation matrix that
@@ -388,7 +407,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 worldPosition = czm_inverseView3D * eyePosition;
          */
-        czm_inverseView3D : {
+        czm_inverseView3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -400,7 +419,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseView3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 rotation matrix that
@@ -421,7 +440,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 worldVector = czm_inverseViewRotation * eyeVector;
          */
-        czm_inverseViewRotation : {
+        czm_inverseViewRotation : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -433,7 +452,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseViewRotation();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 rotation matrix that
@@ -455,7 +474,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 worldVector = czm_inverseViewRotation3D * eyeVector;
          */
-        czm_inverseViewRotation3D : {
+        czm_inverseViewRotation3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -467,7 +486,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseViewRotation3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 projection transformation matrix that
@@ -489,7 +508,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * gl_Position = czm_projection * eyePosition;
          */
-        czm_projection : {
+        czm_projection : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -501,7 +520,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getProjection();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 inverse projection transformation matrix that
@@ -521,7 +540,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 eyePosition = czm_inverseProjection * clipPosition;
          */
-        czm_inverseProjection : {
+        czm_inverseProjection : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -533,7 +552,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseProjection();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 projection transformation matrix with the far plane at infinity,
@@ -556,7 +575,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * gl_Position = czm_infiniteProjection * eyePosition;
          */
-        czm_infiniteProjection : {
+        czm_infiniteProjection : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -568,7 +587,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInfiniteProjection();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model-view transformation matrix that
@@ -596,7 +615,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // The above is equivalent to, but more efficient than:
          * vec4 eyePosition = czm_view * czm_model * modelPosition;
          */
-        czm_modelView : {
+        czm_modelView : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -608,7 +627,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModelView();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model-view transformation matrix that
@@ -636,7 +655,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // The above is equivalent to, but more efficient than:
          * vec4 eyePosition = czm_view3D * czm_model * modelPosition;
          */
-        czm_modelView3D : {
+        czm_modelView3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -648,7 +667,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModelView3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model-view transformation matrix that
@@ -676,7 +695,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * @see czm_translateRelativeToEye
          * @see EncodedCartesian3
          */
-        czm_modelViewRelativeToEye : {
+        czm_modelViewRelativeToEye : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -688,7 +707,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModelViewRelativeToEye();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 transformation matrix that
@@ -707,7 +726,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 modelPosition = czm_inverseModelView * eyePosition;
          */
-        czm_inverseModelView : {
+        czm_inverseModelView : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -719,7 +738,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseModelView();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 transformation matrix that
@@ -742,7 +761,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 modelPosition = czm_inverseModelView3D * eyePosition;
          */
-        czm_inverseModelView3D : {
+        czm_inverseModelView3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -754,7 +773,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseModelView3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 view-projection transformation matrix that
@@ -779,7 +798,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // The above is equivalent to, but more efficient than:
          * gl_Position = czm_projection * czm_view * czm_model * modelPosition;
          */
-        czm_viewProjection : {
+        czm_viewProjection : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -791,7 +810,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getViewProjection();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model-view-projection transformation matrix that
@@ -819,7 +838,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // The above is equivalent to, but more efficient than:
          * gl_Position = czm_projection * czm_view * czm_model * modelPosition;
          */
-        czm_modelViewProjection : {
+        czm_modelViewProjection : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -831,7 +850,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModelViewProjection();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model-view-projection transformation matrix that
@@ -860,7 +879,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * @see czm_translateRelativeToEye
          * @see EncodedCartesian3
          */
-        czm_modelViewProjectionRelativeToEye : {
+        czm_modelViewProjectionRelativeToEye : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -872,7 +891,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModelViewProjectionRelativeToEye();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 4x4 model-view-projection transformation matrix that
@@ -900,7 +919,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // The above is equivalent to, but more efficient than:
          * gl_Position = czm_infiniteProjection * czm_view * czm_model * modelPosition;
          */
-        czm_modelViewInfiniteProjection : {
+        czm_modelViewInfiniteProjection : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -912,7 +931,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getModelViewInfiniteProjection();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 normal transformation matrix that
@@ -935,7 +954,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 eyeNormal = czm_normal * normal;
          */
-        czm_normal : {
+        czm_normal : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -947,7 +966,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getNormal();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 normal transformation matrix that
@@ -973,7 +992,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 eyeNormal = czm_normal3D * normal;
          */
-        czm_normal3D : {
+        czm_normal3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -985,7 +1004,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getNormal3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 normal transformation matrix that
@@ -1007,7 +1026,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 normalMC = czm_inverseNormal * normalEC;
          */
-        czm_inverseNormal : {
+        czm_inverseNormal : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1019,7 +1038,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseNormal();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 normal transformation matrix that
@@ -1043,7 +1062,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 normalMC = czm_inverseNormal3D * normalEC;
          */
-        czm_inverseNormal3D : {
+        czm_inverseNormal3D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1055,7 +1074,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getInverseNormal3D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform containing height (<code>x</code>) and height squared (<code>y</code>)
@@ -1066,7 +1085,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          *
          * @see UniformState#getEyeHeight2D
          */
-        czm_eyeHeight2D : {
+        czm_eyeHeight2D : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1078,7 +1097,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getEyeHeight2D();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform containing the near distance (<code>x</code>) and the far distance (<code>y</code>)
@@ -1098,7 +1117,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * float frustumLength = czm_entireFrustum.y - czm_entireFrustum.x;
          */
-        czm_entireFrustum : {
+        czm_entireFrustum : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1110,7 +1129,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getEntireFrustum();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform containing the near distance (<code>x</code>) and the far distance (<code>y</code>)
@@ -1130,7 +1149,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * float frustumLength = czm_currentFrustum.y - czm_currentFrustum.x;
          */
-        czm_currentFrustum : {
+        czm_currentFrustum : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1142,7 +1161,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getCurrentFrustum();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the size of a pixel in meters at a distance of one meter
@@ -1158,7 +1177,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example: the pixel size at a position in eye coordinates
          * float pixelSize = czm_pixelSizeInMeters * positionEC.z;
          */
-        czm_pixelSizeInMeters : {
+        czm_pixelSizeInMeters : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1170,7 +1189,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getPixelSize();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the sun position in world coordinates.
@@ -1186,7 +1205,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform vec3 czm_sunPositionWC;
          */
-        czm_sunPositionWC : {
+        czm_sunPositionWC : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1198,7 +1217,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getSunPositionWC();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the sun position in Columbus view world coordinates.
@@ -1213,7 +1232,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform vec3 czm_sunPositionColumbusView;
          */
-        czm_sunPositionColumbusView : {
+        czm_sunPositionColumbusView : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1225,7 +1244,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getSunPositionColumbusView();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the normalized direction to the sun in eye coordinates.
@@ -1245,7 +1264,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * float diffuse = max(dot(czm_sunDirectionEC, normalEC), 0.0);
          */
-        czm_sunDirectionEC : {
+        czm_sunDirectionEC : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1257,7 +1276,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getSunDirectionEC();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the normalized direction to the sun in world coordinates.
@@ -1274,7 +1293,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform vec3 czm_sunDirectionWC;
          */
-        czm_sunDirectionWC : {
+        czm_sunDirectionWC : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1286,7 +1305,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getSunDirectionWC();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the normalized direction to the moon in eye coordinates.
@@ -1305,7 +1324,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * float diffuse = max(dot(czm_moonDirectionEC, normalEC), 0.0);
          */
-        czm_moonDirectionEC : {
+        czm_moonDirectionEC : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1317,7 +1336,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getMoonDirectionEC();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the high bits of the camera position in model
@@ -1335,7 +1354,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform vec3 czm_encodedCameraPositionMCHigh;
          */
-        czm_encodedCameraPositionMCHigh : {
+        czm_encodedCameraPositionMCHigh : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1347,7 +1366,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getEncodedCameraPositionMCHigh();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the low bits of the camera position in model
@@ -1365,7 +1384,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform vec3 czm_encodedCameraPositionMCLow;
          */
-        czm_encodedCameraPositionMCLow : {
+        czm_encodedCameraPositionMCLow : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1377,7 +1396,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getEncodedCameraPositionMCLow();
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the position of the viewer (camera) in world coordinates.
@@ -1389,7 +1408,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform vec3 czm_viewerPositionWC;
          */
-        czm_viewerPositionWC : {
+        czm_viewerPositionWC : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1401,7 +1420,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return Matrix4.getTranslation(uniformState.getInverseView(), viewerPositionWCScratch);
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the frame number. This uniform is automatically incremented
@@ -1414,7 +1433,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // GLSL declaration
          * uniform float czm_frameNumber;
          */
-        czm_frameNumber : {
+        czm_frameNumber : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1426,7 +1445,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getFrameState().frameNumber;
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the current morph transition time between
@@ -1442,7 +1461,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec4 p = czm_columbusViewMorph(position2D, position3D, czm_morphTime);
          */
-        czm_morphTime : {
+        czm_morphTime : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1454,7 +1473,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getFrameState().morphTime;
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing the current {@link SceneMode} enumeration, expressed
@@ -1478,7 +1497,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          *     eyeHeightSq = czm_eyeHeight2D.y;
          * }
          */
-        czm_sceneMode : {
+        czm_sceneMode : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1490,7 +1509,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getFrameState().mode.value;
             }
-        },
+        }),
 
         /**
          * An automatic GLSL uniform representing a 3x3 rotation matrix that transforms
@@ -1509,7 +1528,7 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
          * // Example
          * vec3 pseudoFixed = czm_temeToPseudoFixed * teme;
          */
-        czm_temeToPseudoFixed : {
+        czm_temeToPseudoFixed : new AutomaticUniform({
             getSize : function() {
                 return 1;
             },
@@ -1521,6 +1540,8 @@ define(['Core/Cartesian3', 'Core/Matrix4', 'Renderer/UniformDatatype'],function(
             getValue : function(uniformState) {
                 return uniformState.getTemeToPseudoFixedMatrix();
             }
-        }
+        })
     };
-});
+
+    return AutomaticUniforms;
+});