Merge branch 'master' into docFix

rspalko · May 20, 2014 · c4f191c · c4f191c
2 parents eb0aaf4 + 75b698c
commit c4f191c
Show file tree

Hide file tree

Showing 25 changed files with 285 additions and 125 deletions.
diff --git a/Apps/HelloWorld.html b/Apps/HelloWorld.html
@@ -34,7 +34,7 @@
 <body>
   <div id="cesiumContainer"></div>
   <script>
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
+    var viewer = new Cesium.Viewer('cesiumContainer');
   </script>
 </body>
 </html>
diff --git a/Apps/Sandcastle/gallery/Animations.html b/Apps/Sandcastle/gallery/Animations.html
@@ -45,8 +45,7 @@
         rectangle.material.uniforms.color = new Cesium.Color(1.0, 0.0, 0.0, 0.5);
     }
 
-    function createPrimitives(widget) {
-        var scene = widget.scene;
+    function createPrimitives(scene) {
         var primitives = scene.primitives;
 
         rectangle = new Cesium.RectanglePrimitive({
@@ -74,10 +73,10 @@
         primitives.add(sensors);
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
-    var scene = widget.scene;
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
 
-    createPrimitives(widget);
+    createPrimitives(scene);
 
     Sandcastle.addToolbarButton('Alpha Animation', function() {
         scene.animations.removeAll();

diff --git a/Apps/Sandcastle/gallery/Billboards.html b/Apps/Sandcastle/gallery/Billboards.html
@@ -413,9 +413,8 @@
         image.src = '../images/facility.gif';
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
-
-    var scene = widget.scene;
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
     var primitives = scene.primitives;
 
     addBillboard(scene);

diff --git a/Apps/Sandcastle/gallery/Black Marble.html b/Apps/Sandcastle/gallery/Black Marble.html
@@ -26,12 +26,13 @@
 require(['Cesium'], function(Cesium) {
     "use strict";
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer', {
+    var viewer = new Cesium.Viewer('cesiumContainer', {
         imageryProvider : new Cesium.TileMapServiceImageryProvider({
             url : '//cesiumjs.org/blackmarble',
             maximumLevel : 8,
             credit : 'Black Marble imagery courtesy NASA Earth Observatory'
-        })
+        }),
+        baseLayerPicker : false
     });
 
     Sandcastle.finishedLoading();

diff --git a/Apps/Sandcastle/gallery/Camera.html b/Apps/Sandcastle/gallery/Camera.html
@@ -179,9 +179,8 @@
         controller.enableTilt = true;
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
-
-    var scene = widget.scene;
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
 
     Sandcastle.addToolbarButton('Fly to San Diego', function() {
         reset(scene);

diff --git a/Apps/Sandcastle/gallery/Cesium Viewer Widget.jpg b/Apps/Sandcastle/gallery/Cesium Viewer Widget.jpg
diff --git a/...dcastle/gallery/Cesium Viewer Widget.html → Apps/Sandcastle/gallery/Cesium Widget.html b/...dcastle/gallery/Cesium Viewer Widget.html → Apps/Sandcastle/gallery/Cesium Widget.html
@@ -26,7 +26,12 @@
 require(['Cesium'], function(Cesium) {
     "use strict";
 
-    var viewer = new Cesium.Viewer('cesiumContainer');
+    // Cesium.CesiumWidget is similar to Cesium.Viewer, but
+    // is trimmed down.  It is just a widget for the 3D globe;
+    // it does not include the animation, imagery selection,
+    // and other widgets, nor does it depend on the third-party
+    // Knockout library.
+    var widget = new Cesium.CesiumWidget('cesiumContainer');
 
     Sandcastle.finishedLoading();
 });

diff --git a/Apps/Sandcastle/gallery/Cesium Widget.jpg b/Apps/Sandcastle/gallery/Cesium Widget.jpg
diff --git a/Apps/Sandcastle/gallery/Hello World.html b/Apps/Sandcastle/gallery/Hello World.html
@@ -17,7 +17,7 @@
 </style>
 <div id="cesiumContainer" class="fullSize"></div>
 <script id="cesium_sandcastle_script">
-var widget = new Cesium.CesiumWidget('cesiumContainer');
+var viewer = new Cesium.Viewer('cesiumContainer');
 </script>
 </body>
 </html>
diff --git a/Apps/Sandcastle/gallery/Imagery Adjustment.html b/Apps/Sandcastle/gallery/Imagery Adjustment.html
@@ -148,9 +148,9 @@
         }
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
+    var viewer = new Cesium.Viewer('cesiumContainer');
 
-    imageryLayers = widget.scene.imageryLayers;
+    imageryLayers = viewer.scene.imageryLayers;
 
     createAdjustmentUserInterface();
 

diff --git a/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html b/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html
@@ -279,9 +279,9 @@
         });
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
+    var viewer = new Cesium.Viewer('cesiumContainer');
 
-    imageryLayers = widget.scene.imageryLayers;
+    imageryLayers = viewer.scene.imageryLayers;
 
     setupLayers();
 

diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html
@@ -26,13 +26,14 @@
 require(['Cesium'], function(Cesium) {
     "use strict";
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer', {
+    var viewer = new Cesium.Viewer('cesiumContainer', {
         imageryProvider : new Cesium.ArcGisMapServerImageryProvider({
             url : '//server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer'
-        })
+        }),
+        baseLayerPicker : false
     });
 
-    var layers = widget.scene.imageryLayers;
+    var layers = viewer.scene.imageryLayers;
     var blackMarble = layers.addImageryProvider(new Cesium.TileMapServiceImageryProvider({
         url : '//cesiumjs.org/blackmarble',
         maximumLevel : 8,

diff --git a/Apps/Sandcastle/gallery/Labels.html b/Apps/Sandcastle/gallery/Labels.html
@@ -140,9 +140,8 @@
         scene.primitives.add(labels);
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
-
-    var scene = widget.scene;
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
     var primitives = scene.primitives;
 
     addLabel(scene);

diff --git a/Apps/Sandcastle/gallery/Materials.html b/Apps/Sandcastle/gallery/Materials.html
@@ -386,8 +386,7 @@
         primitive.material = material;
     }
 
-    function createButtons(widget) {
-        var scene = widget.scene;
+    function createButtons(scene) {
         var primitives = scene.primitives;
 
         function toggleRectangleVisibility() {
@@ -611,8 +610,7 @@
         });
     }
 
-    function createPrimitives(widget) {
-        var scene = widget.scene;
+    function createPrimitives(scene) {
         var primitives = scene.primitives;
 
         rectangle = new Cesium.RectanglePrimitive({
@@ -641,10 +639,11 @@
         primitives.add(polylines);
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
 
-    createPrimitives(widget);
-    createButtons(widget);
+    createPrimitives(scene);
+    createButtons(scene);
 
     Sandcastle.finishedLoading();
 });

diff --git a/Apps/Sandcastle/gallery/Picking.html b/Apps/Sandcastle/gallery/Picking.html
@@ -96,7 +96,7 @@
     }
 
     function cleanup() {
-        widget.scene.primitives.removeAll();
+        viewer.scene.primitives.removeAll();
         handler = handler && handler.destroy();
     }
 
@@ -319,9 +319,8 @@
 
     }
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
-
-    var scene = widget.scene;
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
 
     pickCartographicPosition(scene);
 

diff --git a/Apps/Sandcastle/gallery/jQuery UI Demo.html b/Apps/Sandcastle/gallery/jQuery UI Demo.html
@@ -37,8 +37,8 @@
 (function () {
     "use strict";
 
-    var widget = new Cesium.CesiumWidget('cesiumContainer');
-    var scene = widget.scene;
+    var viewer = new Cesium.Viewer('cesiumContainer');
+    var scene = viewer.scene;
     // Create toolbar template
     $('#toolbar').html(
         '<span id="mode3D" class="aButton">3D globe</span> ' +

diff --git a/CHANGES.md b/CHANGES.md
@@ -6,7 +6,7 @@ Beta Releases
 
 ### b29 - 2014-06-02
 
-* Breaking changes ([why so many?](https://groups.google.com/forum/#!topic/cesium-dev/CQ0wCHjJ9x4))
+* Breaking changes ([why so many?](https://groups.google.com/forum/#!topic/cesium-dev/Y_mG11IZD9k))
   * Removed `CesiumWidget.onRenderLoopError` and `Viewer.renderLoopError`.  They have been replaced by `Scene.renderError`.
   * Removed `Shapes.compute2DCircle`, `Shapes.computeCircleBoundary` and `Shapes.computeEllipseBoundary`.  Instead, use `CircleOutlineGeometry` and `EllipseOutlineGeometry`.  See the [tutorial](http://cesiumjs.org/2013/11/04/Geometry-and-Appearances/).
   * Replaced `Scene.createTextureAtlas` with `new TextureAtlas`.

diff --git a/Source/Core/CatmullRomSpline.js b/Source/Core/CatmullRomSpline.js
@@ -4,6 +4,7 @@ define([
         './Cartesian4',
         './defaultValue',
         './defined',
+        './defineProperties',
         './DeveloperError',
         './HermiteSpline',
         './Matrix4',
@@ -13,6 +14,7 @@ define([
         Cartesian4,
         defaultValue,
         defined,
+        defineProperties,
         DeveloperError,
         HermiteSpline,
         Matrix4,
@@ -174,37 +176,72 @@ define([
             }
         }
 
+        this._times = times;
+        this._points = points;
+        this._firstTangent = Cartesian3.clone(firstTangent);
+        this._lastTangent = Cartesian3.clone(lastTangent);
+
+        this._evaluateFunction = createEvaluateFunction(this);
+        this._lastTimeIndex = 0;
+    };
+
+    defineProperties(CatmullRomSpline.prototype, {
         /**
          * An array of times for the control points.
+         *
+         * @memberof CatmullRomSpline.prototype
+         *
          * @type {Array}
          * @readonly
          */
-        this.times = times;
+        times : {
+            get : function() {
+                return this._times;
+            }
+        },
 
         /**
          * An array of {@link Cartesian3} control points.
+         *
+         * @memberof CatmullRomSpline.prototype
+         *
          * @type {Array}
          * @readonly
          */
-        this.points = points;
+        points : {
+            get : function() {
+                return this._points;
+            }
+        },
 
         /**
          * The tangent at the first control point.
+         *
+         * @memberof CatmullRomSpline.prototype
+         *
          * @type {Cartesian3}
          * @readonly
          */
-        this.firstTangent = Cartesian3.clone(firstTangent);
+        firstTangent : {
+            get : function() {
+                return this._firstTangent;
+            }
+        },
 
         /**
          * The tangent at the last control point.
+         *
+         * @memberof CatmullRomSpline.prototype
+         *
          * @type {Cartesian3}
          * @readonly
          */
-        this.lastTangent = Cartesian3.clone(lastTangent);
-
-        this._evaluateFunction = createEvaluateFunction(this);
-        this._lastTimeIndex = 0;
-    };
+        lastTangent : {
+            get : function() {
+                return this._lastTangent;
+            }
+        }
+    });
 
     /**
      * @private