cesium 0.21 → 0.21.1

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

@@ -29,6 +29,7 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
      * @param {Number} [options.textureRotationAngle=0.0] The rotation of the texture coordinates, in radians. A positive rotation is counter-clockwise.
      * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
      * @param {Material} [options.material=undefined] The surface appearance of the primitive.
+     * @param {Object} [options.id=undefined] A user-defined object to return when the instance is picked with {@link Scene#pick}
      * @param {Boolean} [options.asynchronous=true] Determines if the extent will be created asynchronously or block until ready.
      *
      * @example
@@ -136,6 +137,18 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
          */
         this.material = defaultValue(options.material, material);
 
+        /**
+         * User-defined object returned when the extent is picked.
+         *
+         * @type Object
+         *
+         * @default undefined
+         *
+         * @see Scene#pick
+         */
+        this.id = options.id;
+        this._id = undefined;
+
         /**
          * Determines if the geometry instances will be created and batched on
          * a web worker.
@@ -174,7 +187,8 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
             (this._granularity !== this.granularity) ||
             (this._height !== this.height) ||
             (this._rotation !== this.rotation) ||
-            (this._textureRotationAngle !== this.textureRotationAngle)) {
+            (this._textureRotationAngle !== this.textureRotationAngle) ||
+            (this._id !== this.id)) {
 
             this._extent = Extent.clone(this.extent, this._extent);
             this._ellipsoid = this.ellipsoid;
@@ -182,6 +196,7 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
             this._height = this.height;
             this._rotation = this.rotation;
             this._textureRotationAngle = this.textureRotationAngle;
+            this._id = this.id;
 
             var instance = new GeometryInstance({
                 geometry : new ExtentGeometry({
@@ -193,6 +208,7 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
                     rotation : this.rotation,
                     stRotation : this.textureRotationAngle
                 }),
+                id : this.id,
                 pickPrimitive : this
             });
 

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

@@ -1,11 +1,12 @@
 /*global define*/
-define(['Core/defaultValue', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Color', 'Core/defined', 'Scene/Billboard', 'Scene/LabelStyle', 'Scene/HorizontalOrigin', 'Scene/VerticalOrigin'], function(
+define(['Core/defaultValue', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Color', 'Core/defined', 'Core/NearFarScalar', 'Scene/Billboard', 'Scene/LabelStyle', 'Scene/HorizontalOrigin', 'Scene/VerticalOrigin'], function(
         defaultValue,
         DeveloperError,
         Cartesian2,
         Cartesian3,
         Color,
         defined,
+        NearFarScalar,
         Billboard,
         LabelStyle,
         HorizontalOrigin,
@@ -35,27 +36,36 @@ define(['Core/defaultValue', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Car
      * @alias Label
      * @internalConstructor
      *
+     * @exception {DeveloperError} translucencyByDistance.far must be greater than translucencyByDistance.near
+     *
      * @see LabelCollection
      * @see LabelCollection#add
      *
      * @demo <a href="http://cesium.agi.com/Cesium/Apps/Sandcastle/index.html?src=Labels.html">Cesium Sandcastle Labels Demo</a>
      */
-    var Label = function(description, labelCollection) {
-        description = defaultValue(description, defaultValue.EMPTY_OBJECT);
-
-        this._text = defaultValue(description.text, '');
-        this._show = defaultValue(description.show, true);
-        this._font = defaultValue(description.font, '30px sans-serif');
-        this._fillColor = Color.clone(defaultValue(description.fillColor, Color.WHITE));
-        this._outlineColor = Color.clone(defaultValue(description.outlineColor, Color.BLACK));
-        this._outlineWidth = defaultValue(description.outlineWidth, 1.0);
-        this._style = defaultValue(description.style, LabelStyle.FILL);
-        this._verticalOrigin = defaultValue(description.verticalOrigin, VerticalOrigin.BOTTOM);
-        this._horizontalOrigin = defaultValue(description.horizontalOrigin, HorizontalOrigin.LEFT);
-        this._pixelOffset = Cartesian2.clone(defaultValue(description.pixelOffset, Cartesian2.ZERO));
-        this._eyeOffset = Cartesian3.clone(defaultValue(description.eyeOffset, Cartesian3.ZERO));
-        this._position = Cartesian3.clone(defaultValue(description.position, Cartesian3.ZERO));
-        this._scale = defaultValue(description.scale, 1.0);
+    var Label = function(options, labelCollection) {
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+
+        if (defined(options.translucencyByDistance) &&
+                options.translucencyByDistance.far <= options.translucencyByDistance.near) {
+            throw new DeveloperError('translucencyByDistance.far must be greater than translucencyByDistance.near.');
+        }
+
+        this._text = defaultValue(options.text, '');
+        this._show = defaultValue(options.show, true);
+        this._font = defaultValue(options.font, '30px sans-serif');
+        this._fillColor = Color.clone(defaultValue(options.fillColor, Color.WHITE));
+        this._outlineColor = Color.clone(defaultValue(options.outlineColor, Color.BLACK));
+        this._outlineWidth = defaultValue(options.outlineWidth, 1.0);
+        this._style = defaultValue(options.style, LabelStyle.FILL);
+        this._verticalOrigin = defaultValue(options.verticalOrigin, VerticalOrigin.BOTTOM);
+        this._horizontalOrigin = defaultValue(options.horizontalOrigin, HorizontalOrigin.LEFT);
+        this._pixelOffset = Cartesian2.clone(defaultValue(options.pixelOffset, Cartesian2.ZERO));
+        this._eyeOffset = Cartesian3.clone(defaultValue(options.eyeOffset, Cartesian3.ZERO));
+        this._position = Cartesian3.clone(defaultValue(options.position, Cartesian3.ZERO));
+        this._scale = defaultValue(options.scale, 1.0);
+        this._id = options.id;
+        this._translucencyByDistance = options.translucencyByDistance;
 
         this._labelCollection = labelCollection;
         this._glyphs = [];
@@ -440,6 +450,59 @@ define(['Core/defaultValue', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Car
         }
     };
 
+    /**
+     * Returns the near and far translucency properties of a Label based on the label's distance from the camera.
+     *
+     * @memberof Label
+     *
+     * @returns {NearFarScalar} The near/far translucency values based on camera distance to the billboard
+     *
+     * @see Label#setTranslucencyByDistance
+     */
+    Label.prototype.getTranslucencyByDistance = function() {
+        return this._translucencyByDistance;
+    };
+
+    /**
+     * Sets near and far translucency properties of a Label based on the Label's distance from the camera.
+     * A label's translucency will interpolate between the {@link NearFarScalar#nearValue} and
+     * {@link NearFarScalar#farValue} while the camera distance falls within the upper and lower bounds
+     * of the specified {@link NearFarScalar#near} and {@link NearFarScalar#far}.
+     * Outside of these ranges the label's translucency remains clamped to the nearest bound.  If undefined,
+     * translucencyByDistance will be disabled.
+     *
+     * @memberof Label
+     *
+     * @param {NearFarScalar} translucency The configuration of near and far distances and their respective translucency values
+     *
+     * @exception {DeveloperError} far distance must be greater than near distance.
+     *
+     * @see Label#getTranslucencyByDistance
+     *
+     * @example
+     * // Example 1.
+     * // Set a label's translucencyByDistance to 1.0 when the
+     * // camera is 1500 meters from the label and disappear as
+     * // the camera distance approaches 8.0e6 meters.
+     * text.setTranslucencyByDistance(new NearFarScalar(1.5e2, 1.0, 8.0e6, 0.0));
+     *
+     * // Example 2.
+     * // disable translucency by distance
+     * text.setTranslucencyByDistance(undefined);
+     */
+    Label.prototype.setTranslucencyByDistance = function(value) {
+        if (NearFarScalar.equals(this._translucencyByDistance, value)) {
+            return;
+        }
+
+        if (value.far <= value.near) {
+            throw new DeveloperError('far distance must be greater than near distance.');
+        }
+
+        this._translucencyByDistance = NearFarScalar.clone(value, this._translucencyByDistance);
+        rebindAllGlyphs(this);
+    };
+
     /**
      * Returns the 3D Cartesian offset applied to this label in eye coordinates.
      *
@@ -610,6 +673,17 @@ define(['Core/defaultValue', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Car
         return this._scale;
     };
 
+    /**
+     * Returns the user-defined object returned when the label is picked.
+     *
+     * @memberof Label
+     *
+     * @returns {Object} The user-defined object returned when the label is picked.
+     */
+    Label.prototype.getId = function() {
+        return this._id;
+    };
+
     /**
      * Sets the uniform scale that is multiplied with the label's size in pixels.
      * A scale of <code>1.0</code> does not change the size of the label; a scale greater than
@@ -715,7 +789,9 @@ define(['Core/defaultValue', 'Core/DeveloperError', 'Core/Cartesian2', 'Core/Car
                Color.equals(this._fillColor, other._fillColor) &&
                Color.equals(this._outlineColor, other._outlineColor) &&
                Cartesian2.equals(this._pixelOffset, other._pixelOffset) &&
-               Cartesian3.equals(this._eyeOffset, other._eyeOffset);
+               Cartesian3.equals(this._eyeOffset, other._eyeOffset) &&
+               NearFarScalar.equals(this._translucencyByDistance, other._translucencyByDistance) &&
+               this._id === other._id;
     };
 
     /**

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

@@ -64,6 +64,8 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
         if (defined(billboard)) {
             billboard.setShow(false);
             billboard.setImageIndex(-1);
+            // Destroy pickId to allow setting _pickIdThis and _id when the billboard is reused.
+            billboard._pickId = billboard._pickId && billboard._pickId.destroy();
             labelCollection._spareBillboards.push(billboard);
             glyph.billboard = undefined;
         }
@@ -166,9 +168,11 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
                     billboard.setVerticalOrigin(label._verticalOrigin);
                     billboard.setScale(label._scale);
                     billboard._pickIdThis = label;
+                    billboard._id = label._id;
                 }
 
                 glyph.billboard.setImageIndex(glyphTextureInfo.index);
+                glyph.billboard.setTranslucencyByDistance(label._translucencyByDistance);
             }
         }
 
@@ -324,7 +328,7 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
          *   text     : 'Up'
          * });
          */
-        this.modelMatrix = Matrix4.IDENTITY.clone();
+        this.modelMatrix = Matrix4.clone(Matrix4.IDENTITY);
     };
 
     /**
@@ -363,7 +367,7 @@ define(['Core/DeveloperError', 'Core/defined', 'Core/destroyObject', 'Core/Carte
      *   eyeOffset : Cartesian3.ZERO,
      *   horizontalOrigin : HorizontalOrigin.LEFT,
      *   verticalOrigin : VerticalOrigin.BOTTOM,
-     *   scale : 1.0,
+     *   scale : 1.0
      * });
      *
      * // Example 2:  Specify only the label's cartographic position,

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

@@ -0,0 +1,150 @@
+/*global define*/
+define(['Core/buildModuleUrl', 'Core/Cartesian3', 'Core/defaultValue', 'Core/defined', 'Core/destroyObject', 'Core/Ellipsoid', 'Core/IauOrientationAxes', 'Core/Matrix3', 'Core/Matrix4', 'Core/Simon1994PlanetaryPositions', 'Core/Transforms', 'Scene/EllipsoidPrimitive', 'Scene/Material'], function(
+        buildModuleUrl,
+        Cartesian3,
+        defaultValue,
+        defined,
+        destroyObject,
+        Ellipsoid,
+        IauOrientationAxes,
+        Matrix3,
+        Matrix4,
+        Simon1994PlanetaryPositions,
+        Transforms,
+        EllipsoidPrimitive,
+        Material) {
+    "use strict";
+
+    /**
+     * Draws the Moon in 3D.
+     * @alias Moon
+     * @constructor
+     *
+     * @param {Boolean} [options.show=true] Determines whether the moon will be rendered.
+     * @param {String} [options.textureUrl=buildModuleUrl('Assets/Textures/moonSmall.jpg')] The moon texture.
+     * @param {Ellipsoid} [options.ellipsoid=Ellipsoid.MOON] The moon ellipsoid.
+     * @param {Boolean} [options.onlySunLighting=true] Use the sun as the only light source.
+     *
+     * @example
+     * scene.moon = new Moon();
+     */
+    var Moon = function(options) {
+        options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+
+        var url = options.textureUrl;
+        if (!defined(url)) {
+            url = buildModuleUrl('Assets/Textures/moonSmall.jpg');
+        }
+
+        /**
+         * Determines if the moon will be shown.
+         *
+         * @type {Boolean}
+         * @default true
+         */
+        this.show = defaultValue(options.show, true);
+
+        /**
+         * The moon texture.
+         * @type {String}
+         * @default buildModuleUrl('Assets/Textures/moonSmall.jpg')
+         */
+        this.textureUrl = url;
+
+        /**
+         * The moon ellipsoid.
+         * @type {Ellipsoid}
+         * @default Ellipsoid.MOON
+         */
+        this.ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.MOON);
+
+        /**
+         * Use the sun as the only light source.
+         * @type {Boolean}
+         * @default true
+         */
+        this.onlySunLighting = defaultValue(options.onlySunLighting, true);
+
+        this._ellipsoidPrimitive = new EllipsoidPrimitive({
+            radii : this.ellipsoid.getRadii(),
+            material : Material.fromType(Material.ImageType),
+            onlySunLighting : this.onlySunLighting,
+            _owner : this,
+            _executeInClosestFrustum : false,
+            _writeDepth : true
+        });
+
+        this._axes = new IauOrientationAxes();
+    };
+
+    var icrfToFixed = new Matrix3();
+    var rotationScratch = new Matrix3();
+    var translationScratch = new Cartesian3();
+
+    Moon.prototype.update = function(context, frameState, commandList) {
+        if (!this.show) {
+            return;
+        }
+
+        var ellipsoidPrimitive = this._ellipsoidPrimitive;
+        ellipsoidPrimitive.material.uniforms.image = this.textureUrl;
+        ellipsoidPrimitive.onlySunLighting = this.onlySunLighting;
+
+        var date = frameState.time;
+        if (!defined(Transforms.computeIcrfToFixedMatrix(date, icrfToFixed))) {
+            Transforms.computeTemeToPseudoFixedMatrix(date, icrfToFixed);
+        }
+
+        var rotation = this._axes.evaluate(date, rotationScratch);
+        Matrix3.transpose(rotation, rotation);
+        Matrix3.multiply(icrfToFixed, rotation, rotation);
+
+        var translation = Simon1994PlanetaryPositions.ComputeMoonPositionInEarthInertialFrame(date, translationScratch);
+        Matrix3.multiplyByVector(icrfToFixed, translation, translation);
+
+        Matrix4.fromRotationTranslation(rotation, translation, ellipsoidPrimitive.modelMatrix);
+        ellipsoidPrimitive.update(context, frameState, commandList);
+    };
+
+    /**
+     * Returns true if this object was destroyed; otherwise, false.
+     * <br /><br />
+     * If this object was destroyed, it should not be used; calling any function other than
+     * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
+     *
+     * @memberof Moon
+     *
+     * @returns {Boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
+     *
+     * @see Moon#destroy
+     */
+    Moon.prototype.isDestroyed = function() {
+        return false;
+    };
+
+    /**
+     * Destroys the WebGL resources held by this object.  Destroying an object allows for deterministic
+     * release of WebGL resources, instead of relying on the garbage collector to destroy this object.
+     * <br /><br />
+     * Once an object is destroyed, it should not be used; calling any function other than
+     * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.  Therefore,
+     * assign the return value (<code>undefined</code>) to the object as done in the example.
+     *
+     * @memberof Moon
+     *
+     * @returns {undefined}
+     *
+     * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
+     *
+     * @see Moon#isDestroyed
+     *
+     * @example
+     * moon = moon && moon.destroy();
+     */
+    Moon.prototype.destroy = function() {
+        this._ellipsoid = this._ellipsoid && this._ellipsoid.destroy();
+        return destroyObject(this);
+    };
+
+    return Moon;
+});

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

@@ -30,6 +30,7 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
      * @param {Number} [options.textureRotationAngle=0.0] The rotation of the texture coordinates, in radians. A positive rotation is counter-clockwise.
      * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
      * @param {Material} [options.material=undefined] The surface appearance of the primitive.
+     * @param {Object} [options.id=undefined] A user-defined object to return when the instance is picked with {@link Scene#pick}
      * @param {Boolean} [options.asynchronous=true] Determines if the extent will be created asynchronously or block until ready.
      *
      * @exception {DeveloperError} Either options.positions or options.polygonHierarchy can be provided, but not both.
@@ -139,6 +140,18 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
          */
         this.material = defaultValue(options.material, material);
 
+        /**
+         * User-defined object returned when the polygon is picked.
+         *
+         * @type Object
+         *
+         * @default undefined
+         *
+         * @see Scene#pick
+         */
+        this.id = options.id;
+        this._id = undefined;
+
         /**
          * Determines if the geometry instances will be created and batched on
          * a web worker.
@@ -289,13 +302,15 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
             (this._ellipsoid !== this.ellipsoid) ||
             (this._granularity !== this.granularity) ||
             (this._height !== this.height) ||
-            (this._textureRotationAngle !== this.textureRotationAngle)) {
+            (this._textureRotationAngle !== this.textureRotationAngle) ||
+            (this._id !== this.id)) {
 
             this._createPrimitive = false;
             this._ellipsoid = this.ellipsoid;
             this._granularity = this.granularity;
             this._height = this.height;
             this._textureRotationAngle = this.textureRotationAngle;
+            this._id = this.id;
 
             this._primitive = this._primitive && this._primitive.destroy();
 
@@ -314,6 +329,7 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
                         ellipsoid : this.ellipsoid,
                         granularity : this.granularity
                     }),
+                    id : this.id,
                     pickPrimitive : this
                 });
             } else {
@@ -326,6 +342,7 @@ define(['Core/DeveloperError', 'Core/defaultValue', 'Core/defined', 'Core/Color'
                         ellipsoid : this.ellipsoid,
                         granularity : this.granularity
                     }),
+                    id : this.id,
                     pickPrimitive : this
                 });
             }