Merge remote-tracking branch 'origin/master' into omh1280-czml_query

# Conflicts: # CHANGES.md
CesiumGS · Jun 6, 2017 · 7873c00 · 7873c00
2 parents 97d45ee + bb8989c
commit 7873c00
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 133 deletions.
diff --git a/Apps/Sandcastle/gallery/ArcticDEM.html b/Apps/Sandcastle/gallery/ArcticDEM.html
@@ -0,0 +1,101 @@
+<!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="Visualize high-resolution arctic terrain.">
+    <meta name="cesium-sandcastle-labels" content="Showcases">
+    <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">
+    require.config({
+        baseUrl : '../../../Source',
+        waitSeconds : 60
+    });
+    </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');
+
+// Load ArcticDEM terrain
+var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
+    url : 'http://assets.agi.com/stk-terrain/v1/tilesets/ArticDEM/tiles',
+    requestWaterMask : true,
+    requestVertexNormals : true
+});
+viewer.terrainProvider = cesiumTerrainProviderMeshes;
+
+// Add Alaskan locations
+Sandcastle.addDefaultToolbarMenu([{
+    text : 'Denali',
+    onselect : function() {
+        viewer.scene.camera.flyTo({
+            destination : Cesium.Cartesian3.fromRadians(-2.6399828792482234, 1.0993550795541742, 5795),
+            orientation : {
+                heading : 3.8455,
+                pitch : -0.4535,
+                roll : 0.0
+            }
+        });
+    }
+}, {
+    text : 'Anchorage Area',
+    onselect : function() {
+        viewer.scene.camera.flyTo({
+            destination : Cesium.Cartesian3.fromRadians(-2.610708034601548, 1.0671172431736584, 1900),
+            orientation : {
+                heading : 4.6,
+                pitch : -0.341,
+                roll : 0.0
+            }
+        });
+    }
+}, {
+    text : 'Peaks',
+    onselect : function() {
+        viewer.scene.camera.flyTo({
+            destination : Cesium.Cartesian3.fromRadians(-2.6928866820212813, 1.072394255273859, 3700),
+            orientation : {
+                heading : 1.6308222948889464,
+                pitch : -0.6473480165020193,
+                roll : 0.0
+            }
+        });
+    }
+}, {
+    text : 'Riverbed',
+    onselect : function() {
+        viewer.scene.camera.flyTo({
+            destination : Cesium.Cartesian3.fromRadians(-2.6395623497608596, 1.0976443174490356, 2070),
+            orientation : {
+                heading : 6.068794108659519,
+                pitch : -0.08514161789475816,
+                roll : 0.0
+            }
+        });
+    }
+}], 'toolbar');
+
+//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/ArcticDEM.jpg b/Apps/Sandcastle/gallery/ArcticDEM.jpg
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,7 @@ Change Log
 * Fixed bug where if polylines were set to follow the surface of an undefined globe, Cesium would crash [#5413] https://github.com/AnalyticalGraphicsInc/cesium/pull/5413
 * Fixed a bug where picking clusters would return undefined instead of a list of the clustered entities. [#5286](https://github.com/AnalyticalGraphicsInc/cesium/issues/5286)
 * Reduced the amount of Sun bloom post-process effect near the horizon. [#5381](https://github.com/AnalyticalGraphicsInc/cesium/issues/5381)
+* Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224)
 * `CzmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419)
 
 ### 1.34 - 2017-06-01

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -42,6 +42,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Mohamad Moneimne](https://github.com/moneimne)
    * [Ottavio Hartman](https://github.com/omh1280)
    * [William Ho](https://github.com/williamkho)
+   * [Srinivas Kaza](https://github.com/AnimatedRNG)
 * [NICTA](http://www.nicta.com.au/)
    * [Chris Cooper](https://github.com/chris-cooper)
    * [Kevin Ring](https://github.com/kring)