Partial ellipsoid

CHANGES.md

@@ -6,6 +6,7 @@ Change Log
 * Added ability to support touch event in Imagery Layers Split demo application. [#5948](https://github.com/AnalyticalGraphicsInc/cesium/pull/5948)
 * Fixed `Invalid asm.js: Invalid member of stdlib` console error by recompiling crunch.js with latest emscripten toolchain. [#5847](https://github.com/AnalyticalGraphicsInc/cesium/issues/5847)
 * Added CZML support for `polyline.depthFailMaterial`, `label.scaleByDistance`, `distanceDisplayCondition`, and `disableDepthTestDistance`. [#5986](https://github.com/AnalyticalGraphicsInc/cesium/pull/5986)
+* Added ability to create partial ellipsoid volumes using new geometry options: inner radii, min/max azimuth, min/max elevation.
 
 ### 1.39 - 2017-11-01
 

CONTRIBUTORS.md

@@ -167,3 +167,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Cody Guldner](https://github.com/burn123)
 * [Nacho Carnicero](https://github.com/nacho-carnicero)
 * [Y.Selim Abidin](https://github.com/SelimAbidin)
+* [Steven Trotter](https://github.com/srtrotter)

Source/DataSources/CzmlDataSource.js

@@ -1534,6 +1534,11 @@ define([
 
         processPacketData(Boolean, ellipsoid, 'show', ellipsoidData.show, interval, sourceUri, entityCollection, query);
         processPacketData(Cartesian3, ellipsoid, 'radii', ellipsoidData.radii, interval, sourceUri, entityCollection, query);
+        processPacketData(Cartesian3, ellipsoid, 'innerRadii', ellipsoidData.innerRadii, interval, sourceUri, entityCollection);
+        processPacketData(Number, ellipsoid, 'azimuthMin', ellipsoidData.azimuthMin, interval, sourceUri, entityCollection);
+        processPacketData(Number, ellipsoid, 'azimuthMax', ellipsoidData.azimuthMax, interval, sourceUri, entityCollection);
+        processPacketData(Number, ellipsoid, 'elevationMin', ellipsoidData.elevationMin, interval, sourceUri, entityCollection);
+        processPacketData(Number, ellipsoid, 'elevationMax', ellipsoidData.elevationMax, interval, sourceUri, entityCollection);
         processPacketData(Boolean, ellipsoid, 'fill', ellipsoidData.fill, interval, sourceUri, entityCollection, query);
         processMaterialPacketData(ellipsoid, 'material', ellipsoidData.material, interval, sourceUri, entityCollection, query);
         processPacketData(Boolean, ellipsoid, 'outline', ellipsoidData.outline, interval, sourceUri, entityCollection, query);

Source/DataSources/EllipsoidGeometryUpdater.js

@@ -65,13 +65,19 @@ define([
     var defaultDistanceDisplayCondition = new ConstantProperty(new DistanceDisplayCondition());
 
     var radiiScratch = new Cartesian3();
+    var innerRadiiScratch = new Cartesian3();
     var scratchColor = new Color();
     var unitSphere = new Cartesian3(1, 1, 1);
 
     function GeometryOptions(entity) {
         this.id = entity;
         this.vertexFormat = undefined;
         this.radii = undefined;
+        this.innerRadii = undefined;
+        this.azimuthMin = undefined;
+        this.azimuthMax = undefined;
+        this.elevationMin = undefined;
+        this.elevationMax = undefined;
         this.stackPartitions = undefined;
         this.slicePartitions = undefined;
         this.subdivisions = undefined;
@@ -496,14 +502,28 @@ define([
         this._fillEnabled = fillEnabled;
         this._outlineEnabled = outlineEnabled;
 
+        var innerRadii = ellipsoid.innerRadii;
+        var azimuthMin = ellipsoid.azimuthMin;
+        var azimuthMax = ellipsoid.azimuthMax;
+        var elevationMin = ellipsoid.elevationMin;
+        var elevationMax = ellipsoid.elevationMax;
         var stackPartitions = ellipsoid.stackPartitions;
         var slicePartitions = ellipsoid.slicePartitions;
         var outlineWidth = ellipsoid.outlineWidth;
         var subdivisions = ellipsoid.subdivisions;
 
+        if (!defined(innerRadii)) {
+            innerRadii = radii;
+        }
+
         if (!position.isConstant || //
             !Property.isConstant(entity.orientation) || //
             !radii.isConstant || //
+            !innerRadii.isConstant || //
+            !Property.isConstant(azimuthMin) || //
+            !Property.isConstant(azimuthMax) || //
+            !Property.isConstant(elevationMin) || //
+            !Property.isConstant(elevationMax) || //
             !Property.isConstant(stackPartitions) || //
             !Property.isConstant(slicePartitions) || //
             !Property.isConstant(outlineWidth) || //
@@ -516,6 +536,11 @@ define([
             var options = this._options;
             options.vertexFormat = isColorMaterial ? PerInstanceColorAppearance.VERTEX_FORMAT : MaterialAppearance.MaterialSupport.TEXTURED.vertexFormat;
             options.radii = radii.getValue(Iso8601.MINIMUM_VALUE, options.radii);
+            options.innerRadii = innerRadii.getValue(Iso8601.MINIMUM_VALUE, options.innerRadii);
+            options.azimuthMin = defined(azimuthMin) ? azimuthMin.getValue(Iso8601.MINIMUM_VALUE) : undefined;
+            options.azimuthMax = defined(azimuthMax) ? azimuthMax.getValue(Iso8601.MINIMUM_VALUE) : undefined;
+            options.elevationMin = defined(elevationMin) ? elevationMin.getValue(Iso8601.MINIMUM_VALUE) : undefined;
+            options.elevationMax = defined(elevationMax) ? elevationMax.getValue(Iso8601.MINIMUM_VALUE) : undefined;
             options.stackPartitions = defined(stackPartitions) ? stackPartitions.getValue(Iso8601.MINIMUM_VALUE) : undefined;
             options.slicePartitions = defined(slicePartitions) ? slicePartitions.getValue(Iso8601.MINIMUM_VALUE) : undefined;
             options.subdivisions = defined(subdivisions) ? subdivisions.getValue(Iso8601.MINIMUM_VALUE) : undefined;
@@ -646,6 +671,18 @@ define([
             options.slicePartitions = slicePartitions;
             options.subdivisions = subdivisions;
             options.radii = in3D ? unitSphere : radii;
+            var innerRadii = Property.getValueOrUndefined(ellipsoid.innerRadii, time, innerRadiiScratch);
+            if (in3D) {
+               var mag = Cartesian3.magnitude(radii);
+               var innerRadiiUnit = new Cartesian3(innerRadii.x/mag, innerRadii.y/mag, innerRadii.z/mag);
+               options.innerRadii = innerRadiiUnit;
+            } else {
+               options.innerRadii = innerRadii;
+            }
+            options.azimuthMin = Property.getValueOrUndefined(ellipsoid.azimuthMin, time);
+            options.azimuthMax = Property.getValueOrUndefined(ellipsoid.azimuthMax, time);
+            options.elevationMin = Property.getValueOrUndefined(ellipsoid.elevationMin, time);
+            options.elevationMax = Property.getValueOrUndefined(ellipsoid.elevationMax, time);
 
             appearance = new MaterialAppearance({
                 material : material,

Source/DataSources/EllipsoidGraphics.js

@@ -24,6 +24,11 @@ define([
      *
      * @param {Object} [options] Object with the following properties:
      * @param {Property} [options.radii] A {@link Cartesian3} Property specifying the radii of the ellipsoid.
+     * @param {Property} [options.innerRadii] A {@link Cartesian3} Property specifying the inner radii of the ellipsoid.
+     * @param {Property} [options.azimuthMin=0] A Property specifying the minimum azimuth angle of the ellipsoid (0 is north, +CW).
+     * @param {Property} [options.azimuthMax=0] A Property specifying the maximum azimuth angle of the ellipsoid (0 is north, +CW).
+     * @param {Property} [options.elevationMin=0] A Property specifying the minimum elevation angle of the ellipsoid (0 is tangential to earth surface, +UP).
+     * @param {Property} [options.elevationMax=0] A Property specifying the maximum elevation angle of the ellipsoid (0 is tangential to earth surface, +UP).
      * @param {Property} [options.show=true] A boolean Property specifying the visibility of the ellipsoid.
      * @param {Property} [options.fill=true] A boolean Property specifying whether the ellipsoid is filled with the provided material.
      * @param {MaterialProperty} [options.material=Color.WHITE] A Property specifying the material used to fill the ellipsoid.
@@ -43,6 +48,11 @@ define([
         this._showSubscription = undefined;
         this._radii = undefined;
         this._radiiSubscription = undefined;
+        this._innerRadii = undefined;
+        this._azimuthMin = undefined;
+        this._azimuthMax = undefined;
+        this._elevationMin = undefined;
+        this._elevationMax = undefined;
         this._material = undefined;
         this._materialSubscription = undefined;
         this._stackPartitions = undefined;
@@ -97,6 +107,46 @@ define([
          */
         radii : createPropertyDescriptor('radii'),
 
+        /**
+         * Gets or sets the {@link Cartesian3} {@link Property} specifying the inner radii of the ellipsoid.
+         * @memberof EllipsoidGraphics.prototype
+         * @type {Property}
+         * @default radii
+         */
+        innerRadii : createPropertyDescriptor('innerRadii'),
+
+        /**
+         * Gets or sets the Property specifying the minimum azimuth angle in degrees.
+         * @memberof EllipsoidGraphics.prototype
+         * @type {Property}
+         * @default 0.0
+         */
+        azimuthMin : createPropertyDescriptor('azimuthMin'),
+
+        /**
+         * Gets or sets the Property specifying the maximum azimuth angle in degrees.
+         * @memberof EllipsoidGraphics.prototype
+         * @type {Property}
+         * @default 360.0
+         */
+        azimuthMax : createPropertyDescriptor('azimuthMax'),
+
+        /**
+         * Gets or sets the Property specifying the minimum elevation angle in degrees.
+         * @memberof EllipsoidGraphics.prototype
+         * @type {Property}
+         * @default 90.0
+         */
+        elevationMin : createPropertyDescriptor('elevationMin'),
+
+        /**
+         * Gets or sets the Property specifying the maximum elevation angle in degrees.
+         * @memberof EllipsoidGraphics.prototype
+         * @type {Property}
+         * @default -90.0
+         */
+        elevationMax : createPropertyDescriptor('elevationMax'),
+
         /**
          * Gets or sets the Property specifying the material used to fill the ellipsoid.
          * @memberof EllipsoidGraphics.prototype
@@ -146,7 +196,7 @@ define([
         stackPartitions : createPropertyDescriptor('stackPartitions'),
 
         /**
-         * Gets or sets the Property specifying the number of radial slices.
+         * Gets or sets the Property specifying the number of radial slices per 360 degrees.
          * @memberof EllipsoidGraphics.prototype
          * @type {Property}
          * @default 64
@@ -190,6 +240,11 @@ define([
         }
         result.show = this.show;
         result.radii = this.radii;
+        result.innerRadii = this.innerRadii;
+        result.azimuthMin = this.azimuthMin;
+        result.azimuthMax = this.azimuthMax;
+        result.elevationMin = this.elevationMin;
+        result.elevationMax = this.elevationMax;
         result.material = this.material;
         result.fill = this.fill;
         result.outline = this.outline;
@@ -219,6 +274,11 @@ define([
 
         this.show = defaultValue(this.show, source.show);
         this.radii = defaultValue(this.radii, source.radii);
+        this.innerRadii = defaultValue(this.innerRadii, source.innerRadii);
+        this.azimuthMin = defaultValue(this.azimuthMin, source.azimuthMin);
+        this.azimuthMax = defaultValue(this.azimuthMax, source.azimuthMax);
+        this.elevationMin = defaultValue(this.elevationMin, source.elevationMin);
+        this.elevationMax = defaultValue(this.elevationMax, source.elevationMax);
         this.material = defaultValue(this.material, source.material);
         this.fill = defaultValue(this.fill, source.fill);
         this.outline = defaultValue(this.outline, source.outline);