cesium 0.21 → 0.21.1

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

@@ -20,24 +20,26 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
      *
      * @demo <a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html?src=Polylines.html">Cesium Sandcastle Polyline Demo</a>
      */
-    var Polyline = function(description, polylineCollection) {
-        description = defaultValue(description, EMPTY_OBJECT);
+    var Polyline = function(options, polylineCollection) {
+        options = defaultValue(options, EMPTY_OBJECT);
 
-        this._show = defaultValue(description.show, true);
-        this._width = defaultValue(description.width, 1.0);
+        this._show = defaultValue(options.show, true);
+        this._width = defaultValue(options.width, 1.0);
 
-        this._material = description.material;
+        this._material = options.material;
         if (!defined(this._material)) {
             this._material = Material.fromType(Material.ColorType);
             this._material.uniforms.color = new Color(1.0, 1.0, 1.0, 1.0);
         }
 
-        var positions = description.positions;
+        var positions = options.positions;
         if (!defined(positions)) {
             positions = [];
         }
 
         this._positions = positions;
+        this._length = positions.length;
+        this._id = options.id;
 
         var modelMatrix;
         if (defined(this._polylineCollection)) {
@@ -53,7 +55,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         this._polylineCollection = polylineCollection;
         this._dirty = false;
         this._pickId = undefined;
-        this._pickIdThis = description._pickIdThis;
+        this._pickIdThis = options._pickIdThis;
         this._boundingVolume = BoundingSphere.fromPoints(this._positions);
         this._boundingVolume2D = new BoundingSphere(); // modified in PolylineCollection
     };
@@ -149,11 +151,12 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
             throw new DeveloperError('value is required.');
         }
 
-        if (this._positions.length !== value.length) {
+        if (this._positions.length !== value.length || this._positions.length !== this._length) {
             makeDirty(this, POSITION_SIZE_INDEX);
         }
 
         this._positions = value;
+        this._length = value.length;
         this._boundingVolume = BoundingSphere.fromPoints(this._positions, this._boundingVolume);
         makeDirty(this, POSITION_INDEX);
 
@@ -173,7 +176,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         var segmentLengths = this._segments.lengths;
 
         var positionsChanged = this._propertiesChanged[POSITION_INDEX] > 0 || this._propertiesChanged[POSITION_SIZE_INDEX] > 0;
-        if (!modelMatrix.equals(this._modelMatrix) || positionsChanged) {
+        if (!Matrix4.equals(modelMatrix, this._modelMatrix) || positionsChanged) {
             this._segments = PolylinePipeline.wrapLongitude(this._positions, modelMatrix);
         }
 
@@ -222,9 +225,10 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         if (!defined(material)) {
             throw new DeveloperError('material is required.');
         }
-
-        this._material = material;
-        makeDirty(this, MATERIAL_INDEX);
+        if (this._material !== material) {
+            this._material = material;
+            makeDirty(this, MATERIAL_INDEX);
+        }
     };
 
     /**
@@ -271,10 +275,25 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Boundi
         }
     };
 
+    /**
+     * Returns the user-defined object returned when the polyline is picked.
+     *
+     * @memberof Polyline
+     *
+     * @returns {Object} The user-defined object returned when the polyline is picked.
+     */
+    Polyline.prototype.getId = function() {
+        return this._id;
+    };
+
+    /**
+     * @private
+     */
     Polyline.prototype.getPickId = function(context) {
         if (!defined(this._pickId)) {
             this._pickId = context.createPickId({
-                primitive : defaultValue(this._pickIdThis, this)
+                primitive : defaultValue(this._pickIdThis, this),
+                id : this._id
             });
         }
         return this._pickId;

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

@@ -114,8 +114,8 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/combine', 'Co
          * @see Transforms.eastNorthUpToFixedFrame
          * @see czm_model
          */
-        this.modelMatrix = Matrix4.IDENTITY.clone();
-        this._modelMatrix = Matrix4.IDENTITY.clone();
+        this.modelMatrix = Matrix4.clone(Matrix4.IDENTITY);
+        this._modelMatrix = Matrix4.clone(Matrix4.IDENTITY);
 
         this._rs = undefined;
 
@@ -401,6 +401,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/combine', 'Co
             this._polylinesUpdated = false;
         }
 
+        properties = this._propertiesChanged;
         for ( var k = 0; k < NUMBER_OF_PROPERTIES; ++k) {
             properties[k] = 0;
         }
@@ -477,7 +478,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/combine', 'Co
                     var polyline = polylines[s];
                     var mId = createMaterialId(polyline._material);
                     if (mId !== currentId) {
-                        if (defined(currentId)) {
+                        if (defined(currentId) && count > 0) {
                             if (commandIndex >= commandsLength) {
                                 command = new DrawCommand();
                                 command.owner = polylineCollection;
@@ -918,10 +919,10 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/combine', 'Co
         var mode = frameState.mode;
         var projection = frameState.scene2D.projection;
 
-        if (collection._mode !== mode || (collection._projection !== projection) || (!collection._modelMatrix.equals(collection.modelMatrix))) {
+        if (collection._mode !== mode || (collection._projection !== projection) || (!Matrix4.equals(collection._modelMatrix, collection.modelMatrix))) {
             collection._mode = mode;
             collection._projection = projection;
-            collection._modelMatrix = collection.modelMatrix.clone();
+            collection._modelMatrix = Matrix4.clone(collection.modelMatrix);
             collection._createVertexArray = true;
         }
     }
@@ -1330,7 +1331,7 @@ define(['Core/defined', 'Core/DeveloperError', 'Core/Color', 'Core/combine', 'Co
 
         for ( var n = 0; n < length; ++n) {
             position = positions[n];
-            p = modelMatrix.multiplyByPoint(position);
+            p = Matrix4.multiplyByPoint(modelMatrix, position);
             newPositions.push(projection.project(ellipsoid.cartesianToCartographic(Cartesian3.fromCartesian4(p))));
         }
 

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

@@ -41,7 +41,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
      * </p>
      * <p>
      * Combining multiple instances into one primitive is called batching, and significantly improves performance for static data.
-     * Instances can be individually picked; {@link Context#pick} returns their {@link GeometryInstance#id}.  Using
+     * Instances can be individually picked; {@link Scene#pick} returns their {@link GeometryInstance#id}.  Using
      * per-instance appearances like {@link PerInstanceColorAppearance}, each instance can also have a unique color.
      * </p>
      * <p>
@@ -195,7 +195,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/Deve
          *
          * @see czm_model
          */
-        this.modelMatrix = Matrix4.IDENTITY.clone();
+        this.modelMatrix = Matrix4.clone(Matrix4.IDENTITY);
 
         /**
          * Determines if the primitive will be shown.  This affects all geometry

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

@@ -159,6 +159,17 @@ define(['Core/clone', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/d
          */
         this.intersectionWidth = defaultValue(options.intersectionWidth, 5.0);
 
+        /**
+         * User-defined object returned when the sensors is picked.
+         *
+         * @type Object
+         *
+         * @default undefined
+         *
+         * @see Scene#pick
+         */
+        this.id = options.id;
+
         var customSensorOptions = clone(options);
         customSensorOptions._pickIdThis = defaultValue(options._pickIdThis, this);
         this._customSensor = new CustomSensorVolume(customSensorOptions);
@@ -188,6 +199,7 @@ define(['Core/clone', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/d
         s.material = this.material;
         s.intersectionColor = this.intersectionColor;
         s.intersectionWidth = this.intersectionWidth;
+        s.id = this.id;
 
         if ((this._xHalfAngle !== this.xHalfAngle) || (this._yHalfAngle !== this.yHalfAngle)) {
 

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

@@ -1,10 +1,11 @@
 /*global define*/
-define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/GeographicProjection', 'Core/Ellipsoid', 'Core/Occluder', 'Core/BoundingRectangle', 'Core/BoundingSphere', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Intersect', 'Core/Interval', 'Core/Matrix4', 'Core/JulianDate', 'Core/EllipsoidGeometry', 'Core/GeometryInstance', 'Core/GeometryPipeline', 'Core/ColorGeometryInstanceAttribute', 'Renderer/Context', 'Renderer/ClearCommand', 'Renderer/PassState', 'Scene/Camera', 'Scene/ScreenSpaceCameraController', 'Scene/CompositePrimitive', 'Scene/CullingVolume', 'Scene/AnimationCollection', 'Scene/SceneMode', 'Scene/SceneTransforms', 'Scene/FrameState', 'Scene/OrthographicFrustum', 'Scene/PerspectiveOffCenterFrustum', 'Scene/FrustumCommands', 'Scene/Primitive', 'Scene/PerInstanceColorAppearance', 'Scene/SunPostProcess', 'Scene/CreditDisplay'], function(
+define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/DeveloperError', 'Core/GeographicProjection', 'Core/Ellipsoid', 'Core/Occluder', 'Core/BoundingRectangle', 'Core/BoundingSphere', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Intersect', 'Core/Interval', 'Core/Matrix4', 'Core/JulianDate', 'Core/EllipsoidGeometry', 'Core/GeometryInstance', 'Core/GeometryPipeline', 'Core/ColorGeometryInstanceAttribute', 'Core/ShowGeometryInstanceAttribute', 'Renderer/Context', 'Renderer/ClearCommand', 'Renderer/PassState', 'Scene/Camera', 'Scene/ScreenSpaceCameraController', 'Scene/CompositePrimitive', 'Scene/CullingVolume', 'Scene/AnimationCollection', 'Scene/SceneMode', 'Scene/SceneTransforms', 'Scene/FrameState', 'Scene/OrthographicFrustum', 'Scene/PerspectiveOffCenterFrustum', 'Scene/FrustumCommands', 'Scene/Primitive', 'Scene/PerInstanceColorAppearance', 'Scene/SunPostProcess', 'Scene/CreditDisplay'], function(
         CesiumMath,
         Color,
         defaultValue,
         defined,
         destroyObject,
+        DeveloperError,
         GeographicProjection,
         Ellipsoid,
         Occluder,
@@ -20,6 +21,7 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         GeometryInstance,
         GeometryPipeline,
         ColorGeometryInstanceAttribute,
+        ShowGeometryInstanceAttribute,
         Context,
         ClearCommand,
         PassState,
@@ -140,6 +142,14 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         this.sunBloom = true;
         this._sunBloom = undefined;
 
+        /**
+         * The {@link Moon}
+         *
+         * @type Moon
+         * @default undefined
+         */
+        this.moon = undefined;
+
         /**
          * The background color, which is only visible if there is no sky box, i.e., {@link Scene#skyBox} is undefined.
          *
@@ -148,7 +158,7 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
          *
          * @see Scene#skyBox
          */
-        this.backgroundColor = Color.BLACK.clone();
+        this.backgroundColor = Color.clone(Color.BLACK);
 
         /**
          * The current mode of the scene.
@@ -602,7 +612,11 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         }
     }
 
-    function isSunVisible(command, frameState) {
+    function isVisible(command, frameState) {
+        if (!defined(command)) {
+            return;
+        }
+
         var occluder = (frameState.mode === SceneMode.SCENE3D) ? frameState.occluder: undefined;
         var cullingVolume = frameState.cullingVolume;
 
@@ -613,11 +627,14 @@ 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.
+
         return ((defined(command)) &&
                  ((!defined(command.boundingVolume)) ||
                   !command.cull ||
-                  ((cullingVolume.getVisibility(command.boundingVolume) !== Intersect.OUTSIDE) &&
-                   (!defined(occluder) || occluder.isBoundingSphereVisible(command.boundingVolume)))));
+                  ((cullingVolume.getVisibility(transformedBV) !== Intersect.OUTSIDE) &&
+                   (!defined(occluder) || occluder.isBoundingSphereVisible(transformedBV)))));
     }
 
     function executeCommands(scene, passState, clearColor) {
@@ -643,7 +660,8 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         var skyBoxCommand = (frameState.passes.color && defined(scene.skyBox)) ? scene.skyBox.update(context, frameState) : undefined;
         var skyAtmosphereCommand = (frameState.passes.color && defined(scene.skyAtmosphere)) ? scene.skyAtmosphere.update(context, frameState) : undefined;
         var sunCommand = (frameState.passes.color && defined(scene.sun)) ? scene.sun.update(context, frameState) : undefined;
-        var sunVisible = isSunVisible(sunCommand, frameState);
+        var sunVisible = isVisible(sunCommand, frameState);
+
 
         if (sunVisible && scene.sunBloom) {
             passState.framebuffer = scene._sunPostProcess.update(context);
@@ -715,6 +733,18 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         }
     }
 
+    function updatePrimitives(scene) {
+        var context = scene._context;
+        var frameState = scene._frameState;
+        var commandList = scene._commandList;
+
+        scene._primitives.update(context, frameState, commandList);
+
+        if (defined(scene.moon)) {
+            scene.moon.update(context, frameState, commandList);
+        }
+    }
+
     /**
      * DOC_TBA
      * @memberof Scene
@@ -750,12 +780,10 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         frameState.creditDisplay.beginFrame();
 
         var context = this._context;
-
         us.update(context, frameState);
 
         this._commandList.length = 0;
-        this._primitives.update(context, frameState, this._commandList);
-
+        updatePrimitives(this);
         createPotentiallyVisibleSet(this, 'colorList');
 
         var passState = this._passState;
@@ -847,12 +875,26 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
     var scratchColorZero = new Color(0.0, 0.0, 0.0, 0.0);
 
     /**
-     * DOC_TBA
+     * Returns an object with a `primitive` property that contains the first (top) primitive in the scene
+     * at a particular window coordinate or undefined if nothing is at the location. Other properties may
+     * potentially be set depending on the type of primitive.
+     *
      * @memberof Scene
+     *
+     * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
+     *
+     * @returns {Object} Object containing the picked primitive.
+     *
+     * @exception {DeveloperError} windowPosition is undefined.
+     *
      */
     Scene.prototype.pick = function(windowPosition) {
+        if(!defined(windowPosition)) {
+            throw new DeveloperError('windowPosition is undefined.');
+        }
+
         var context = this._context;
-        var primitives = this._primitives;
+        var us = this.getUniformState();
         var frameState = this._frameState;
 
         var drawingBufferPosition = SceneTransforms.transformWindowToDrawingBuffer(context, windowPosition);
@@ -866,9 +908,10 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         frameState.cullingVolume = getPickCullingVolume(this, drawingBufferPosition, rectangleWidth, rectangleHeight);
         frameState.passes.pick = true;
 
-        var commandLists = this._commandList;
-        commandLists.length = 0;
-        primitives.update(context, frameState, commandLists);
+        us.update(context, frameState);
+
+        this._commandList.length = 0;
+        updatePrimitives(this);
         createPotentiallyVisibleSet(this, 'pickList');
 
         scratchRectangle.x = drawingBufferPosition.x - ((rectangleWidth - 1.0) * 0.5);
@@ -880,6 +923,71 @@ define(['Core/Math', 'Core/Color', 'Core/defaultValue', 'Core/defined', 'Core/de
         return object;
     };
 
+    /**
+     * Returns a list of objects, each containing a `primitive` property, for all primitives at
+     * a particular window coordinate position. Other properties may also be set depending on the
+     * type of primitive. The primitives in the list are ordered by their visual order in the
+     * scene (front to back).
+     *
+     * @memberof Scene
+     *
+     * @param {Cartesian2} windowPosition Window coordinates to perform picking on.
+     *
+     * @returns {Array} Array of objects, each containing 1 picked primitives.
+     *
+     * @exception {DeveloperError} windowPosition is undefined.
+     *
+     * @example
+     * var pickedObjects = Scene.drillPick(new Cartesian2(100.0, 200.0));
+     */
+    Scene.prototype.drillPick = function(windowPosition) {
+        // PERFORMANCE_IDEA: This function calls each primitive's update for each pass. Instead
+        // we could update the primitive once, and then just execute their commands for each pass,
+        // and cull commands for picked primitives.  e.g., base on the command's owner.
+        if (!defined(windowPosition)) {
+            throw new DeveloperError('windowPosition is undefined.');
+        }
+
+        var pickedObjects = [];
+
+        var pickedResult = this.pick(windowPosition);
+        while (defined(pickedResult) && defined(pickedResult.primitive)) {
+            var primitive = pickedResult.primitive;
+            pickedObjects.push(pickedResult);
+
+            // hide the picked primitive and call picking again to get the next primitive
+            if (defined(primitive.show)) {
+                primitive.show = false;
+            } else if (typeof primitive.setShow === 'function') {
+                primitive.setShow(false);
+            } else if (typeof primitive.getGeometryInstanceAttributes === 'function') {
+                var attributes = primitive.getGeometryInstanceAttributes(pickedResult.id);
+                if (defined(attributes) && defined(attributes.show)) {
+                    attributes.show = ShowGeometryInstanceAttribute.toValue(false);
+                }
+            }
+
+            pickedResult = this.pick(windowPosition);
+        }
+
+        // unhide the picked primitives
+        for (var i = 0; i < pickedObjects.length; ++i) {
+            var p = pickedObjects[i].primitive;
+            if (defined(p.show)) {
+                p.show = true;
+            } else if (typeof p.setShow === 'function') {
+                p.setShow(true);
+            } else if (typeof p.getGeometryInstanceAttributes === 'function') {
+                var attr = p.getGeometryInstanceAttributes(pickedObjects[i].id);
+                if (defined(attr) && defined(attr.show)) {
+                    attr.show = ShowGeometryInstanceAttribute.toValue(true);
+                }
+            }
+        }
+
+        return pickedObjects;
+    };
+
     /**
      * DOC_TBA
      * @memberof Scene

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

@@ -68,7 +68,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Cartog
 
         // View-projection matrix to transform from world coordinates to clip coordinates
         var viewProjection = scene.getUniformState().getViewProjection();
-        viewProjection.multiplyByPoint(actualPosition, positionCC);
+        Matrix4.multiplyByPoint(viewProjection, actualPosition, positionCC);
 
         return SceneTransforms.clipToWindowCoordinates(scene.getContext(), positionCC, result);
     };
@@ -117,7 +117,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/Cartog
 
         // View-projection matrix to transform from world coordinates to clip coordinates
         var viewProjection = scene.getUniformState().getViewProjection();
-        viewProjection.multiplyByPoint(actualPosition, positionCC);
+        Matrix4.multiplyByPoint(viewProjection, actualPosition, positionCC);
 
         return SceneTransforms.clipToDrawingBufferCoordinates(scene.getContext(), positionCC, result);
     };

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

@@ -333,12 +333,12 @@ define(['Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Develop
         var dir = new Cartesian4(camera.direction.x, camera.direction.y, camera.direction.z, 0.0);
         var up = new Cartesian4(camera.up.x, camera.up.y, camera.up.z, 0.0);
 
-        var frame = transform.inverseTransformation().multiply(camera.transform);
+        var frame = Matrix4.multiply(Matrix4.inverseTransformation(transform), camera.transform);
         camera.transform = Matrix4.clone(transform);
 
-        camera.position = Cartesian3.fromCartesian4(frame.multiplyByVector(pos));
-        camera.direction = Cartesian3.fromCartesian4(frame.multiplyByVector(dir));
-        camera.up = Cartesian3.fromCartesian4(frame.multiplyByVector(up));
+        camera.position = Cartesian3.fromCartesian4(Matrix4.multiplyByVector(frame, pos));
+        camera.direction = Cartesian3.fromCartesian4(Matrix4.multiplyByVector(frame, dir));
+        camera.up = Cartesian3.fromCartesian4(Matrix4.multiplyByVector(frame, up));
         camera.right = Cartesian3.cross(camera.direction, camera.up);
     }