Merge pull request CesiumGS#1612 from AnalyticalGraphicsInc/renameExtent

Rename Extent to Rectangle
rspalko · Apr 10, 2014 · 66e6bbe · 66e6bbe
2 parents 1fe947b + de2148b
commit 66e6bbe
Show file tree

Hide file tree

Showing 116 changed files with 2,584 additions and 2,564 deletions.
diff --git a/Apps/Sandcastle/gallery/Animations.html b/Apps/Sandcastle/gallery/Animations.html
@@ -27,7 +27,7 @@
 require(['Cesium'], function(Cesium) {
     "use strict";
 
-    var extent;
+    var rectangle;
     var rectangularSensor;
 
     function addAlphaAnimation(primitive, scene) {
@@ -40,25 +40,25 @@
         scene.animations.addOffsetIncrement(primitive.material);
     }
 
-    function resetExtentPropeties(extent) {
-        extent.material.uniforms.time = 1.0;
-        extent.material.uniforms.color = new Cesium.Color(1.0, 0.0, 0.0, 0.5);
+    function resetRectanglePropeties(rectangle) {
+        rectangle.material.uniforms.time = 1.0;
+        rectangle.material.uniforms.color = new Cesium.Color(1.0, 0.0, 0.0, 0.5);
     }
 
     function createPrimitives(widget) {
         var ellipsoid = widget.centralBody.ellipsoid;
         var scene = widget.scene;
         var primitives = scene.primitives;
 
-        extent = new Cesium.ExtentPrimitive({
-            extent : new Cesium.Extent(
+        rectangle = new Cesium.RectanglePrimitive({
+            rectangle : new Cesium.Rectangle(
                         Cesium.Math.toRadians(-120.0),
                         Cesium.Math.toRadians(20.0),
                         Cesium.Math.toRadians(-80.0),
                         Cesium.Math.toRadians(50.0)),
             material : Cesium.Material.fromType('Color')
         });
-        primitives.add(extent);
+        primitives.add(rectangle);
 
         var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(
                 ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-45.0, 45.0)));
@@ -87,8 +87,8 @@
 
     Sandcastle.addToolbarButton('Alpha Animation', function() {
         scene.animations.removeAll();
-        resetExtentPropeties(extent);
-        addAlphaAnimation(extent, scene);
+        resetRectanglePropeties(rectangle);
+        addAlphaAnimation(rectangle, scene);
         Sandcastle.highlight(addAlphaAnimation);
     });
 

diff --git a/Apps/Sandcastle/gallery/CZML.html b/Apps/Sandcastle/gallery/CZML.html
@@ -141,8 +141,8 @@
         viewer.dataSources.add(czmlDataSource);
 
         // Zoom in a little closer...
-        var extent = new Cesium.Extent(-2.056, 0.587, -2.010, 0.633);
-        viewer.scene.camera.viewExtent(extent);
+        var rectangle = new Cesium.Rectangle(-2.056, 0.587, -2.010, 0.633);
+        viewer.scene.camera.viewRectangle(rectangle);
     }
 
     var viewer = new Cesium.Viewer('cesiumContainer');

diff --git a/Apps/Sandcastle/gallery/Camera.html b/Apps/Sandcastle/gallery/Camera.html
@@ -4,7 +4,7 @@
     <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="Fly to a specified location or view a geographic extent.">
+    <meta name="description" content="Fly to a specified location or view a geographic rectangle.">
     <meta name="cesium-sandcastle-labels" content="Showcases">
     <title>Cesium Demo</title>
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
@@ -54,17 +54,17 @@
         navigator.geolocation.getCurrentPosition(fly);
     }
 
-    function viewAnExtent(scene) {
-        Sandcastle.declare(viewAnExtent); // For highlighting in Sandcastle.
+    function viewAnRectangle(scene) {
+        Sandcastle.declare(viewAnRectangle); // For highlighting in Sandcastle.
         var west = Cesium.Math.toRadians(-77.0);
         var south = Cesium.Math.toRadians(38.0);
         var east = Cesium.Math.toRadians(-72.0);
         var north = Cesium.Math.toRadians(42.0);
 
-        var extent = new Cesium.Extent(west, south, east, north);
-        scene.camera.viewExtent(extent, ellipsoid);
+        var rectangle = new Cesium.Rectangle(west, south, east, north);
+        scene.camera.viewRectangle(rectangle, ellipsoid);
 
-        // Show the extent.  Not required; just for show.
+        // Show the rectangle.  Not required; just for show.
         var polylines = new Cesium.PolylineCollection();
         polylines.add({
             positions : ellipsoid.cartographicArrayToCartesianArray(
@@ -79,21 +79,21 @@
         scene.primitives.add(polylines);
     }
 
-    function flyToExtent(scene) {
-        Sandcastle.declare(flyToExtent); // For highlighting in Sandcastle.
+    function flyToRectangle(scene) {
+        Sandcastle.declare(flyToRectangle); // For highlighting in Sandcastle.
         var west = Cesium.Math.toRadians(-90.0);
         var south = Cesium.Math.toRadians(38.0);
         var east = Cesium.Math.toRadians(-87.0);
         var north = Cesium.Math.toRadians(40.0);
 
-        var extent = new Cesium.Extent(west, south, east, north);
+        var rectangle = new Cesium.Rectangle(west, south, east, north);
 
-        var flight = Cesium.CameraFlightPath.createAnimationExtent(scene, {
-            destination : extent
+        var flight = Cesium.CameraFlightPath.createAnimationRectangle(scene, {
+            destination : rectangle
         });
         scene.animations.add(flight);
 
-        // Show the extent.  Not required; just for show.
+        // Show the rectangle.  Not required; just for show.
         var polylines = new Cesium.PolylineCollection();
         polylines.add({
             positions : ellipsoid.cartographicArrayToCartesianArray(
@@ -200,16 +200,16 @@
         Sandcastle.highlight(flyToMyLocation);
     });
 
-    Sandcastle.addToolbarButton('Fly to Extent', function() {
+    Sandcastle.addToolbarButton('Fly to Rectangle', function() {
         reset(scene);
-        flyToExtent(scene);
-        Sandcastle.highlight(flyToExtent);
+        flyToRectangle(scene);
+        Sandcastle.highlight(flyToRectangle);
     });
 
-    Sandcastle.addToolbarButton('View an Extent', function() {
+    Sandcastle.addToolbarButton('View an Rectangle', function() {
         reset(scene);
-        viewAnExtent(scene);
-        Sandcastle.highlight(viewAnExtent);
+        viewAnRectangle(scene);
+        Sandcastle.highlight(viewAnRectangle);
     });
 
     Sandcastle.addToolbarButton('Set camera reference frame', function() {

diff --git a/Apps/Sandcastle/gallery/Cesium Inspector.html b/Apps/Sandcastle/gallery/Cesium Inspector.html
@@ -69,8 +69,8 @@
 
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
-            geometry : new Cesium.ExtentGeometry({
-                extent : Cesium.Extent.fromDegrees(-100.0, 30.0, -93.0, 37.0),
+            geometry : new Cesium.RectangleGeometry({
+                rectangle : Cesium.Rectangle.fromDegrees(-100.0, 30.0, -93.0, 37.0),
                 height: 100000,
                 vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT
             }),

diff --git a/Apps/Sandcastle/gallery/Ellipsoid Surface.html b/Apps/Sandcastle/gallery/Ellipsoid Surface.html
@@ -33,8 +33,8 @@
     // Stripe Material
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
-            geometry : new Cesium.ExtentGeometry({
-                extent : Cesium.Extent.fromDegrees(-120.0, 30.0, -110.0, 40.0),
+            geometry : new Cesium.RectangleGeometry({
+                rectangle : Cesium.Rectangle.fromDegrees(-120.0, 30.0, -110.0, 40.0),
                 vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT
             })
         }),
@@ -46,8 +46,8 @@
     // Dot Material
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
-            geometry : new Cesium.ExtentGeometry({
-                extent : Cesium.Extent.fromDegrees(-110.0, 30.0, -100.0, 40.0),
+            geometry : new Cesium.RectangleGeometry({
+                rectangle : Cesium.Rectangle.fromDegrees(-110.0, 30.0, -100.0, 40.0),
                 vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT
             })
         }),
@@ -59,8 +59,8 @@
     // Checkerboard Material
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
-            geometry : new Cesium.ExtentGeometry({
-                extent : Cesium.Extent.fromDegrees(-100.0, 30.0, -90.0, 40.0),
+            geometry : new Cesium.RectangleGeometry({
+                rectangle : Cesium.Rectangle.fromDegrees(-100.0, 30.0, -90.0, 40.0),
                 vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT
             })
         }),
@@ -72,8 +72,8 @@
     // Grid Material    
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
-            geometry : new Cesium.ExtentGeometry({
-                extent : Cesium.Extent.fromDegrees(-90.0, 30.0, -80.0, 40.0),
+            geometry : new Cesium.RectangleGeometry({
+                rectangle : Cesium.Rectangle.fromDegrees(-90.0, 30.0, -80.0, 40.0),
                 vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT
             })
         }),

diff --git a/Apps/Sandcastle/gallery/Geometry and Appearances.html b/Apps/Sandcastle/gallery/Geometry and Appearances.html
@@ -34,19 +34,19 @@
     var ellipsoid = viewer.centralBody.ellipsoid;
     var solidWhite = Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.WHITE);
 
-    // Combine instances for an extent, polygon, ellipse, and circle into a single primitive.
+    // Combine instances for an rectangle, polygon, ellipse, and circle into a single primitive.
 
-    var extent = Cesium.Extent.fromDegrees(-92.0, 20.0, -86.0, 27.0);
-    var extentInstance = new Cesium.GeometryInstance({
-        geometry : new Cesium.ExtentGeometry({
-            extent : extent,
+    var rectangle = Cesium.Rectangle.fromDegrees(-92.0, 20.0, -86.0, 27.0);
+    var rectangleInstance = new Cesium.GeometryInstance({
+        geometry : new Cesium.RectangleGeometry({
+            rectangle : rectangle,
             vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT,
             stRotation : Cesium.Math.toRadians(45)
         })
     });
-    var extentOutlineInstance = new Cesium.GeometryInstance({
-        geometry : new Cesium.ExtentOutlineGeometry({
-            extent : extent
+    var rectangleOutlineInstance = new Cesium.GeometryInstance({
+        geometry : new Cesium.RectangleOutlineGeometry({
+            rectangle : rectangle
         }),
         attributes : {
             color : solidWhite
@@ -123,13 +123,13 @@
     });
 
     primitives.add(new Cesium.Primitive({
-        geometryInstances : [extentInstance, polygonInstance, ellipseInstance, circleInstance],
+        geometryInstances : [rectangleInstance, polygonInstance, ellipseInstance, circleInstance],
         appearance : new Cesium.EllipsoidSurfaceAppearance({
             material : Cesium.Material.fromType('Stripe')
         })
     }));
     primitives.add(new Cesium.Primitive({
-        geometryInstances : [extentOutlineInstance, polygonOutlineInstance, ellipseOutlineInstance, circleOutlineInstance],
+        geometryInstances : [rectangleOutlineInstance, polygonOutlineInstance, ellipseOutlineInstance, circleOutlineInstance],
         appearance : new Cesium.PerInstanceColorAppearance({
             flat : true,
             translucent : false,
@@ -142,12 +142,12 @@
         })
     }));
 
-    // Create extruded extent
-    extent = Cesium.Extent.fromDegrees(-118.0, 38.0, -116.0, 40.0);
+    // Create extruded rectangle
+    rectangle = Cesium.Rectangle.fromDegrees(-118.0, 38.0, -116.0, 40.0);
     var extrudedHeight = 500000.0;
-    var extrudedExtent = new Cesium.GeometryInstance({
-        geometry : new Cesium.ExtentGeometry({
-            extent : extent,
+    var extrudedRectangle = new Cesium.GeometryInstance({
+        geometry : new Cesium.RectangleGeometry({
+            rectangle : rectangle,
             vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
             extrudedHeight : extrudedHeight
         }),
@@ -156,9 +156,9 @@
         }
     });
 
-    var extrudedOutlineExtent = new Cesium.GeometryInstance({
-        geometry : new Cesium.ExtentOutlineGeometry({
-            extent : extent,
+    var extrudedOutlineRectangle = new Cesium.GeometryInstance({
+        geometry : new Cesium.RectangleOutlineGeometry({
+            rectangle : rectangle,
             extrudedHeight : extrudedHeight
         }),
         attributes : {
@@ -266,14 +266,14 @@
     });
 
     primitives.add(new Cesium.Primitive({
-        geometryInstances : [extrudedPolygon, extrudedExtent, extrudedEllipse, cylinderInstance],
+        geometryInstances : [extrudedPolygon, extrudedRectangle, extrudedEllipse, cylinderInstance],
         appearance : new Cesium.PerInstanceColorAppearance({
             translucent : false,
             closed : true
         })
     }));
     primitives.add(new Cesium.Primitive({
-        geometryInstances : [extrudedOutlineExtent, extrudedOutlineEllipse, extrudedOutlinePolygon, cylinderOutlineInstance],
+        geometryInstances : [extrudedOutlineRectangle, extrudedOutlineEllipse, extrudedOutlinePolygon, cylinderOutlineInstance],
         appearance : new Cesium.PerInstanceColorAppearance({
             flat : true,
             translucent : false,
@@ -450,10 +450,10 @@
         })
     }));
 
-    extent = Cesium.Extent.fromDegrees(-92.0, 30.0, -85.0, 40.0);
-    extentInstance = new Cesium.GeometryInstance({
-        geometry : new Cesium.ExtentGeometry({
-            extent : extent,
+    rectangle = Cesium.Rectangle.fromDegrees(-92.0, 30.0, -85.0, 40.0);
+    rectangleInstance = new Cesium.GeometryInstance({
+        geometry : new Cesium.RectangleGeometry({
+            rectangle : rectangle,
             vertexFormat : Cesium.EllipsoidSurfaceAppearance.VERTEX_FORMAT
         })
     });
@@ -522,20 +522,20 @@
     });
 
     primitives.add(new Cesium.Primitive({
-        geometryInstances : [extentInstance, polygonInstance, ellipseInstance, circleInstance],
+        geometryInstances : [rectangleInstance, polygonInstance, ellipseInstance, circleInstance],
         appearance : new Cesium.EllipsoidSurfaceAppearance({
             material : Cesium.Material.fromType('Stripe')
         })
     }));
 
-    // Create extruded extent
-    extent = Cesium.Extent.fromDegrees(-110.0, 38.0, -107.0, 40.0);
+    // Create extruded rectangle
+    rectangle = Cesium.Rectangle.fromDegrees(-110.0, 38.0, -107.0, 40.0);
     height = 700000.0;
     extrudedHeight = 1000000.0;
     rotation = Cesium.Math.toRadians(45.0);
-    extrudedExtent = new Cesium.GeometryInstance({
-        geometry : new Cesium.ExtentGeometry({
-            extent : extent,
+    extrudedRectangle = new Cesium.GeometryInstance({
+        geometry : new Cesium.RectangleGeometry({
+            rectangle : rectangle,
             vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
             height : height,
             rotation : rotation,
@@ -610,7 +610,7 @@
     });
 
     primitives.add(new Cesium.Primitive({
-        geometryInstances : [extrudedPolygon, extrudedExtent, extrudedEllipse, cylinderInstance],
+        geometryInstances : [extrudedPolygon, extrudedRectangle, extrudedEllipse, cylinderInstance],
         appearance : new Cesium.PerInstanceColorAppearance({
             translucent : false,
             closed : true
@@ -624,7 +624,7 @@
 
     center = ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-65.0, 35.0));
     radius = 200000.0;
-    extent = Cesium.Extent.fromDegrees(-67.0, 27.0, -63.0, 32.0);
+    rectangle = Cesium.Rectangle.fromDegrees(-67.0, 27.0, -63.0, 32.0);
     for (i = 0; i < 5; ++i) {
         height = 200000.0 * i;
 
@@ -641,8 +641,8 @@
         }));
 
         instances.push(new Cesium.GeometryInstance({
-            geometry : new Cesium.ExtentGeometry({
-                extent : extent,
+            geometry : new Cesium.RectangleGeometry({
+                rectangle : rectangle,
                 height : height,
                 vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT
             }),

diff --git a/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html b/Apps/Sandcastle/gallery/Imagery Layers Manipulation.html
@@ -146,7 +146,7 @@
                 'Single image',
                 new Cesium.SingleTileImageryProvider({
                     url : '../images/Cesium_Logo_overlay.png',
-                    extent : new Cesium.Extent(
+                    rectangle : new Cesium.Rectangle(
                             Cesium.Math.toRadians(-115.0),
                             Cesium.Math.toRadians(38.0),
                             Cesium.Math.toRadians(-107),

diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html
@@ -42,7 +42,7 @@
     blackMarble.brightness = 2.0;
     layers.addImageryProvider(new Cesium.SingleTileImageryProvider({
         url : '../images/Cesium_Logo_overlay.png',
-        extent : new Cesium.Extent(
+        rectangle : new Cesium.Rectangle(
             Cesium.Math.toRadians(-75.0),
             Cesium.Math.toRadians(28.0),
             Cesium.Math.toRadians(-67.0),