Merge remote-tracking branch 'origin/master' into scaleToGeodeticSurface

CesiumGS · Jan 2, 2013 · 3f0b8c5 · 3f0b8c5
2 parents 691869e + 715ab63
commit 3f0b8c5
Show file tree

Hide file tree

Showing 28 changed files with 1,662 additions and 1,214 deletions.
diff --git a/Apps/Sandcastle/gallery/Black Marble.html b/Apps/Sandcastle/gallery/Black Marble.html
@@ -86,7 +86,6 @@
     widget.placeAt(dom.byId('cesiumContainer'));
     widget.startup();
 
-    var scene = widget.scene;
     var centralBody = widget.centralBody;
 
     var imageryLayerCollection = centralBody.getImageryLayers();

diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html
@@ -182,15 +182,7 @@
         addAdditionalLayerOption(
                 'TMS Image',
                 new Cesium.TileMapServiceImageryProvider({
-                    url : '../images/cesium_maptiler/Cesium_Logo_Color',
-                    fileExtension: 'png',
-                    maximumLevel: 4,
-                    credit: 'AGI',
-                    extent: new Cesium.Extent(
-                            Cesium.Math.toRadians(-120.0),
-                            Cesium.Math.toRadians(20.0),
-                            Cesium.Math.toRadians(-60.0),
-                            Cesium.Math.toRadians(40.0))
+                    url : '../images/cesium_maptiler/Cesium_Logo_Color'
                 }),0.2);
         addAdditionalLayerOption(
                 'Single image',

diff --git a/Apps/Sandcastle/images/cesium_maptiler/Cesium_Logo_Color/googlemaps.html b/Apps/Sandcastle/images/cesium_maptiler/Cesium_Logo_Color/googlemaps.html