cesium 0.22.0 → 0.23.0

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

@@ -1,11 +1,10 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/VertexFormat', 'Scene/Material', 'Scene/Appearance', 'Scene/MaterialAppearance', 'Shaders/Appearances/EllipsoidSurfaceAppearanceVS', 'Shaders/Appearances/EllipsoidSurfaceAppearanceFS'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/VertexFormat', 'Scene/Material', 'Scene/Appearance', 'Shaders/Appearances/EllipsoidSurfaceAppearanceVS', 'Shaders/Appearances/EllipsoidSurfaceAppearanceFS'], function(
         defaultValue,
         defined,
         VertexFormat,
         Material,
         Appearance,
-        MaterialAppearance,
         EllipsoidSurfaceAppearanceVS,
         EllipsoidSurfaceAppearanceFS) {
     "use strict";

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

@@ -1,7 +1,5 @@
 /*global define*/
-define(['Core/defined', 'Core/Cartesian2', 'Scene/SceneMode'], function(
-        defined,
-        Cartesian2,
+define(['Scene/SceneMode'], function(
         SceneMode) {
     "use strict";
 

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

@@ -1,21 +1,18 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/loadText', 'Core/Cartesian2', 'Core/DeveloperError', 'Core/RuntimeError', 'Core/Event', 'Core/Extent', 'Scene/DiscardMissingTileImagePolicy', 'Scene/ImageryProvider', 'Scene/TileProviderError', 'Scene/WebMercatorTilingScheme', 'Scene/GeographicTilingScheme', 'Scene/Credit', 'ThirdParty/when'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/loadText', 'Core/DeveloperError', 'Core/RuntimeError', 'Core/Event', 'Core/Extent', 'Scene/ImageryProvider', 'Scene/TileProviderError', 'Scene/WebMercatorTilingScheme', 'Scene/GeographicTilingScheme', 'Scene/Credit', 'ThirdParty/when'], function(
         defaultValue,
         defined,
         loadText,
-        Cartesian2,
         DeveloperError,
         RuntimeError,
         Event,
         Extent,
-        DiscardMissingTileImagePolicy,
         ImageryProvider,
         TileProviderError,
         WebMercatorTilingScheme,
         GeographicTilingScheme,
         Credit,
-        when
-        ) {
+        when) {
     "use strict";
 
     /**

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

@@ -1,10 +1,9 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Event', 'Core/writeTextToCanvas', 'Scene/ImageryProvider', 'Scene/WebMercatorTilingScheme', 'Scene/Credit'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Event', 'Scene/ImageryProvider', 'Scene/WebMercatorTilingScheme', 'Scene/Credit'], function(
         defaultValue,
         defined,
         DeveloperError,
         Event,
-        writeTextToCanvas,
         ImageryProvider,
         WebMercatorTilingScheme,
         Credit) {

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

@@ -1,9 +1,8 @@
 /*global define*/
-define(['Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/destroyObject', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Matrix4', 'Scene/CullingVolume'], function(
+define(['Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Matrix4', 'Scene/CullingVolume'], function(
         defined,
         defineProperties,
         DeveloperError,
-        destroyObject,
         Cartesian2,
         Cartesian3,
         Cartesian4,

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

@@ -1,10 +1,9 @@
 /*global define*/
-define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Matrix4', 'Scene/CullingVolume'], function(
+define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Matrix4', 'Scene/CullingVolume'], function(
         DeveloperError,
         defaultValue,
         defined,
         defineProperties,
-        destroyObject,
         Cartesian2,
         Cartesian3,
         Cartesian4,

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color', 'Core/destroyObject', 'Core/Math', 'Core/Ellipsoid', 'Core/GeometryInstance', 'Core/PolygonGeometry', 'Core/PolygonPipeline', 'Core/Queue', 'Scene/EllipsoidSurfaceAppearance', 'Scene/Primitive', 'Scene/Material'], function(
+define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color', 'Core/destroyObject', 'Core/Math', 'Core/Ellipsoid', 'Core/GeometryInstance', 'Core/PolygonGeometry', 'Scene/EllipsoidSurfaceAppearance', 'Scene/Primitive', 'Scene/Material'], function(
         DeveloperError,
         defaultValue,
         defined,
@@ -9,8 +9,6 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
         Ellipsoid,
         GeometryInstance,
         PolygonGeometry,
-        PolygonPipeline,
-        Queue,
         EllipsoidSurfaceAppearance,
         Primitive,
         Material) {

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

@@ -42,8 +42,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         this._id = options.id;
 
         var modelMatrix;
-        if (defined(this._polylineCollection)) {
-            modelMatrix = Matrix4.clone(this._polylineCollection.modelMatrix);
+        if (defined(polylineCollection)) {
+            modelMatrix = Matrix4.clone(polylineCollection.modelMatrix);
         }
 
         this._modelMatrix = modelMatrix;
@@ -57,6 +57,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         this._pickId = undefined;
         this._pickIdThis = options._pickIdThis;
         this._boundingVolume = BoundingSphere.fromPoints(this._positions);
+        this._boundingVolumeWC = BoundingSphere.transform(this._boundingVolume, this._modelMatrix);
         this._boundingVolume2D = new BoundingSphere(); // modified in PolylineCollection
     };
 
@@ -158,6 +159,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         this._positions = value;
         this._length = value.length;
         this._boundingVolume = BoundingSphere.fromPoints(this._positions, this._boundingVolume);
+        this._boundingVolumeWC = BoundingSphere.transform(this._boundingVolume, this._modelMatrix, this._boundingVolumeWC);
         makeDirty(this, POSITION_INDEX);
 
         this.update();
@@ -178,6 +180,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         var positionsChanged = this._propertiesChanged[POSITION_INDEX] > 0 || this._propertiesChanged[POSITION_SIZE_INDEX] > 0;
         if (!Matrix4.equals(modelMatrix, this._modelMatrix) || positionsChanged) {
             this._segments = PolylinePipeline.wrapLongitude(this._positions, modelMatrix);
+            this._boundingVolumeWC = BoundingSphere.transform(this._boundingVolume, modelMatrix, this._boundingVolumeWC);
         }
 
         this._modelMatrix = modelMatrix;

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

@@ -1,10 +1,9 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/combine', 'Core/destroyObject', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/EncodedCartesian3', 'Core/Matrix4', 'Core/Math', 'Core/ComponentDatatype', 'Core/IndexDatatype', 'Core/PrimitiveType', 'Core/BoundingSphere', 'Core/Intersect', 'Renderer/BlendingState', 'Renderer/BufferUsage', 'Renderer/CommandLists', 'Renderer/DrawCommand', 'Renderer/createShaderSource', 'Scene/Material', 'Scene/SceneMode', 'Scene/Polyline', 'Shaders/PolylineCommon', 'Shaders/PolylineVS', 'Shaders/PolylineFS'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/destroyObject', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/EncodedCartesian3', 'Core/Matrix4', 'Core/Math', 'Core/ComponentDatatype', 'Core/IndexDatatype', 'Core/PrimitiveType', 'Core/BoundingSphere', 'Core/Intersect', 'Renderer/BlendingState', 'Renderer/BufferUsage', 'Renderer/CommandLists', 'Renderer/DrawCommand', 'Renderer/createShaderSource', 'Scene/Material', 'Scene/SceneMode', 'Scene/Polyline', 'Shaders/PolylineCommon', 'Shaders/PolylineVS', 'Shaders/PolylineFS'], function(
         defaultValue,
         defined,
         DeveloperError,
         Color,
-        combine,
         destroyObject,
         Cartesian3,
         Cartesian4,
@@ -474,7 +473,6 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
             commandLists.pickList.opaqueList = pickList;
             createCommandLists(this, context, frameState, pickList, modelMatrix, false, false);
 
-            var size = pickList.length;
             pickList = this._pickTranslucentCommands;
             commandLists.pickList.translucentList = pickList;
             createCommandLists(this, context, frameState, pickList, modelMatrix, false, true);
@@ -565,7 +563,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
 
                     var boundingVolume;
                     if (frameState.mode === SceneMode.SCENE3D) {
-                        boundingVolume = polyline._boundingVolume;
+                        boundingVolume = polyline._boundingVolumeWC;
                     } else if (frameState.mode === SceneMode.COLUMBUS_VIEW) {
                         boundingVolume = polyline._boundingVolume2D;
                     } else if (frameState.mode === SceneMode.SCENE2D) {
@@ -573,8 +571,8 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Color'
                             boundingVolume = BoundingSphere.clone(polyline._boundingVolume2D, boundingSphereScratch2);
                             boundingVolume.center.x = 0.0;
                         }
-                    } else if (defined(polyline._boundingVolume) && defined(polyline._boundingVolume2D)) {
-                        boundingVolume = BoundingSphere.union(polyline._boundingVolume, polyline._boundingVolume2D, boundingSphereScratch2);
+                    } else if (defined(polyline._boundingVolumeWC) && defined(polyline._boundingVolume2D)) {
+                        boundingVolume = BoundingSphere.union(polyline._boundingVolumeWC, polyline._boundingVolume2D, boundingSphereScratch2);
                     }
 
                     if (cloneBoundingSphere) {

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

@@ -1,5 +1,5 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/destroyObject', 'Core/Matrix4', 'Core/BoundingSphere', 'Core/Geometry', 'Core/GeometryAttribute', 'Core/GeometryAttributes', 'Core/GeometryInstance', 'Core/GeometryInstanceAttribute', 'Core/ComponentDatatype', 'Core/TaskProcessor', 'Core/GeographicProjection', 'Core/Queue', 'Core/clone', 'Renderer/BufferUsage', 'Renderer/VertexLayout', 'Renderer/CommandLists', 'Renderer/DrawCommand', 'Renderer/createShaderSource', 'Renderer/CullFace', 'Scene/PrimitivePipeline', 'Scene/PrimitiveState', 'Scene/SceneMode', 'ThirdParty/when'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/destroyObject', 'Core/Matrix4', 'Core/BoundingSphere', 'Core/Geometry', 'Core/GeometryAttribute', 'Core/GeometryAttributes', 'Core/GeometryInstance', 'Core/GeometryInstanceAttribute', 'Core/ComponentDatatype', 'Core/TaskProcessor', 'Core/GeographicProjection', 'Core/clone', 'Renderer/BufferUsage', 'Renderer/VertexLayout', 'Renderer/CommandLists', 'Renderer/DrawCommand', 'Renderer/createShaderSource', 'Renderer/CullFace', 'Scene/PrimitivePipeline', 'Scene/PrimitiveState', 'Scene/SceneMode', 'ThirdParty/when'], function(
         defaultValue,
         defined,
         defineProperties,
@@ -15,7 +15,6 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         ComponentDatatype,
         TaskProcessor,
         GeographicProjection,
-        Queue,
         clone,
         BufferUsage,
         VertexLayout,
@@ -190,6 +189,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          * @see czm_model
          */
         this.modelMatrix = Matrix4.clone(Matrix4.IDENTITY);
+        this._modelMatrix = new Matrix4();
 
         /**
          * Determines if the primitive will be shown.  This affects all geometry
@@ -278,9 +278,9 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
         this._vaAttributes = undefined;
         this._error = undefined;
 
-        // When true, geometry is transformed to world coordinates even if there is a single
-        // geometry or all geometries are in the same reference frame.
         this._boundingSphere = undefined;
+        this._boundingSphereWC = undefined;
+        this._boundingSphereCV = undefined;
         this._boundingSphere2D = undefined;
         this._perInstanceAttributeIndices = undefined;
         this._instanceIds = [];
@@ -671,9 +671,6 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
             var vaAttributes = this._vaAttributes;
 
             this._boundingSphere = BoundingSphere.clone(geometries[0].boundingSphere);
-            if (!this.allow3DOnly && defined(this._boundingSphere)) {
-                this._boundingSphere2D = BoundingSphere.projectTo2D(this._boundingSphere, projection);
-            }
 
             var va = [];
             length = geometries.length;
@@ -881,16 +878,25 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
             attributes.length = 0;
         }
 
+        if (!Matrix4.equals(this.modelMatrix, this._modelMatrix)) {
+            Matrix4.clone(this.modelMatrix, this._modelMatrix);
+            this._boundingSphereWC = BoundingSphere.transform(this._boundingSphere, this.modelMatrix, this._boundingSphereWC);
+            if (!this.allow3DOnly && defined(this._boundingSphere)) {
+                this._boundingSphereCV = BoundingSphere.projectTo2D(this._boundingSphereWC, projection, this._boundingSphereCV);
+                this._boundingSphere2D = BoundingSphere.clone(this._boundingSphereCV, this._boundingSphere2D);
+                this._boundingSphere2D.center.x = 0.0;
+            }
+        }
+
         var boundingSphere;
         if (frameState.mode === SceneMode.SCENE3D) {
-            boundingSphere = this._boundingSphere;
+            boundingSphere = this._boundingSphereWC;
         } else if (frameState.mode === SceneMode.COLUMBUS_VIEW) {
-            boundingSphere = this._boundingSphere2D;
+            boundingSphere = this._boundingSphereCV;
         } else if (frameState.mode === SceneMode.SCENE2D && defined(this._boundingSphere2D)) {
-            boundingSphere = BoundingSphere.clone(this._boundingSphere2D);
-            boundingSphere.center.x = 0.0;
-        } else if (defined(this._boundingSphere) && defined(this._boundingSphere2D)) {
-            boundingSphere = BoundingSphere.union(this._boundingSphere, this._boundingSphere2D);
+            boundingSphere = this._boundingSphere2D;
+        } else if (defined(this._boundingSphereWC) && defined(this._boundingSphereCV)) {
+            boundingSphere = BoundingSphere.union(this._boundingSphereWC, this._boundingSphereCV);
         }
 
         // modelMatrix can change from frame to frame

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

@@ -157,7 +157,7 @@ define(['Core/defined', 'Core/defaultValue', 'Core/Color', 'Core/ComponentDataty
         var length = instances.length;
         var primitiveType = instances[0].geometry.primitiveType;
         for (i = 1; i < length; ++i) {
-            if (instances[i].geometry.primitiveType.value !== primitiveType.value) {
+            if (instances[i].geometry.primitiveType !== primitiveType) {
                 throw new DeveloperError('All instance geometries must have the same primitiveType.');
             }
         }

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

@@ -490,15 +490,13 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
                     var command = commandList[k];
                     var boundingVolume = command.boundingVolume;
                     if (defined(boundingVolume)) {
-                        var modelMatrix = defaultValue(command.modelMatrix, Matrix4.IDENTITY);
-                        var transformedBV = boundingVolume.transform(modelMatrix);               //TODO: Remove this allocation.
                         if (command.cull &&
-                                ((cullingVolume.getVisibility(transformedBV) === Intersect.OUTSIDE) ||
-                                 (defined(occluder) && !occluder.isBoundingSphereVisible(transformedBV)))) {
+                                ((cullingVolume.getVisibility(boundingVolume) === Intersect.OUTSIDE) ||
+                                 (defined(occluder) && !occluder.isBoundingSphereVisible(boundingVolume)))) {
                             continue;
                         }
 
-                        distances = transformedBV.getPlaneDistances(position, direction, distances);
+                        distances = boundingVolume.getPlaneDistances(position, direction, distances);
                         near = Math.min(near, distances.start);
                         far = Math.max(far, distances.stop);
                     } else {
@@ -614,7 +612,7 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
                 });
             }
 
-            var m = Matrix4.multiplyByTranslation(defaultValue(command.modelMatrix, Matrix4.IDENTITY), command.boundingVolume.center);
+            var m = Matrix4.multiplyByTranslation(Matrix4.IDENTITY, command.boundingVolume.center);
             scene._debugSphere.modelMatrix = Matrix4.multiplyByUniformScale(m, command.boundingVolume.radius);
 
             var commandList = [];
@@ -638,14 +636,13 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         }
         cullingVolume = scratchCullingVolume;
 
-        var modelMatrix = defaultValue(command.modelMatrix, Matrix4.IDENTITY);
-        var transformedBV = command.boundingVolume.transform(modelMatrix);               //TODO: Remove this allocation.
+        var boundingVolume = command.boundingVolume;
 
         return ((defined(command)) &&
                  ((!defined(command.boundingVolume)) ||
                   !command.cull ||
-                  ((cullingVolume.getVisibility(transformedBV) !== Intersect.OUTSIDE) &&
-                   (!defined(occluder) || occluder.isBoundingSphereVisible(transformedBV)))));
+                  ((cullingVolume.getVisibility(boundingVolume) !== Intersect.OUTSIDE) &&
+                   (!defined(occluder) || occluder.isBoundingSphereVisible(boundingVolume)))));
     }
 
     function executeCommands(scene, passState, clearColor) {

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

@@ -1,7 +1,5 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Cartographic', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Matrix4', 'Core/BoundingRectangle', 'Core/Math', 'Scene/SceneMode'],
-    function(
-        defaultValue,
+define(['Core/defined', 'Core/DeveloperError', 'Core/Cartographic', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Cartesian4', 'Core/Matrix4', 'Core/BoundingRectangle', 'Core/Math', 'Scene/SceneMode'], function(
         defined,
         DeveloperError,
         Cartographic,

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

@@ -61,14 +61,14 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
          * @type {Event}
          * @default Event()
          */
-        this.onTransitionStart = new Event();
+        this.transitionStart = new Event();
 
         /**
          * Gets the event fired at the completion of a transition.
          * @type {Event}
          * @default Event()
          */
-        this.onTransitionComplete = new Event();
+        this.transitionComplete = new Event();
 
         this._scene = scene;
         this._ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);
@@ -161,7 +161,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
 
         this._previousMode = this._scene.mode;
         if (this._previousMode !== SceneMode.SCENE2D) {
-            this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE2D, false);
+            this.transitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE2D, false);
             complete2DCallback(this);
         }
     };
@@ -179,7 +179,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         this._previousMode = scene.mode;
 
         if (this._previousMode !== SceneMode.COLUMBUS_VIEW) {
-            this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.COLUMBUS_VIEW, false);
+            this.transitionStart.raiseEvent(this, this._previousMode, SceneMode.COLUMBUS_VIEW, false);
             completeColumbusViewCallback(this);
         }
     };
@@ -197,7 +197,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         this._previousMode = scene.mode;
 
         if (scene.mode !== SceneMode.SCENE3D) {
-            this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE3D, false);
+            this.transitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE3D, false);
             complete3DCallback(this);
         }
     };
