CesiumGS · hpinkos · Sep 18, 2019 · Oct 3, 2017 · Oct 3, 2017 · Oct 3, 2017
diff --git a/Apps/Sandcastle/gallery/Partial Ellipsoids.html b/Apps/Sandcastle/gallery/Partial Ellipsoids.html
@@ -0,0 +1,208 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="Draw whole/partial spheres and ellipsoids.">
+    <meta name="cesium-sandcastle-labels" content="Geometries">
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
+    <script type="text/javascript">
+        if(typeof require === 'function') {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
+    </script>
+</head>
+<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+<style>
+    @import url(../templates/bucket.css);
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    'use strict';
+//Sandcastle_Begin
+var viewer = new Cesium.Viewer('cesiumContainer');
+
+var saturnPosition = Cesium.Cartesian3.fromDegrees(-95.0, 45.0, 300000.0);
+viewer.entities.add({
+    name : 'Saturn',
+    position: saturnPosition,
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        material : new Cesium.Color(0.95, 0.82, 0.49)
+    }
+});
+
+viewer.entities.add({
+    name : "Saturn's inner ring",
+    position: saturnPosition,
+    orientation : Cesium.Transforms.headingPitchRollQuaternion(
+        saturnPosition,
+        new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(30.0), Cesium.Math.toRadians(30.0), 0.0)
+    ),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(400000.0, 400000.0, 400000.0),
+        innerRadii : new Cesium.Cartesian3(300000.0, 300000.0, 300000.0),
+        minimumCone : Cesium.Math.toRadians(89.8),
+        maximumCone : Cesium.Math.toRadians(90.2),
+        material : new Cesium.Color(0.95, 0.82, 0.49, 0.5)
+    }
+});
+
+viewer.entities.add({
+    name : "Saturn's outer ring",
+    position: saturnPosition,
+    orientation : Cesium.Transforms.headingPitchRollQuaternion(
+        saturnPosition,
+        new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(30.0), Cesium.Math.toRadians(30.0), 0.0)
+    ),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(460000.0, 460000.0, 460000.0),
+        innerRadii : new Cesium.Cartesian3(415000.0, 415000.0, 415000.0),
+        minimumCone : Cesium.Math.toRadians(89.8),
+        maximumCone : Cesium.Math.toRadians(90.2),
+        material : new Cesium.Color(0.95, 0.82, 0.49, 0.5)
+    }
+});
+
+viewer.entities.add({
+    name : 'Dome',
+    position: Cesium.Cartesian3.fromDegrees(-120.0, 40.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        maximumCone : Cesium.Math.PI_OVER_TWO,
+        material : Cesium.Color.BLUE.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Dome with inner radius',
+    position: Cesium.Cartesian3.fromDegrees(-114.0, 40.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(250000.0, 200000.0, 150000.0),
+        innerRadii : new Cesium.Cartesian3(100000.0, 80000.0, 60000.0),
+        maximumCone : Cesium.Math.PI_OVER_TWO,
+        material : Cesium.Color.RED.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Dome with top cut out',
+    position: Cesium.Cartesian3.fromDegrees(-108.0, 40.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        innerRadii : new Cesium.Cartesian3(100000.0, 100000.0, 100000.0),
+        minimumCone : Cesium.Math.toRadians(20.0),
+        maximumCone : Cesium.Math.PI_OVER_TWO,
+        material : Cesium.Color.YELLOW.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Top and bottom cut out',
+    position: Cesium.Cartesian3.fromDegrees(-102.0, 40.0, 140000.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        innerRadii : new Cesium.Cartesian3(100000.0, 100000.0, 100000.0),
+        minimumCone : Cesium.Math.toRadians(60.0),
+        maximumCone : Cesium.Math.toRadians(140.0),
+        material : Cesium.Color.DARKCYAN.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Bowl',
+    position: Cesium.Cartesian3.fromDegrees(-96.0, 39.5, 200000.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        innerRadii : new Cesium.Cartesian3(180000.0, 180000.0, 180000.0),
+        minimumCone : Cesium.Math.toRadians(110.0),
+        material : Cesium.Color.GREEN.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Clock cutout',
+    position: Cesium.Cartesian3.fromDegrees(-90.0, 39.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        innerRadii : new Cesium.Cartesian3(150000.0, 150000.0, 150000.0),
+        minimumClock : Cesium.Math.toRadians(-90.0),
+        maximumClock : Cesium.Math.toRadians(180.0),
+        minimumCone : Cesium.Math.toRadians(20.0),
+        maximumCone : Cesium.Math.toRadians(70.0),
+        material : Cesium.Color.BLUE.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Partial dome',
+    position: Cesium.Cartesian3.fromDegrees(-84.0, 38.5),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(200000.0, 200000.0, 200000.0),
+        minimumClock : Cesium.Math.toRadians(-90.0),
+        maximumClock : Cesium.Math.toRadians(180.0),
+        maximumCone : Cesium.Math.toRadians(90.0),
+        material : Cesium.Color.RED.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.entities.add({
+    name : 'Wedge',
+    position : Cesium.Cartesian3.fromDegrees(-102.0, 35.0, 20000.0),
+    orientation : Cesium.Transforms.headingPitchRollQuaternion(
+        Cesium.Cartesian3.fromDegrees(-102.0, 35.0, 20000.0),
+        new Cesium.HeadingPitchRoll(Cesium.Math.PI / 1.5, 0, 0.0)
+    ),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(500000.0, 500000.0, 500000.0),
+        innerRadii : new Cesium.Cartesian3(10000.0, 10000.0, 10000.0),
+        minimumClock : Cesium.Math.toRadians(-15.0),
+        maximumClock : Cesium.Math.toRadians(15.0),
+        minimumCone : Cesium.Math.toRadians(75.0),
+        maximumCone : Cesium.Math.toRadians(105.0),
+        material : Cesium.Color.DARKCYAN.withAlpha(0.3),
+        outline : true
+    }
+});
+viewer.entities.add({
+    name : 'Partial ellipsoid',
+    position : Cesium.Cartesian3.fromDegrees(-95.0, 34.0),
+    ellipsoid : {
+        radii : new Cesium.Cartesian3(300000.0, 300000.0, 300000.0),
+        innerRadii : new Cesium.Cartesian3(70000.0, 70000.0, 70000.0),
+        minimumClock : Cesium.Math.toRadians(180.0),
+        maximumClock : Cesium.Math.toRadians(400.0),
+        maximumCone : Cesium.Math.toRadians(90.0),
+        material : Cesium.Color.DARKCYAN.withAlpha(0.3),
+        outline : true
+    }
+});
+
+viewer.zoomTo(viewer.entities);
+//Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== 'undefined') {
+    startup(Cesium);
+} else if (typeof require === 'function') {
+    require(['Cesium'], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/Partial Ellipsoids.jpg b/Apps/Sandcastle/gallery/Partial Ellipsoids.jpg
diff --git a/Apps/Sandcastle/gallery/Spheres and Ellipsoids.html b/Apps/Sandcastle/gallery/Spheres and Ellipsoids.html
@@ -10,10 +10,12 @@
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
     <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
     <script type="text/javascript">
-    require.config({
-        baseUrl : '../../../Source',
-        waitSeconds : 60
-    });
+        if(typeof require === 'function') {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
     </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">

diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,9 @@ Change Log
 
 ### 1.62 - 2019-10-01
 
+##### Additions :tada:
+* Added ability to create partial ellipsoids using both the Entity API and CZML. New ellipsoid geometry properties: `innerRadii`, `minimumClock`, `maximumClock`, `minimumCone`, and `maximumCone`. This affects both `EllipsoidGeometry` and `EllipsoidOutlineGeometry`. See the updated [Sandcastle example](https://cesiumjs.org/Cesium/Apps/Sandcastle/?src=Partial%20Ellipsoids.html&label=Geometries). [#5995](https://github.com/AnalyticalGraphicsInc/cesium/pull/5995)
+
 ##### Fixes :wrench:
 * `Camera.flyTo` flies to the correct location in 2D when the destination crosses the international date line [#7909](https://github.com/AnalyticalGraphicsInc/cesium/pull/7909)
 

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -136,6 +136,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Brandon Barker](https://github.com/ProjectBarks)
    * [Peter Gagliardi](https://github.com/ptrgags)
    * [Ian Lilley](https://github.com/IanLilleyT)
+* [Northrop Grumman](http://www.northropgrumman.com)
+   * [Joseph Stein](https://github.com/nahgrin)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf)
 * [Victor Berchet](https://github.com/vicb)
@@ -205,6 +207,7 @@ 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)
 * [Tamar Cohen](https://github.com/tamarmot)
 * [Stephen Wiseman](https://github.com/srwiseman)
 * [Gabriel Macario](https://github.com/gabriel-macario)