CesiumGS · pjcozzi · Feb 15, 2013 · Nov 6, 2012 · Nov 7, 2012 · Nov 8, 2012
diff --git a/Apps/Sandcastle/gallery/Terrain.html b/Apps/Sandcastle/gallery/Terrain.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">  <!-- Use Chrome Frame in IE -->
+    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="Visualize worldwide, high-resolution terrain.">
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="text/javascript">
+    var dojoConfig = {
+        baseUrl : '../../../Source',
+        packages: [
+            { name: 'dojo', location: '../ThirdParty/dojo-release-1.8.3-src/dojo' },
+            { name: 'dijit', location: '../ThirdParty/dojo-release-1.8.3-src/dijit' },
+            { name: 'dojox', location: '../ThirdParty/dojo-release-1.8.3-src/dojox' }
+        ]
+    };
+    </script>
+    <script data-dojo-config="async: 1, tlmSiblingOfDojo: 0" src="../../../ThirdParty/dojo-release-1.8.3-src/dojo/dojo.js"></script>
+    <link rel="stylesheet" href="../../../ThirdParty/dojo-release-1.8.3-src/dijit/themes/claro/claro.css" type="text/css">
+    <link rel="stylesheet" href="../../../Source/Widgets/Dojo/CesiumViewerWidget.css" type="text/css">
+</head>
+<body class="claro sandcastle-loading" data-sandcastle-bucket="bucket-dojo.html" data-sandcastle-title="Cesium + Dojo">
+<style>
+    @import url(../templates/bucket.css);
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar">
+<div id="terrainMenu"></div>
+<div id="zoomButtons"></div>
+</div>
+<script id="cesium_sandcastle_script">
+require([
+    'Cesium',
+    'Widgets/Dojo/CesiumViewerWidget',
+    'dijit/DropDownMenu',
+    'dijit/MenuItem',
+    'dijit/form/Button',
+    'dijit/form/DropDownButton'
+], function(
+    Cesium,
+    CesiumViewerWidget,
+    DropDownMenu,
+    MenuItem,
+    Button,
+    DropDownButton) {
+    "use strict";
+
+    function createTerrainMenu(terrainProviders) {
+        var menu = new DropDownMenu();
+        var button = new DropDownButton({
+            label : terrainProviders[0].name,
+            dropDown : menu
+        });
+
+        function createTerrainMenuItem(button, providerInfo) {
+            return new MenuItem({
+                label : providerInfo.name,
+                onClick : function() {
+                    centralBody.terrainProvider = providerInfo.provider;
+                    button.set('label', providerInfo.name);
+                }
+            });
+        }
+
+        for (var i = 0, len = terrainProviders.length; i < len; ++i) {
+            menu.addChild(createTerrainMenuItem(button, terrainProviders[i]));
+        }
+
+        button.placeAt('terrainMenu');
+
+        new Button({
+            label: 'Mount Everest',
+            onClick: function() {
+                var eye, target, up;
+
+                if (scene.mode === Cesium.SceneMode.SCENE3D) {
+                    eye = new Cesium.Cartesian3(294572.0645397696, 5637826.573008351, 2978624.6868285);
+                    target = eye.add(new Cesium.Cartesian3(0.9028130862217908, -0.42449297750082904, -0.06880583840911567));
+                    up = new Cesium.Cartesian3(0.40668971896562117, 0.790807045510862, 0.45741413322152297);
+                    scene.getCamera().controller.lookAt(eye, target, up);
+                } else if (scene.mode === Cesium.SceneMode.COLUMBUS_VIEW) {
+                    eye = new Cesium.Cartesian3(9684590.891310014, 3114799.076252769, 9849.375792522824);
+                    target = eye.add(new Cesium.Cartesian3(-0.8929328433855669, -0.00005779973945286486, -0.45018988645076763));
+                    up = new Cesium.Cartesian3(-0.4501898855076042, -0.0000291369789812141, 0.8929328452557279);
+                    scene.getCamera().controller.lookAt(eye, target, up);
+                } else {
+                    scene.getCamera().controller.viewExtent(new Cesium.Extent(1.516102969, 0.48744464, 1.518102969, 0.48944464));
+                }
+            }
+        }).placeAt('zoomButtons');
+
+        new Button({
+            label: 'Half Dome',
+            onClick: function() {
+                var eye, target, up;
+
+                if (scene.mode === Cesium.SceneMode.SCENE3D) {
+                    eye = new Cesium.Cartesian3(-2496304.1498512086, -4391818.97382059, 3884176.4503971986);
+                    target = eye.add(new Cesium.Cartesian3(0.9279518715011381, -0.29488412129953234, -0.22792252890604328));
+                    up = new Cesium.Cartesian3(-0.11836693744723503, -0.8130611584421428, 0.5700182635106171);
+                    scene.getCamera().controller.lookAt(eye, target, up);
+                } else if (scene.mode === Cesium.SceneMode.COLUMBUS_VIEW) {
+                    eye = new Cesium.Cartesian3(-13314946.646404704, 4200941.442507448, 2468.225945515426);
+                    target = eye.add(new Cesium.Cartesian3(0.9624895834866811, 0.04124314776883213, -0.26816562874787864));
+                    up = new Cesium.Cartesian3(0.2679197697914868, 0.011480478929947842, 0.9633728227203466);
+                    scene.getCamera().controller.lookAt(eye, target, up);
+                } else {
+                    scene.getCamera().controller.viewExtent(new Cesium.Extent(-2.08724538, 0.6577939, -2.08524538, 0.6597939));
+                }
+            }
+        }).placeAt('zoomButtons');
+
+        new Button({
+            label: 'San Francisco Bay',
+            onClick: function() {
+                var eye, target, up;
+
+                if (scene.mode === Cesium.SceneMode.SCENE3D) {
+                    eye = new Cesium.Cartesian3(-2674718.9291375633, -4332137.224608461, 3888180.6614196445);
+                    target = eye.add(new Cesium.Cartesian3(-0.40034097132786534, 0.9155843741828319, 0.03784653786617176));
+                    up = new Cesium.Cartesian3(-0.6502679490649945, -0.3129458646313862, 0.6922546353438556);
+                    scene.getCamera().controller.lookAt(eye, target, up);
+                } else if (scene.mode === Cesium.SceneMode.COLUMBUS_VIEW) {
+                    eye = new Cesium.Cartesian3(-13562569.113918452, 4176598.9965795614, 37656.37201701476);
+                    target = eye.add(new Cesium.Cartesian3(-0.8108519561707095, 0.4023795334200999, -0.42498213639958615));
+                    up = new Cesium.Cartesian3(-0.3806859699462094, 0.18891270085627615, 0.905201736488051);
+                    scene.getCamera().controller.lookAt(eye, target, up);
+                } else {
+                    scene.getCamera().controller.viewExtent(new Cesium.Extent(-2.147621889, 0.64829691, -2.125621889, 0.67029691));
+                }
+            }
+        }).placeAt('zoomButtons');
+    }
+
+    var widget = new CesiumViewerWidget();
+    widget.placeAt('cesiumContainer');
+    widget.fullscreenElement = document.body;
+    widget.startup();
+
+    var scene = widget.scene;
+    var centralBody = scene.getPrimitives().getCentralBody();
+
+    var terrainProvider = new Cesium.CesiumTerrainProvider({
+        url : 'http://cesium.agi.com/smallterrain'
+    });
+
+    centralBody.terrainProvider = terrainProvider;
+
+    var ellipsoidProvider = new Cesium.EllipsoidTerrainProvider();
+
+    var terrainProviders = [
+        { name : 'CesiumTerrainProvider', provider : terrainProvider },
+        { name : 'EllipsoidTerrainProvider', provider : ellipsoidProvider }
+    ];
+
+    createTerrainMenu(terrainProviders);
+
+    Sandcastle.finishedLoading();
+});
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/Terrain.jpg b/Apps/Sandcastle/gallery/Terrain.jpg
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,11 +8,15 @@ Beta Releases
 
 * Breaking changes:
    * `IntersectionTests.rayPlane` now takes the new `Plane` type instead of separate `planeNormal` and `planeD` arguments.