@@ -230,7 +230,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         if (this._previousMode === SceneMode.SCENE2D || this._previousMode === SceneMode.MORPHING) {
             return;
         }
-        this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE2D, true);
+        this.transitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE2D, true);
 
         updateFrustums(this);
         scene.mode = SceneMode.MORPHING;
@@ -258,7 +258,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         if (this._previousMode === SceneMode.COLUMBUS_VIEW || this._previousMode === SceneMode.MORPHING) {
             return;
         }
-        this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.COLUMBUS_VIEW, true);
+        this.transitionStart.raiseEvent(this, this._previousMode, SceneMode.COLUMBUS_VIEW, true);
 
         updateFrustums(this);
         scene.mode = SceneMode.MORPHING;
@@ -286,7 +286,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         if (this._previousMode === SceneMode.SCENE3D || this._previousMode === SceneMode.MORPHING) {
             return;
         }
-        this.onTransitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE3D, true);
+        this.transitionStart.raiseEvent(this, this._previousMode, SceneMode.SCENE3D, true);
 
         updateFrustums(this);
         scene.mode = SceneMode.MORPHING;
@@ -748,7 +748,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
 
         var wasMorphing = defined(transitioner._completeMorph);
         transitioner._completeMorph = undefined;
-        transitioner.onTransitionComplete.raiseEvent(transitioner, transitioner._previousMode, SceneMode.SCENE3D, wasMorphing);
+        transitioner.transitionComplete.raiseEvent(transitioner, transitioner._previousMode, SceneMode.SCENE3D, wasMorphing);
     }
 
     function complete2DCallback(transitioner) {
@@ -770,7 +770,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
 
         var wasMorphing = defined(transitioner._completeMorph);
         transitioner._completeMorph = undefined;
-        transitioner.onTransitionComplete.raiseEvent(transitioner, transitioner._previousMode, SceneMode.SCENE2D, wasMorphing);
+        transitioner.transitionComplete.raiseEvent(transitioner, transitioner._previousMode, SceneMode.SCENE2D, wasMorphing);
     }
 
     function completeColumbusViewCallback(transitioner) {
@@ -796,7 +796,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
 
         var wasMorphing = defined(transitioner._completeMorph);
         transitioner._completeMorph = undefined;
-        transitioner.onTransitionComplete.raiseEvent(transitioner, transitioner._previousMode, SceneMode.COLUMBUS_VIEW, wasMorphing);
+        transitioner.transitionComplete.raiseEvent(transitioner, transitioner._previousMode, SceneMode.COLUMBUS_VIEW, wasMorphing);
     }
 
     return SceneTransitioner;

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

