cesium 0.15.0 → 0.16.0

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

@@ -20,11 +20,11 @@ define([
         }),
         MERCATOR : new Enumeration(1, 'MERCATOR', {
             toWgs84 : function(extent, image) {
-                if (!extent || typeof extent.north === 'undefined' || typeof extent.south === 'undefined') {
+                if (typeof extent === 'undefined' || typeof extent.north === 'undefined' || typeof extent.south === 'undefined') {
                     throw new DeveloperError('extent, extent.north and extent.south are required.');
                 }
 
-                if (!image) {
+                if (typeof image === 'undefined') {
                     throw new DeveloperError('image is required.');
                 }
 

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

@@ -1,17 +1,21 @@
 /*global define*/
 define([
-        '../Core/DeveloperError',
+        '../Core/clone',
         '../Core/Color',
+        '../Core/defaultValue',
         '../Core/destroyObject',
+        '../Core/DeveloperError',
         '../Core/Math',
         '../Core/Matrix4',
         '../Renderer/BufferUsage',
         './Material',
         './CustomSensorVolume'
     ], function(
-        DeveloperError,
+        clone,
         Color,
+        defaultValue,
         destroyObject,
+        DeveloperError,
         CesiumMath,
         Matrix4,
         BufferUsage,
@@ -27,15 +31,15 @@ define([
      *
      * @see SensorVolumeCollection#addRectangularPyramid
      */
-    var RectangularPyramidSensorVolume = function(template) {
-        var t = template || {};
+    var RectangularPyramidSensorVolume = function(options) {
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         /**
          * <code>true</code> if this sensor will be shown; otherwise, <code>false</code>
          *
          * @type Boolean
          */
-        this.show = (typeof t.show === 'undefined') ? true : t.show;
+        this.show = defaultValue(options.show, true);
 
         /**
          * When <code>true</code>, a polyline is shown where the sensor outline intersections the central body.  The default is <code>true</code>.
@@ -44,7 +48,7 @@ define([
          *
          * @see RectangularPyramidSensorVolume#intersectionColor
          */
-        this.showIntersection = (typeof t.showIntersection === 'undefined') ? true : t.showIntersection;
+        this.showIntersection = defaultValue(options.showIntersection, true);
 
         /**
          * <p>
@@ -57,7 +61,7 @@ define([
          *
          * @type Boolean
          */
-        this.showThroughEllipsoid = (typeof t.showThroughEllipsoid === 'undefined') ? false : t.showThroughEllipsoid;
+        this.showThroughEllipsoid = defaultValue(options.showThroughEllipsoid, false);
 
         /**
          * The 4x4 transformation matrix that transforms this sensor from model to world coordinates.  In it's model
@@ -81,21 +85,21 @@ define([
          * var center = ellipsoid.cartographicToCartesian(Cartographic.fromDegrees(-75.59777, 40.03883));
          * sensor.modelMatrix = Transforms.eastNorthUpToFixedFrame(center);
          */
-        this.modelMatrix = t.modelMatrix || Matrix4.IDENTITY.clone();
+        this.modelMatrix = Matrix4.clone(defaultValue(options.modelMatrix, Matrix4.IDENTITY));
 
         /**
          * DOC_TBA
          *
          * @type BufferUsage
          */
-        this.bufferUsage = t.bufferUsage || BufferUsage.STATIC_DRAW;
+        this.bufferUsage = defaultValue(options.bufferUsage, BufferUsage.STATIC_DRAW);
 
         /**
          * DOC_TBA
          *
          * @type Number
          */
-        this.radius = (typeof t.radius === 'undefined') ? Number.POSITIVE_INFINITY : t.radius;
+        this.radius = defaultValue(options.radius, Number.POSITIVE_INFINITY);
 
         /**
          * DOC_TBA
@@ -104,7 +108,7 @@ define([
          *
          * @see RectangularPyramidSensorVolume#yHalfAngle
          */
-        this.xHalfAngle = (typeof t.xHalfAngle === 'undefined') ? CesiumMath.PI_OVER_TWO : t.xHalfAngle;
+        this.xHalfAngle = defaultValue(options.xHalfAngle, CesiumMath.PI_OVER_TWO);
         this._xHalfAngle = undefined;
 
         /**
@@ -114,7 +118,7 @@ define([
          *
          * @see RectangularPyramidSensorVolume#xHalfAngle
          */
-        this.yHalfAngle = (typeof t.yHalfAngle === 'undefined') ? CesiumMath.PI_OVER_TWO : t.yHalfAngle;
+        this.yHalfAngle = defaultValue(options.yHalfAngle, CesiumMath.PI_OVER_TWO);
         this._yHalfAngle = undefined;
 
         /**
@@ -135,7 +139,7 @@ define([
          *
          * @see <a href='https://github.com/AnalyticalGraphicsInc/cesium/wiki/Fabric'>Fabric</a>
          */
-        this.material = (typeof t.material !== 'undefined') ? t.material : Material.fromType(undefined, Material.ColorType);
+        this.material = typeof options.material !== 'undefined' ? options.material : Material.fromType(undefined, Material.ColorType);
 
         /**
          * The color of the polyline where the sensor outline intersects the central body.  The default is {@link Color.WHITE}.
@@ -144,10 +148,11 @@ define([
          *
          * @see RectangularPyramidSensorVolume#showIntersection
          */
-        this.intersectionColor = (typeof t.intersectionColor !== 'undefined') ? Color.clone(t.intersectionColor) : Color.clone(Color.WHITE);
+        this.intersectionColor = Color.clone(defaultValue(options.intersectionColor, Color.WHITE));
 
-        t._pickIdThis = t._pickIdThis || this;
-        this._customSensor = new CustomSensorVolume(t);
+        var customSensorOptions = clone(options);
+        customSensorOptions._pickIdThis = defaultValue(options._pickIdThis, this);
+        this._customSensor = new CustomSensorVolume(customSensorOptions);
     };
 
     /**

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

@@ -20,6 +20,7 @@ define([
         '../Core/JulianDate',
         '../Renderer/Context',
         '../Renderer/ClearCommand',
+        '../Renderer/PassState',
         './Camera',
         './ScreenSpaceCameraController',
         './CompositePrimitive',
@@ -51,6 +52,7 @@ define([
         JulianDate,
         Context,
         ClearCommand,
+        PassState,
         Camera,
         ScreenSpaceCameraController,
         CompositePrimitive,
@@ -73,6 +75,7 @@ define([
         var context = new Context(canvas);
 
         this._frameState = new FrameState();
+        this._passState = new PassState(context);
         this._canvas = canvas;
         this._context = context;
         this._primitives = new CompositePrimitive();
@@ -88,14 +91,12 @@ define([
         this._frustumCommandsList = [];
 
         this._clearColorCommand = new ClearCommand();
-        this._clearColorCommand.clearState = context.createClearState({
-            color : new Color()
-        });
-        this._clearDepthStencilCommand = new ClearCommand();
-        this._clearDepthStencilCommand.clearState = context.createClearState({
-            depth : 1.0,
-            stencil : 0.0
-        });
+        this._clearColorCommand.color = new Color();
+
+        var clearDepthStencilCommand = new ClearCommand();
+        clearDepthStencilCommand.depth = 1.0;
+        clearDepthStencilCommand.stencil = 1.0;
+        this._clearDepthStencilCommand = clearDepthStencilCommand;
 
         /**
          * The {@link SkyBox} used to draw the stars.
@@ -253,6 +254,8 @@ define([
         frameState.camera = camera;
         frameState.cullingVolume = camera.frustum.computeCullingVolume(camera.getPositionWC(), camera.getDirectionWC(), camera.getUpWC());
         frameState.occluder = undefined;
+        frameState.canvasDimensions.x = scene._canvas.clientWidth;
+        frameState.canvasDimensions.y = scene._canvas.clientHeight;
 
         // TODO: The occluder is the top-level central body. When we add
         //       support for multiple central bodies, this should be the closest one.
@@ -302,7 +305,7 @@ define([
             }
 
             // PERFORMANCE_IDEA: sort bins
-            frustumCommands.commands.push(command);
+            frustumCommands.commands[frustumCommands.index++] = command;
 
             if (command.executeInClosestFrustum) {
                 break;
@@ -323,7 +326,7 @@ define([
         var frustumCommandsList = scene._frustumCommandsList;
         var frustumsLength = frustumCommandsList.length;
         for (var n = 0; n < frustumsLength; ++n) {
-            frustumCommandsList[n].commands.length = 0;
+            frustumCommandsList[n].index = 0;
         }
 
         var near = Number.MAX_VALUE;
@@ -352,8 +355,9 @@ define([
                 if (typeof boundingVolume !== 'undefined') {
                     var modelMatrix = defaultValue(command.modelMatrix, Matrix4.IDENTITY);
                     var transformedBV = boundingVolume.transform(modelMatrix);               //TODO: Remove this allocation.
-                    if (cullingVolume.getVisibility(transformedBV) === Intersect.OUTSIDE ||
-                            (typeof occluder !== 'undefined' && !occluder.isBoundingSphereVisible(transformedBV))) {
+                    if (command.cull &&
+                            ((cullingVolume.getVisibility(transformedBV) === Intersect.OUTSIDE) ||
+                             (typeof occluder !== 'undefined' && !occluder.isBoundingSphereVisible(transformedBV)))) {
                         continue;
                     }
 
@@ -394,17 +398,17 @@ define([
         }
     }
 
-    function executeCommands(scene, framebuffer) {
+    function executeCommands(scene, passState) {
         var camera = scene._camera;
         var frustum = camera.frustum.clone();
         var context = scene._context;
         var us = context.getUniformState();
-        var skyBoxCommand = (typeof scene.skyBox !== 'undefined') ? scene.skyBox.update(context, scene._frameState) : undefined;
-        var skyAtmosphereCommand = (typeof scene.skyAtmosphere !== 'undefined') ? scene.skyAtmosphere.update(context, scene._frameState) : undefined;
+        var skyBoxCommand = typeof scene.skyBox !== 'undefined' ? scene.skyBox.update(context, scene._frameState) : undefined;
+        var skyAtmosphereCommand = typeof scene.skyAtmosphere !== 'undefined' ? scene.skyAtmosphere.update(context, scene._frameState) : undefined;
 
         var clear = scene._clearColorCommand;
-        Color.clone(defaultValue(scene.backgroundColor, Color.BLACK), clear.clearState.color);
-        clear.execute(context, framebuffer);
+        Color.clone(defaultValue(scene.backgroundColor, Color.BLACK), clear.color);
+        clear.execute(context, passState);
 
         // Ideally, we would render the sky box and atmosphere last for
         // early-z, but we would have to draw it in each frustum
@@ -413,11 +417,11 @@ define([
         us.updateFrustum(frustum);
 
         if (typeof skyBoxCommand !== 'undefined') {
-            skyBoxCommand.execute(context, framebuffer);
+            skyBoxCommand.execute(context, passState);
         }
 
         if (typeof skyAtmosphereCommand !== 'undefined') {
-            skyAtmosphereCommand.execute(context, framebuffer);
+            skyAtmosphereCommand.execute(context, passState);
         }
 
         var clearDepthStencil = scene._clearDepthStencilCommand;
@@ -425,7 +429,7 @@ define([
         var frustumCommandsList = scene._frustumCommandsList;
         var numFrustums = frustumCommandsList.length;
         for (var i = 0; i < numFrustums; ++i) {
-            clearDepthStencil.execute(context, framebuffer);
+            clearDepthStencil.execute(context, passState);
 
             var index = numFrustums - i - 1.0;
             var frustumCommands = frustumCommandsList[index];
@@ -435,14 +439,14 @@ define([
             us.updateFrustum(frustum);
 
             var commands = frustumCommands.commands;
-            var length = commands.length;
+            var length = frustumCommands.index;
             for (var j = 0; j < length; ++j) {
-                commands[j].execute(context, framebuffer);
+                commands[j].execute(context, passState);
             }
         }
     }
 
-    function executeOverlayCommands(scene) {
+    function executeOverlayCommands(scene, passState) {
         var context = scene._context;
         var commandLists = scene._commandList;
         var length = commandLists.length;
@@ -450,7 +454,7 @@ define([
             var commandList = commandLists[i].overlayList;
             var commandListLength = commandList.length;
             for (var j = 0; j < commandListLength; ++j) {
-                commandList[j].execute(context);
+                commandList[j].execute(context, passState);
             }
         }
     }
@@ -483,7 +487,7 @@ define([
         var us = this.getUniformState();
         var frameState = this._frameState;
 
-        var frameNumber = CesiumMath.incrementWrap(us.getFrameNumber(), 15000000.0, 1.0);
+        var frameNumber = CesiumMath.incrementWrap(frameState.frameNumber, 15000000.0, 1.0);
         updateFrameState(this, frameNumber, time);
         frameState.passes.color = true;
         frameState.passes.overlay = true;
@@ -493,9 +497,12 @@ define([
         this._commandList.length = 0;
         this._primitives.update(this._context, frameState, this._commandList);
 
+        var passState = this._passState;
+        passState.framebuffer = undefined;
+
         createPotentiallyVisibleSet(this, 'colorList');
-        executeCommands(this);
-        executeOverlayCommands(this);
+        executeCommands(this, passState);
+        executeOverlayCommands(this, passState);
     };
 
     var orthoPickingFrustum = new OrthographicFrustum();
@@ -586,10 +593,11 @@ define([
         var primitives = this._primitives;
         var frameState = this._frameState;
 
-        this._pickFramebuffer = this._pickFramebuffer || context.createPickFramebuffer();
-        var fb = this._pickFramebuffer.begin();
+        if (typeof this._pickFramebuffer === 'undefined') {
+            this._pickFramebuffer = context.createPickFramebuffer();
+        }
 
-        // Update with previous frame's number aqnd time, assuming that render is called before picking.
+        // Update with previous frame's number and time, assuming that render is called before picking.
         updateFrameState(this, frameState.frameNumber, frameState.time);
         frameState.cullingVolume = getPickCullingVolume(this, windowPosition, rectangleWidth, rectangleHeight);
         frameState.passes.pick = true;
@@ -597,12 +605,12 @@ define([
         var commandLists = this._commandList;
         commandLists.length = 0;
         primitives.update(context, frameState, commandLists);
-
         createPotentiallyVisibleSet(this, 'pickList');
-        executeCommands(this, fb);
 
         scratchRectangle.x = windowPosition.x - ((rectangleWidth - 1.0) * 0.5);
         scratchRectangle.y = (this._canvas.clientHeight - windowPosition.y) - ((rectangleHeight - 1.0) * 0.5);
+
+        executeCommands(this, this._pickFramebuffer.begin(scratchRectangle));
         return this._pickFramebuffer.end(scratchRectangle);
     };
 

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

@@ -1,5 +1,6 @@
 /*global define*/
 define([
+        '../Core/defaultValue',
         '../Core/destroyObject',
         '../Core/DeveloperError',
         '../Core/Math',
@@ -17,6 +18,7 @@ define([
         './PerspectiveFrustum',
         './SceneMode'
     ], function(
+        defaultValue,
         destroyObject,
         DeveloperError,
         CesiumMath,
@@ -81,7 +83,7 @@ define([
         this.onTransitionComplete = new Event();
 
         this._scene = scene;
-        this._ellipsoid = ellipsoid || Ellipsoid.WGS84;
+        this._ellipsoid = defaultValue(ellipsoid, Ellipsoid.WGS84);
         var canvas = scene.getCanvas();
 
         // Position camera and size frustum so the entire 2D map is visible
@@ -686,70 +688,20 @@ define([
         addMorphTimeAnimations(transitioner, scene, 1.0, 0.0, duration, onComplete);
     }
 
-    //immediately set the morph time of all objects in the scene
-    function setMorphTime(scene, morphTime) {
-        scene.morphTime = morphTime;
-
-        var primitives = scene.getPrimitives();
-        for ( var i = 0, len = primitives.getLength(); i < len; i++) {
-            var primitive = primitives.get(i);
-            if (typeof primitive.morphTime !== 'undefined') {
-                primitive.morphTime = morphTime;
-            }
-        }
-
-        var centralBody = primitives.getCentralBody();
-        centralBody.morphTime = morphTime;
-
-        if (typeof scene.skyBox !== 'undefined') {
-            scene.skyBox.morphTime = morphTime;
-        }
-
-        if (typeof scene.skyAtmosphere !== 'undefined') {
-            scene.skyAtmosphere.morphTime = morphTime;
-        }
-    }
-
-    //in the future the animations will be more complicated
     function addMorphTimeAnimations(transitioner, scene, start, stop, duration, onComplete) {
-        //for now, all objects morph at the same rate
+        // Later, this will be linear and each object will adjust, if desired, in its vertex shader.
         var template = {
             duration : duration,
             easingFunction : Tween.Easing.Quartic.Out
         };
 
-        var primitives = scene.getPrimitives();
-        var sceneAnimations = scene.getAnimations();
-        var animation;
-        for ( var i = 0, len = primitives.getLength(); i < len; i++) {
-            var primitive = primitives.get(i);
-            if (typeof primitive.morphTime !== 'undefined') {
-                animation = sceneAnimations.addProperty(primitive, 'morphTime', start, stop, template);
-                transitioner._currentAnimations.push(animation);
-            }
-        }
-
-        var centralBody = primitives.getCentralBody();
-        animation = sceneAnimations.addProperty(centralBody, 'morphTime', start, stop, template);
-        transitioner._currentAnimations.push(animation);
-
-        if (typeof scene.skyBox !== 'undefined') {
-            animation = sceneAnimations.addProperty(scene.skyBox, 'morphTime', start, stop, template);
-            transitioner._currentAnimations.push(animation);
-        }
-
-        if (typeof scene.skyAtmosphere !== 'undefined') {
-            animation = sceneAnimations.addProperty(scene.skyAtmosphere, 'morphTime', start, stop, template);
-            transitioner._currentAnimations.push(animation);
-        }
-
         if (typeof onComplete !== 'undefined') {
             template.onComplete = function() {
                 onComplete(transitioner);
             };
         }
 
-        animation = sceneAnimations.addProperty(scene, 'morphTime', start, stop, template);
+        var animation = scene.getAnimations().addProperty(scene, 'morphTime', start, stop, template);
         transitioner._currentAnimations.push(animation);
     }
 
@@ -788,7 +740,7 @@ define([
     function complete3DCallback(transitioner) {
         var scene = transitioner._scene;
         scene.mode = SceneMode.SCENE3D;
-        setMorphTime(scene, 1.0);
+        scene.morphTime = SceneMode.SCENE3D.morphTime;
 
         destroyMorphHandler(transitioner);
 
@@ -814,7 +766,7 @@ define([
         var scene = transitioner._scene;
 
         scene.mode = SceneMode.SCENE2D;
-        setMorphTime(scene, 0.0);
+        scene.morphTime = SceneMode.SCENE2D.morphTime;
 
         destroyMorphHandler(transitioner);
 
@@ -835,7 +787,7 @@ define([
     function completeColumbusViewCallback(transitioner) {
         var scene = transitioner._scene;
         scene.mode = SceneMode.COLUMBUS_VIEW;
-        setMorphTime(scene, 0.0);
+        scene.morphTime = SceneMode.COLUMBUS_VIEW.morphTime;
 
         destroyMorphHandler(transitioner);