+   * Renamed `ImageryProviderError` to `TileProviderError`.
+* Added support for global terrain visualization via `CesiumTerrainProvider` and `ArcGisImageServerTerrainProvider`.  See the [Terrain Tutorial](http://cesium.agi.com/2013/02/15/Cesium-Terrain-Tutorial/) for more information.
 * Added `Plane` for representing the equation of a plane.
 * Added a line segment-plane intersection test to `IntersectionTests`.
 * Fixed an issue where a `PolylineCollection` with a model matrix other than the identity would be incorrectly rendered in 2D and Columbus view.
 * Fixed an issue in the `ScreenSpaceCameraController` where disabled mouse events can cause the camera to be moved after being re-enabled.
 * Added interactive extent drawing to the `Picking` Sandcastle example.
+* Added `HeightmapTessellator` to create a mesh from a heightmap.
+* Improved the lighting used in 2D and Columbus View modes.  In general, the surface lighting in these modes should look just like it does in 3D.
 
 ### b13 - 2013-02-01
 

diff --git a/Source/Assets/Textures/waterNormals.jpg b/Source/Assets/Textures/waterNormals.jpg
diff --git a/Source/Assets/Textures/waterNormalsSmall.jpg b/Source/Assets/Textures/waterNormalsSmall.jpg
diff --git a/Source/Core/BoundingSphere.js b/Source/Core/BoundingSphere.js
@@ -211,10 +211,10 @@ define([
     };
 
     var defaultProjection = new GeographicProjection();
-    var fromExtent2DLowerLeft = new Cartesian3(0.0, 0.0, 0.0);
-    var fromExtent2DUpperRight = new Cartesian3(0.0, 0.0, 0.0);
-    var fromExtent2DSouthwest = new Cartographic(0.0, 0.0, 0.0);
-    var fromExtent2DNortheast = new Cartographic(0.0, 0.0, 0.0);
+    var fromExtent2DLowerLeft = new Cartesian3();
+    var fromExtent2DUpperRight = new Cartesian3();
+    var fromExtent2DSouthwest = new Cartographic();
+    var fromExtent2DNortheast = new Cartographic();
 
     /**
      * Computes a bounding sphere from an extent projected in 2D.

diff --git a/Source/Core/Ellipsoid.js b/Source/Core/Ellipsoid.js
@@ -70,6 +70,35 @@ define([
         this._centerToleranceSquared = CesiumMath.EPSILON1;
     };
 
+    /**
+     * Duplicates an Ellipsoid instance.
+     *
+     * @memberof Ellipsoid
+     *
+     * @param {Ellipsoid} ellipsoid The ellipsoid to duplicate.
+     * @param {Ellipsoid} [result] The object onto which to store the result, or undefined if a new
+     *                    instance should be created.
+     * @returns {Ellipsoid} The cloned Ellipsoid.
+     */
+    Ellipsoid.clone = function(ellipsoid, result) {
+        var radii = ellipsoid._radii;
+
+        if (typeof result === 'undefined') {
+            return new Ellipsoid(radii.x, radii.y, radii.z);
+        }
+
+        Cartesian3.clone(radii, result._radii);
+        Cartesian3.clone(ellipsoid._radiiSquared, result._radiiSquared);
+        Cartesian3.clone(ellipsoid._radiiToTheFourth, result._radiiToTheFourth);
+        Cartesian3.clone(ellipsoid._oneOverRadii, result._oneOverRadii);
+        Cartesian3.clone(ellipsoid._oneOverRadiiSquared, result._oneOverRadiiSquared);
+        result._minimumRadius = ellipsoid._minimumRadius;
+        result._maximumRadius = ellipsoid._maximumRadius;
+        result._centerToleranceSquared = ellipsoid._centerToleranceSquared;
+
+        return result;
+    };
+
     /**
      * Computes an Ellipsoid from a Cartesian specifying the radii in x, y, and z directions.
      *

diff --git a/Source/Core/EllipsoidalOccluder.js b/Source/Core/EllipsoidalOccluder.js
@@ -45,8 +45,8 @@ define([
         }
 
         this._ellipsoid = ellipsoid;
-        this._cameraPosition = new Cartesian3(0.0, 0.0, 0.0);
-        this._cameraPositionInScaledSpace = new Cartesian3(0.0, 0.0, 0.0);
+        this._cameraPosition = new Cartesian3();
+        this._cameraPositionInScaledSpace = new Cartesian3();
         this._distanceToLimbInScaledSpaceSquared = 0.0;
 
         // setCameraPosition fills in the above values
@@ -95,7 +95,7 @@ define([
         return this._cameraPosition;
     };
 
-    var scratchCartesian = new Cartesian3(0.0, 0.0, 0.0);
+    var scratchCartesian = new Cartesian3();
 
     /**
      * Determines whether or not a point, the <code>occludee</code>, is hidden from view by the occluder.

diff --git a/Source/Core/Extent.js b/Source/Core/Extent.js
@@ -52,26 +52,41 @@ define([
     };
 
     /**
-     * Duplicates this Extent.
+     * Duplicates an Extent.
      *
-     * @param {Extent} [result] The object onto which to store the result.
+     * @memberof Extent
+     *
+     * @param {Extent} extent The extent to clone.
+     * @param {Extent} [result] The object onto which to store the result, or undefined if a new instance should be created.
      * @return {Extent} The modified result parameter or a new Extent instance if none was provided.
      */
-    Extent.prototype.clone = function(result) {
+    Extent.clone = function(extent, result) {
         if (typeof result === 'undefined') {
-            return new Extent(this.west, this.south, this.east, this.north);
+            return new Extent(extent.west, extent.south, extent.east, extent.north);
         }
-        result.west = this.west;
-        result.south = this.south;
-        result.east = this.east;
-        result.north = this.north;
+        result.west = extent.west;
+        result.south = extent.south;
+        result.east = extent.east;
+        result.north = extent.north;
         return result;
     };
 
+    /**
+     * Duplicates this Extent.
+     *
+     * @memberof Extent
+     *
+     * @param {Extent} [result] The object onto which to store the result.
+     * @return {Extent} The modified result parameter or a new Extent instance if none was provided.
+     */
+    Extent.prototype.clone = function(result) {
+        return Extent.clone(this, result);
+    };
+
     /**
      * Compares the provided Extent with this Extent componentwise and returns
      * <code>true</code> if they are equal, <code>false</code> otherwise.
-     * @memberof Cartesian3
+     * @memberof Extent
      *
      * @param {Extent} [other] The Extent to compare.
      * @return {Boolean} <code>true</code> if the Extents are equal, <code>false</code> otherwise.

diff --git a/Source/Core/ExtentTessellator.js b/Source/Core/ExtentTessellator.js
@@ -24,6 +24,7 @@ define([
      *
      * @exports ExtentTessellator
      *
+     * @see HeightmapTessellator
      * @see CubeMapEllipsoidTessellator
      * @see BoxTessellator
      * @see PlaneTessellator