@@ -1,9 +1,8 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/loadImage', 'Core/writeTextToCanvas', 'Core/DeveloperError', 'Core/Event', 'Core/Extent', 'Scene/Credit', 'Scene/GeographicTilingScheme', 'Scene/TileProviderError', 'ThirdParty/when'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/loadImage', 'Core/DeveloperError', 'Core/Event', 'Core/Extent', 'Scene/Credit', 'Scene/GeographicTilingScheme', 'Scene/TileProviderError', 'ThirdParty/when'], function(
         defaultValue,
         defined,
         loadImage,
-        writeTextToCanvas,
         DeveloperError,
         Event,
         Extent,

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

@@ -82,7 +82,7 @@ define(['Core/defined', 'Core/destroyObject', 'Core/DeveloperError', 'Renderer/P
         var width = defined(source) ? source.width : description.width;
         var height = defined(source) ? source.height : description.height;
         //coerce values to primitive numbers to make textureTypeKey smaller.
-        var pixelFormat = +(description.pixelFormat || PixelFormat.RGBA);
+        var pixelFormat = (description.pixelFormat || PixelFormat.RGBA);
         var pixelDatatype = +(description.pixelDatatype || PixelDatatype.UNSIGNED_BYTE);
         var preMultiplyAlpha = +(description.preMultiplyAlpha || pixelFormat === PixelFormat.RGB || pixelFormat === PixelFormat.LUMINANCE);
 

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

@@ -1,12 +1,11 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/Cartographic', 'Core/DeveloperError', 'Core/Event', 'Core/loadXML', 'Core/writeTextToCanvas', 'Core/Extent', 'Scene/Credit', 'Scene/ImageryProvider', 'Scene/WebMercatorTilingScheme', 'Scene/GeographicTilingScheme'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/Cartographic', 'Core/DeveloperError', 'Core/Event', 'Core/loadXML', 'Core/Extent', 'Scene/Credit', 'Scene/ImageryProvider', 'Scene/WebMercatorTilingScheme', 'Scene/GeographicTilingScheme'], function(
         defaultValue,
         defined,
         Cartographic,
         DeveloperError,
         Event,
         loadXML,
-        writeTextToCanvas,
         Extent,
         Credit,
         ImageryProvider,

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

@@ -1,12 +1,11 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/defined', 'Core/loadImage', 'Core/loadXML', 'Core/getImagePixels', 'Core/throttleRequestByServer', 'Core/writeTextToCanvas', 'Core/DeveloperError', 'Core/Extent', 'Core/Math', 'Core/Ellipsoid', 'Core/Event', 'Scene/Credit', 'Scene/TerrainProvider', 'Scene/TileProviderError', 'Scene/GeographicTilingScheme', 'Scene/HeightmapTerrainData', 'ThirdParty/when'], function(
+define(['Core/defaultValue', 'Core/defined', 'Core/loadImage', 'Core/loadXML', 'Core/getImagePixels', 'Core/throttleRequestByServer', 'Core/DeveloperError', 'Core/Extent', 'Core/Math', 'Core/Ellipsoid', 'Core/Event', 'Scene/Credit', 'Scene/TerrainProvider', 'Scene/TileProviderError', 'Scene/GeographicTilingScheme', 'Scene/HeightmapTerrainData', 'ThirdParty/when'], function(
         defaultValue,
         defined,
         loadImage,
         loadXML,
         getImagePixels,
         throttleRequestByServer,
-        writeTextToCanvas,
         DeveloperError,
         Extent,
         CesiumMath,