cesium 0.15.0 → 0.16.0

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

@@ -47,6 +47,9 @@ define([
      * camera.frustum.fovy = CesiumMath.PI_OVER_THREE;
      * camera.frustum.near = 1.0;
      * camera.frustum.far = 2.0;
+     *
+     * @demo <a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html?src=Camera.html">Cesium Sandcastle Camera Demo</a>
+     * @demo <a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html?src=Camera.html">Sandcastle Example</a> from the <a href="http://cesium.agi.com/2013/02/13/Cesium-Camera-Tutorial/">Camera Tutorial</a>
      */
     var Camera = function(canvas) {
         if (typeof canvas === 'undefined') {

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

@@ -934,7 +934,7 @@ define([
         if (typeof extent === 'undefined') {
             throw new DeveloperError('extent is required.');
         }
-        ellipsoid = (typeof ellipsoid === 'undefined') ? Ellipsoid.WGS84 : ellipsoid;
+        ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);
 
         if (this._mode === SceneMode.SCENE3D) {
             viewExtent3D(this._camera, extent, ellipsoid);
@@ -947,7 +947,7 @@ define([
 
     var pickEllipsoid3DRay = new Ray();
     function pickEllipsoid3D(controller, windowPosition, ellipsoid, result) {
-        ellipsoid = ellipsoid || Ellipsoid.WGS84;
+        ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);
         var ray = controller.getPickRay(windowPosition, pickEllipsoid3DRay);
         var intersection = IntersectionTests.rayEllipsoid(ray, ellipsoid);
         if (!intersection) {
@@ -1010,7 +1010,7 @@ define([
             result = new Cartesian3();
         }
 
-        ellipsoid = ellipsoid || Ellipsoid.WGS84;
+        ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);
 
         if (this._mode === SceneMode.SCENE3D) {
             result = pickEllipsoid3D(this, windowPosition, ellipsoid, result);

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

@@ -1,8 +1,9 @@
 /*global define*/
 define([
-        '../Core/defaultValue',
         '../Core/Cartesian3',
         '../Core/Cartographic',
+        '../Core/clone',
+        '../Core/defaultValue',
         '../Core/DeveloperError',
         '../Core/Ellipsoid',
         '../Core/HermiteSpline',
@@ -17,9 +18,10 @@ define([
         '../Scene/SceneMode',
         '../ThirdParty/Tween'
     ], function(
-        defaultValue,
         Cartesian3,
         Cartographic,
+        clone,
+        defaultValue,
         DeveloperError,
         Ellipsoid,
         HermiteSpline,
@@ -407,7 +409,7 @@ define([
      * @see CameraFlightPath#createAnimationCartographic
      */
     CameraFlightPath.createAnimation = function(frameState, description) {
-        description = defaultValue(description, {});
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
         var destination = description.destination;
         var direction = description.direction;
         var up = description.up;
@@ -467,7 +469,7 @@ define([
      * @see CameraFlightPath#createAnimationCartographic
      */
     CameraFlightPath.createAnimationCartographic = function(frameState, description) {
-        description = defaultValue(description, {});
+        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
         var destination = description.destination;
 
         if (typeof frameState === 'undefined') {
@@ -487,8 +489,9 @@ define([
             end = projection.project(destination);
         }
 
-        description.destination = end;
-        return this.createAnimation(frameState, description);
+        var createAnimationDescription = clone(description);
+        createAnimationDescription.destination = end;
+        return this.createAnimation(frameState, createAnimationDescription);
     };
 
     return CameraFlightPath;

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

@@ -131,7 +131,10 @@ define([
         this._rsColor = undefined;
         this._rsColorWithoutDepthTest = undefined;
 
-        this._clearDepthCommand = new ClearCommand();
+        var clearDepthCommand = new ClearCommand();
+        clearDepthCommand.depth = 1.0;
+        clearDepthCommand.stencil = 0;
+        this._clearDepthCommand = clearDepthCommand;
 
         this._depthCommand = new DrawCommand();
         this._depthCommand.primitiveType = PrimitiveType.TRIANGLES;
@@ -181,16 +184,6 @@ define([
          */
         this.show = true;
 
-        /**
-         * The current morph transition time between 2D/Columbus View and 3D,
-         * with 0.0 being 2D or Columbus View and 1.0 being 3D.
-         *
-         * @type Number
-         *
-         * @default 1.0
-         */
-        this.morphTime = 1.0;
-
         this._mode = SceneMode.SCENE3D;
         this._projection = undefined;
 
@@ -232,12 +225,6 @@ define([
         var that = this;
 
         this._drawUniforms = {
-            u_mode : function() {
-                return that._mode;
-            },
-            u_morphTime : function() {
-                return that.morphTime;
-            },
             u_zoomedOutOceanSpecularIntensity : function() {
                 return that._zoomedOutOceanSpecularIntensity;
             },
@@ -269,12 +256,12 @@ define([
         return this._imageryLayerCollection;
     };
 
-    CentralBody.prototype._computeDepthQuad = function(frameState) {
-        var radii = this._ellipsoid.getRadii();
+    function computeDepthQuad(centralBody, frameState) {
+        var radii = centralBody._ellipsoid.getRadii();
         var p = frameState.camera.getPositionWC();
 
         // Find the corresponding position in the scaled space of the ellipsoid.
-        var q = this._ellipsoid.getOneOverRadii().multiplyComponents(p);
+        var q = centralBody._ellipsoid.getOneOverRadii().multiplyComponents(p);
 
         var qMagnitude = q.magnitude();
         var qUnit = q.normalize();
@@ -298,14 +285,14 @@ define([
         var lowerLeft = radii.multiplyComponents(center.subtract(northOffset).subtract(eastOffset));
         var lowerRight = radii.multiplyComponents(center.subtract(northOffset).add(eastOffset));
         return [upperLeft.x, upperLeft.y, upperLeft.z, lowerLeft.x, lowerLeft.y, lowerLeft.z, upperRight.x, upperRight.y, upperRight.z, lowerRight.x, lowerRight.y, lowerRight.z];
-    };
+    }
 
-    CentralBody.prototype._computePoleQuad = function(frameState, maxLat, maxGivenLat, viewProjMatrix, viewportTransformation) {
-        var pt1 = this._ellipsoid.cartographicToCartesian(new Cartographic(0.0, maxGivenLat));
-        var pt2 = this._ellipsoid.cartographicToCartesian(new Cartographic(Math.PI, maxGivenLat));
+    function computePoleQuad(centralBody, frameState, maxLat, maxGivenLat, viewProjMatrix, viewportTransformation) {
+        var pt1 = centralBody._ellipsoid.cartographicToCartesian(new Cartographic(0.0, maxGivenLat));
+        var pt2 = centralBody._ellipsoid.cartographicToCartesian(new Cartographic(Math.PI, maxGivenLat));
         var radius = pt1.subtract(pt2).magnitude() * 0.5;
 
-        var center = this._ellipsoid.cartographicToCartesian(new Cartographic(0.0, maxLat));
+        var center = centralBody._ellipsoid.cartographicToCartesian(new Cartographic(0.0, maxLat));
 
         var right;
         var dir = frameState.camera.direction;
@@ -330,12 +317,12 @@ define([
                 Math.floor(center.y) - halfHeight,
                 halfWidth * 2.0,
                 halfHeight * 2.0);
-    };
+    }
 
     var viewportScratch = new BoundingRectangle();
     var vpTransformScratch = new Matrix4();
-    CentralBody.prototype._fillPoles = function(context, frameState) {
-        var terrainProvider = this._surface._terrainProvider;
+    function fillPoles(centralBody, context, frameState) {
+        var terrainProvider = centralBody._surface._terrainProvider;
         if (frameState.mode !== SceneMode.SCENE3D) {
             return;
         }
@@ -361,7 +348,7 @@ define([
         var mesh;
         var rect;
         var positions;
-        var occluder = this._occluder;
+        var occluder = centralBody._occluder;
 
         // handle north pole
         if (terrainMaxExtent.north < CesiumMath.PI_OVER_TWO) {
@@ -371,14 +358,14 @@ define([
                 Math.PI,
                 CesiumMath.PI_OVER_TWO
             );
-            boundingVolume = BoundingSphere.fromExtent3D(extent, this._ellipsoid);
+            boundingVolume = BoundingSphere.fromExtent3D(extent, centralBody._ellipsoid);
             frustumCull = frameState.cullingVolume.getVisibility(boundingVolume) === Intersect.OUTSIDE;
-            occludeePoint = Occluder.computeOccludeePointFromExtent(extent, this._ellipsoid);
+            occludeePoint = Occluder.computeOccludeePointFromExtent(extent, centralBody._ellipsoid);
             occluded = (occludeePoint && !occluder.isPointVisible(occludeePoint, 0.0)) || !occluder.isBoundingSphereVisible(boundingVolume);
 
-            this._drawNorthPole = !frustumCull && !occluded;
-            if (this._drawNorthPole) {
-                rect = this._computePoleQuad(frameState, extent.north, extent.south - latitudeExtension, viewProjMatrix, viewportTransformation);
+            centralBody._drawNorthPole = !frustumCull && !occluded;
+            if (centralBody._drawNorthPole) {
+                rect = computePoleQuad(centralBody, frameState, extent.north, extent.south - latitudeExtension, viewProjMatrix, viewportTransformation);
                 positions = [
                     rect.x, rect.y,
                     rect.x + rect.width, rect.y,
@@ -386,8 +373,8 @@ define([
                     rect.x, rect.y + rect.height
                 ];
 
-                if (typeof this._northPoleCommand.vertexArray === 'undefined') {
-                    this._northPoleCommand.boundingVolume = BoundingSphere.fromExtent3D(extent, this._ellipsoid);
+                if (typeof centralBody._northPoleCommand.vertexArray === 'undefined') {
+                    centralBody._northPoleCommand.boundingVolume = BoundingSphere.fromExtent3D(extent, centralBody._ellipsoid);
                     mesh = {
                         attributes : {
                             position : {
@@ -397,7 +384,7 @@ define([
                             }
                         }
                     };
-                    this._northPoleCommand.vertexArray = context.createVertexArrayFromMesh({
+                    centralBody._northPoleCommand.vertexArray = context.createVertexArrayFromMesh({
                         mesh : mesh,
                         attributeIndices : {
                             position : 0
@@ -406,7 +393,7 @@ define([
                     });
                 } else {
                     datatype = ComponentDatatype.FLOAT;
-                    this._northPoleCommand.vertexArray.getAttribute(0).vertexBuffer.copyFromArrayView(datatype.toTypedArray(positions));
+                    centralBody._northPoleCommand.vertexArray.getAttribute(0).vertexBuffer.copyFromArrayView(datatype.toTypedArray(positions));
                 }
             }
         }
@@ -419,14 +406,14 @@ define([
                 Math.PI,
                 terrainMaxExtent.south
             );
-            boundingVolume = BoundingSphere.fromExtent3D(extent, this._ellipsoid);
+            boundingVolume = BoundingSphere.fromExtent3D(extent, centralBody._ellipsoid);
             frustumCull = frameState.cullingVolume.getVisibility(boundingVolume) === Intersect.OUTSIDE;
-            occludeePoint = Occluder.computeOccludeePointFromExtent(extent, this._ellipsoid);
+            occludeePoint = Occluder.computeOccludeePointFromExtent(extent, centralBody._ellipsoid);
             occluded = (occludeePoint && !occluder.isPointVisible(occludeePoint)) || !occluder.isBoundingSphereVisible(boundingVolume);
 
-            this._drawSouthPole = !frustumCull && !occluded;
-            if (this._drawSouthPole) {
-                rect = this._computePoleQuad(frameState, extent.south, extent.north + latitudeExtension, viewProjMatrix, viewportTransformation);
+            centralBody._drawSouthPole = !frustumCull && !occluded;
+            if (centralBody._drawSouthPole) {
+                rect = computePoleQuad(centralBody, frameState, extent.south, extent.north + latitudeExtension, viewProjMatrix, viewportTransformation);
                 positions = [
                      rect.x, rect.y,
                      rect.x + rect.width, rect.y,
@@ -434,8 +421,8 @@ define([
                      rect.x, rect.y + rect.height
                  ];
 
-                 if (typeof this._southPoleCommand.vertexArray === 'undefined') {
-                     this._southPoleCommand.boundingVolume = BoundingSphere.fromExtent3D(extent, this._ellipsoid);
+                 if (typeof centralBody._southPoleCommand.vertexArray === 'undefined') {
+                     centralBody._southPoleCommand.boundingVolume = BoundingSphere.fromExtent3D(extent, centralBody._ellipsoid);
                      mesh = {
                          attributes : {
                              position : {
@@ -445,7 +432,7 @@ define([
                              }
                          }
                      };
-                     this._southPoleCommand.vertexArray = context.createVertexArrayFromMesh({
+                     centralBody._southPoleCommand.vertexArray = context.createVertexArrayFromMesh({
                          mesh : mesh,
                          attributeIndices : {
                              position : 0
@@ -454,13 +441,13 @@ define([
                      });
                  } else {
                      datatype = ComponentDatatype.FLOAT;
-                     this._southPoleCommand.vertexArray.getAttribute(0).vertexBuffer.copyFromArrayView(datatype.toTypedArray(positions));
+                     centralBody._southPoleCommand.vertexArray.getAttribute(0).vertexBuffer.copyFromArrayView(datatype.toTypedArray(positions));
                  }
             }
         }
 
         var poleIntensity = 0.0;
-        var baseLayer = this._imageryLayerCollection.getLength() > 0 ? this._imageryLayerCollection.get(0) : undefined;
+        var baseLayer = centralBody._imageryLayerCollection.getLength() > 0 ? centralBody._imageryLayerCollection.get(0) : undefined;
         if (typeof baseLayer !== 'undefined' && typeof baseLayer.getImageryProvider() !== 'undefined' && typeof baseLayer.getImageryProvider().getPoleIntensity !== 'undefined') {
             poleIntensity = baseLayer.getImageryProvider().getPoleIntensity();
         }
@@ -471,25 +458,25 @@ define([
             }
         };
 
-        var that = this;
-        if (typeof this._northPoleCommand.uniformMap === 'undefined') {
+        var that = centralBody;
+        if (typeof centralBody._northPoleCommand.uniformMap === 'undefined') {
             var northPoleUniforms = combine([drawUniforms, {
                 u_color : function() {
                     return that.northPoleColor;
                 }
             }], false, false);
-            this._northPoleCommand.uniformMap = combine([northPoleUniforms, this._drawUniforms], false, false);
+            centralBody._northPoleCommand.uniformMap = combine([northPoleUniforms, centralBody._drawUniforms], false, false);
         }
 
-        if (typeof this._southPoleCommand.uniformMap === 'undefined') {
+        if (typeof centralBody._southPoleCommand.uniformMap === 'undefined') {
             var southPoleUniforms = combine([drawUniforms, {
                 u_color : function() {
                     return that.southPoleColor;
                 }
             }], false, false);
-            this._southPoleCommand.uniformMap = combine([southPoleUniforms, this._drawUniforms], false, false);
+            centralBody._southPoleCommand.uniformMap = combine([southPoleUniforms, centralBody._drawUniforms], false, false);
         }
-    };
+    }
 
     /**
      * @private
@@ -541,10 +528,6 @@ define([
                         alpha : false
                     }
                 });
-                this._clearDepthCommand.clearState = context.createClearState({ // Clear depth only
-                    depth : 1.0,
-                    stencil : 0.0
-                });
             } else {
                 this._rsColor = context.createRenderState({
                     cull : {
@@ -568,7 +551,7 @@ define([
         this._southPoleCommand.renderState = this._rsColorWithoutDepthTest;
 
         // update depth plane
-        var depthQuad = this._computeDepthQuad(frameState);
+        var depthQuad = computeDepthQuad(this, frameState);
 
         // depth plane
         if (!this._depthCommand.vertexArray) {
@@ -599,7 +582,7 @@ define([
 
         var shaderCache = context.getShaderCache();
 
-        if (!this._depthCommand.shaderProgram) {
+        if (typeof this._depthCommand.shaderProgram === 'undefined') {
             this._depthCommand.shaderProgram = shaderCache.getShaderProgram(
                     CentralBodyVSDepth,
                     '#line 0\n' +
@@ -614,7 +597,7 @@ define([
             this._lastOceanNormalMapUrl = this.oceanNormalMapUrl;
 
             var that = this;
-            when(loadImage(this.oceanNormalMapUrl, true), function(image) {
+            when(loadImage(this.oceanNormalMapUrl), function(image) {
                 that._oceanNormalMap = that._oceanNormalMap && that._oceanNormalMap.destroy();
                 that._oceanNormalMap = context.createTexture2D({
                     source : image
@@ -682,8 +665,8 @@ define([
                 CentralBodyFS;
             this._surfaceShaderSet.invalidateShaders();
 
-            var poleShaderProgram = this._northPoleCommand.shaderProgram && this._northPoleCommand.shaderProgram.release();
-            poleShaderProgram = shaderCache.getShaderProgram(CentralBodyVSPole, CentralBodyFSPole, TerrainProvider.attributeIndices);
+            var poleShaderProgram = shaderCache.replaceShaderProgram(this._northPoleCommand.shaderProgram,
+                CentralBodyVSPole, CentralBodyFSPole, TerrainProvider.attributeIndices);
 
             this._northPoleCommand.shaderProgram = poleShaderProgram;
             this._southPoleCommand.shaderProgram = poleShaderProgram;
@@ -696,7 +679,7 @@ define([
 
         this._occluder.setCameraPosition(cameraPosition);
 
-        this._fillPoles(context, frameState);
+        fillPoles(this, context, frameState);
 
         this._mode = mode;
         this._projection = projection;
@@ -736,7 +719,6 @@ define([
                     drawUniforms,
                     this._surfaceShaderSet,
                     this._rsColor,
-                    this._mode,
                     this._projection);
 
             updateLogos(this, context, frameState, commandList);

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

@@ -143,11 +143,11 @@ define([
         };
     };
 
-    CentralBodySurface.prototype.update = function(context, frameState, colorCommandList, centralBodyUniformMap, shaderSet, renderState, mode, projection) {
+    CentralBodySurface.prototype.update = function(context, frameState, colorCommandList, centralBodyUniformMap, shaderSet, renderState, projection) {
         updateLayers(this);
         selectTilesForRendering(this, context, frameState);
         processTileLoadQueue(this, context, frameState);
-        createRenderCommandsForSelectedTiles(this, context, frameState, shaderSet, mode, projection, centralBodyUniformMap, colorCommandList, renderState);
+        createRenderCommandsForSelectedTiles(this, context, frameState, shaderSet, projection, centralBodyUniformMap, colorCommandList, renderState);
         debugCreateRenderCommandsForTileBoundingSphere(this, context, frameState, centralBodyUniformMap, shaderSet, renderState, colorCommandList);
     };
 
@@ -866,7 +866,7 @@ define([
     var rtcScratch = new Cartesian3();
     var centerEyeScratch = new Cartesian4();
 
-    function createRenderCommandsForSelectedTiles(surface, context, frameState, shaderSet, mode, projection, centralBodyUniformMap, colorCommandList, renderState) {
+    function createRenderCommandsForSelectedTiles(surface, context, frameState, shaderSet, projection, centralBodyUniformMap, colorCommandList, renderState) {
         var viewMatrix = frameState.camera.getViewMatrix();
 
         var maxTextures = context.getMaximumTextureImageUnits();
@@ -899,7 +899,7 @@ define([
                 var southMercatorYLow = 0.0;
                 var oneOverMercatorHeight = 0.0;
 
-                if (mode !== SceneMode.SCENE3D) {
+                if (frameState.mode !== SceneMode.SCENE3D) {
                     var southwest = projection.project(tile.extent.getSouthwest());
                     var northeast = projection.project(tile.extent.getNortheast());
 
@@ -909,7 +909,7 @@ define([
                     tileExtent.w = northeast.y;
 
                     // In 2D and Columbus View, use the center of the tile for RTC rendering.
-                    if (mode !== SceneMode.MORPHING) {
+                    if (frameState.mode !== SceneMode.MORPHING) {
                         rtc = rtcScratch;
                         rtc.x = 0.0;
                         rtc.y = (tileExtent.z + tileExtent.x) * 0.5;
@@ -955,6 +955,7 @@ define([
                     var command = tileCommands[tileCommandIndex];
                     if (typeof command === 'undefined') {
                         command = new DrawCommand();
+                        command.cull = false;
                         tileCommands[tileCommandIndex] = command;
                         tileCommandUniformMaps[tileCommandIndex] = createTileUniformMap();
                     }
@@ -977,6 +978,7 @@ define([
                     var applyHue = false;
                     var applySaturation = false;
                     var applyGamma = false;
+                    var applyAlpha = false;
 
                     while (numberOfDayTextures < maxTextures && imageryIndex < imageryLen) {
                         var tileImagery = tileImageryCollection[imageryIndex];
@@ -1001,6 +1003,7 @@ define([
                         } else {
                             uniformMap.dayTextureAlpha[numberOfDayTextures] = imageryLayer.alpha;
                         }
+                        applyAlpha = applyAlpha || uniformMap.dayTextureAlpha[numberOfDayTextures] !== 1.0;
 
                         if (typeof imageryLayer.brightness === 'function') {
                             uniformMap.dayTextureBrightness[numberOfDayTextures] = imageryLayer.brightness(frameState, imageryLayer, imagery.x, imagery.y, imagery.level);
@@ -1048,7 +1051,7 @@ define([
 
                     colorCommandList.push(command);
 
-                    command.shaderProgram = shaderSet.getShaderProgram(context, tileSetIndex, applyBrightness, applyContrast, applyHue, applySaturation, applyGamma);
+                    command.shaderProgram = shaderSet.getShaderProgram(context, tileSetIndex, applyBrightness, applyContrast, applyHue, applySaturation, applyGamma, applyAlpha);
                     command.renderState = renderState;
                     command.primitiveType = TerrainProvider.wireframe ? PrimitiveType.LINES : PrimitiveType.TRIANGLES;
                     command.vertexArray = tile.vertexArray;