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

CesiumGS · Nov 9, 2012 · 312b0e7 · 312b0e7
2 parents 5d56c64 + 1b1c52a
commit 312b0e7
Show file tree

Hide file tree

Showing 79 changed files with 579 additions and 327 deletions.
diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js
@@ -26,7 +26,6 @@ define([
             enableDragDrop : true
         });
         widget.placeAt(dom.byId('cesiumContainer'));
-        widget.startWidget();
-        widget.startRenderLoop();
+        widget.startup();
     });
 });
diff --git a/Apps/CesiumViewer/CesiumViewer.profile.js b/Apps/CesiumViewer/CesiumViewer.profile.js
@@ -29,7 +29,6 @@ var profile = {
         'dojo-sync-loader' : 0,
         'dojo-xhr-factory' : 0,
         'dojo-test-sniff' : 0,
-        'dom-addeventlistener' : 1,
         'dojo-firebug' : 0
     },
 

diff --git a/Apps/CesiumViewer/boot.js b/Apps/CesiumViewer/boot.js
@@ -7,15 +7,12 @@ require({
     }, {
         name : 'dijit',
         location : 'ThirdParty/dojo-release-1.7.2-src/dijit'
+    }, {
+        name : 'Assets',
+        location : 'Source/Assets'
     }, {
         name : 'Core',
         location : 'Source/Core'
-    }, {
-        name : 'Widgets',
-        location : 'Source/Widgets'
-    }, {
-        name : 'Workers',
-        location : 'Source/Workers'
     }, {
         name : 'DynamicScene',
         location : 'Source/DynamicScene'
@@ -31,6 +28,12 @@ require({
     }, {
         name : 'ThirdParty',
         location : 'Source/ThirdParty'
+    }, {
+        name : 'Widgets',
+        location : 'Source/Widgets'
+    }, {
+        name : 'Workers',
+        location : 'Source/Workers'
     }, {
         name : 'CesiumViewer',
         location : 'Apps/CesiumViewer'

diff --git a/Images/favicon.ico → Apps/CesiumViewer/favicon.ico b/Images/favicon.ico → Apps/CesiumViewer/favicon.ico
diff --git a/Apps/CesiumViewer/index.html b/Apps/CesiumViewer/index.html
@@ -10,7 +10,7 @@
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
 
 <title>Cesium Viewer</title>
-<link rel="shortcut icon" href="../../Images/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
 <link rel="stylesheet" href="CesiumViewer.css" media="screen">
 
 <script data-dojo-config="async: 1, tlmSiblingOfDojo: 0" src="../../ThirdParty/dojo-release-1.7.2-src/dojo/dojo.js"></script>

diff --git a/Apps/Sandcastle/CesiumSandcastle.js b/Apps/Sandcastle/CesiumSandcastle.js
@@ -153,7 +153,7 @@ require({
             undef : true,
             unused : false,
             strict : true,
-            trailing : false,
+            trailing : true,
             asi : false,
             boss : false,
             debug : false,

diff --git a/Apps/Sandcastle/gallery/Animations.html b/Apps/Sandcastle/gallery/Animations.html
@@ -15,6 +15,7 @@
             { name: 'dojo', location: 'ThirdParty/dojo-release-1.7.2-src/dojo' },
             { name: 'dijit', location: 'ThirdParty/dojo-release-1.7.2-src/dijit' },
             { name: 'dojox', location: 'ThirdParty/dojo-release-1.7.2-src/dojox' },
+            { name: 'Assets', location: 'Source/Assets' },
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
@@ -176,12 +177,11 @@
 
     var widget = new CesiumWidget();
     widget.placeAt(dom.byId('cesiumContainer'));
-    widget.startWidget();
+    widget.startup();
     dom.byId('toolbar').innerHTML = '';
 
     createPrimitives(widget);
     createButtons(widget.scene);
-    widget.startRenderLoop();
 });
 </script>
 </body>

diff --git a/Apps/Sandcastle/gallery/Billboards.html b/Apps/Sandcastle/gallery/Billboards.html
@@ -15,6 +15,7 @@
             { name: 'dojo', location: 'ThirdParty/dojo-release-1.7.2-src/dojo' },
             { name: 'dijit', location: 'ThirdParty/dojo-release-1.7.2-src/dijit' },
             { name: 'dojox', location: 'ThirdParty/dojo-release-1.7.2-src/dojox' },
+            { name: 'Assets', location: 'Source/Assets' },
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
@@ -84,7 +85,7 @@
             });
             scene.getPrimitives().add(billboards);
         };
-        image.src = '../../../Images/Cesium_Logo_overlay.png';
+        image.src = '../images/Cesium_Logo_overlay.png';
     }
 
     function setBillboardPropertiesAtCreation(scene, ellipsoid) {
@@ -107,7 +108,7 @@
             });
             scene.getPrimitives().add(billboards);
         };
-        image.src = '../../../Images/Cesium_Logo_overlay.png';
+        image.src = '../images/Cesium_Logo_overlay.png';
     }
 
     function setBillboardProperties(scene, ellipsoid) {
@@ -130,14 +131,14 @@
 
             scene.getPrimitives().add(billboards);
         };
-        image.src = '../../../Images/Cesium_Logo_overlay.png';
+        image.src = '../images/Cesium_Logo_overlay.png';
     }
 
     function addMultipleBillboards(scene, ellipsoid) {
         Sandcastle.declare(addMultipleBillboards);  // For highlighting in Sandcastle.
         Cesium.when.all([
-                         Cesium.loadImage('../../../Images/Cesium_Logo_overlay.png'),
-                         Cesium.loadImage('../../../Images/facility.gif')
+                         Cesium.loadImage('../images/Cesium_Logo_overlay.png'),
+                         Cesium.loadImage('../images/facility.gif')
                         ])
                    .then(function(images) {
             // Once both images are downloaded, they are combined into one image,
@@ -306,7 +307,7 @@
             });
             scene.getPrimitives().add(billboards);
         };
-        image.src = '../../../Images/whiteShapes.png';
+        image.src = '../images/whiteShapes.png';
     }
 
     function addBillboardsInReferenceframe(scene, ellipsoid) {
@@ -326,7 +327,7 @@
             billboards.add({ imageIndex : 0, position : new Cesium.Cartesian3(0.0, 0.0, 1000000.0) }); // up
             scene.getPrimitives().add(billboards);
         };
-        image.src = '../../../Images/facility.gif';
+        image.src = '../images/facility.gif';
     }
 
     function createButtons(widget) {
@@ -338,7 +339,7 @@
             label: 'Add billboard',
             onClick: function() {
                 primitives.removeAll();
-                addBillboard(scene, ellipsoid); 
+                addBillboard(scene, ellipsoid);
                 Sandcastle.highlight(addBillboard);
             }
         }).placeAt('toolbar');
@@ -347,7 +348,7 @@
             label: 'Set billboard properties at creation',
             onClick: function() {
                 primitives.removeAll();
-                setBillboardPropertiesAtCreation(scene, ellipsoid); 
+                setBillboardPropertiesAtCreation(scene, ellipsoid);
                 Sandcastle.highlight(setBillboardPropertiesAtCreation);
             }
         }).placeAt('toolbar');
@@ -356,7 +357,7 @@
             label: 'Change billboard properties',
             onClick: function() {
                 primitives.removeAll();
-                setBillboardProperties(scene, ellipsoid); 
+                setBillboardProperties(scene, ellipsoid);
                 Sandcastle.highlight(setBillboardProperties);
             }
         }).placeAt('toolbar');
@@ -365,7 +366,7 @@
             label: 'Add multiple billboards',
             onClick: function() {
                 primitives.removeAll();
-                addMultipleBillboards(scene, ellipsoid); 
+                addMultipleBillboards(scene, ellipsoid);
                 Sandcastle.highlight(addMultipleBillboards);
             }
         }).placeAt('toolbar');
@@ -374,7 +375,7 @@
             label: 'Add point billboards',
             onClick: function() {
                 primitives.removeAll();
-                addPointBillboards(scene, ellipsoid); 
+                addPointBillboards(scene, ellipsoid);
                 Sandcastle.highlight(addPointBillboards);
             }
         }).placeAt('toolbar');
@@ -383,7 +384,7 @@
             label: 'Add marker billboards',
             onClick: function() {
                 primitives.removeAll();
-                addMarkerBillboards(scene, ellipsoid); 
+                addMarkerBillboards(scene, ellipsoid);
                 Sandcastle.highlight(addMarkerBillboards);
             }
         }).placeAt('toolbar');
@@ -392,20 +393,19 @@
             label: 'Add billboards in reference frame',
             onClick: function() {
                 primitives.removeAll();
-                addBillboardsInReferenceframe(scene, ellipsoid); 
+                addBillboardsInReferenceframe(scene, ellipsoid);
                 Sandcastle.highlight(addBillboardsInReferenceframe);
             }
-        }).placeAt('toolbar');        
+        }).placeAt('toolbar');
     }
 
     var widget = new CesiumWidget();
     widget.placeAt(dom.byId('cesiumContainer'));
-    widget.startWidget();
+    widget.startup();
     dom.byId('toolbar').innerHTML = '';
 
     createButtons(widget);
     addBillboard(widget.scene, widget.ellipsoid);
-    widget.startRenderLoop();
 });
 </script>
 </body>

diff --git a/Apps/Sandcastle/gallery/Camera Reference Frames.html b/Apps/Sandcastle/gallery/Camera Reference Frames.html
@@ -15,6 +15,7 @@
             { name: 'dojo', location: 'ThirdParty/dojo-release-1.7.2-src/dojo' },
             { name: 'dijit', location: 'ThirdParty/dojo-release-1.7.2-src/dijit' },
             { name: 'dojox', location: 'ThirdParty/dojo-release-1.7.2-src/dojox' },
+            { name: 'Assets', location: 'Source/Assets' },
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
@@ -97,7 +98,7 @@
         var xAxis = {
                 color : new Cesium.Color(1.0, 0.0, 0.0, 1.0),
                 positions : [
-                    Cesium.Cartesian3.ZERO, 
+                    Cesium.Cartesian3.ZERO,
                     new Cesium.Cartesian3(100000.0, 0.0, 0.0)
                 ]
         };
@@ -106,7 +107,7 @@
         var yAxis = {
                 color : new Cesium.Color(0.0, 1.0, 0.0, 1.0),
                 positions : [
-                    Cesium.Cartesian3.ZERO, 
+                    Cesium.Cartesian3.ZERO,
                     new Cesium.Cartesian3(0.0, 100000.0, 0.0)
                 ]
         };
@@ -115,22 +116,21 @@
         var zAxis = {
                 color : new Cesium.Color(0.0, 0.0, 1.0, 1.0),
                 positions : [
-                    Cesium.Cartesian3.ZERO, 
+                    Cesium.Cartesian3.ZERO,
                     new Cesium.Cartesian3(0.0, 0.0, 100000.0)
-                ]        
+                ]
         };
         polylines.add(zAxis);
 
-        primitives.add(polylines);        
+        primitives.add(polylines);
     }
 
     var widget = new CesiumWidget();
     widget.placeAt(dom.byId('cesiumContainer'));
-    widget.startWidget();
+    widget.startup();
     dom.byId('toolbar').innerHTML = '';
 
     eastNorthUp(widget.scene);
-    widget.startRenderLoop();
 });
 </script>
 </body>

diff --git a/Apps/Sandcastle/gallery/Camera.html b/Apps/Sandcastle/gallery/Camera.html
@@ -15,6 +15,7 @@
             { name: 'dojo', location: 'ThirdParty/dojo-release-1.7.2-src/dojo' },
             { name: 'dijit', location: 'ThirdParty/dojo-release-1.7.2-src/dijit' },
             { name: 'dojox', location: 'ThirdParty/dojo-release-1.7.2-src/dojox' },
+            { name: 'Assets', location: 'Source/Assets' },
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
@@ -77,7 +78,7 @@
             destination: Cesium.Ellipsoid.WGS84.cartographicToCartesian(
                 Cesium.Cartographic.fromDegrees(-117.16, 32.71, 15000.0)),
             duration: 3.0
-        });        
+        });
     }
 
     function flyToMyLocation(scene) {
@@ -87,7 +88,7 @@
                 destination: Cesium.Ellipsoid.WGS84.cartographicToCartesian(
                     Cesium.Cartographic.fromDegrees(position.coords.longitude, position.coords.latitude, 10000.0)),
                 duration: 3.0
-            });        
+            });
         }
 
         navigator.geolocation.getCurrentPosition(fly);
@@ -107,35 +108,35 @@
         var polylines = new Cesium.PolylineCollection();
         polylines.add({
             positions: Cesium.Ellipsoid.WGS84.cartographicArrayToCartesianArray([
-                new Cesium.Cartographic(west, south), 
-                new Cesium.Cartographic(west, north), 
-                new Cesium.Cartographic(east, north), 
-                new Cesium.Cartographic(east, south), 
+                new Cesium.Cartographic(west, south),
+                new Cesium.Cartographic(west, north),
+                new Cesium.Cartographic(east, north),
+                new Cesium.Cartographic(east, south),
                 new Cesium.Cartographic(west, south)])
         });
-        scene.getPrimitives().add(polylines);        
+        scene.getPrimitives().add(polylines);
     }
 
     function createButtons(scene) {
         new ToggleButton({
             label: "Fly to San Diego",
-            onClick: function() { 
+            onClick: function() {
                 flyToSanDiego(scene);
                 Sandcastle.highlight(flyToSanDiego);
             }
         }).placeAt('toolbar');
 
         new ToggleButton({
             label: "Fly to My Location",
-            onClick: function() { 
+            onClick: function() {
                 flyToMyLocation(scene);
                 Sandcastle.highlight(flyToMyLocation);
             }
         }).placeAt('toolbar');
 
         new ToggleButton({
             label: "View an Extent",
-            onClick: function() { 
+            onClick: function() {
                 viewAnExtent(scene);
                 Sandcastle.highlight(viewAnExtent);
             }
@@ -144,11 +145,10 @@
 
     var widget = new CesiumWidget();
     widget.placeAt(dom.byId('cesiumContainer'));
-    widget.startWidget();
+    widget.startup();
     dom.byId('toolbar').innerHTML = '';
 
     createButtons(widget.scene);
-    widget.startRenderLoop();
 });
 </script>
 </body>

diff --git a/Apps/Sandcastle/gallery/Cesium Viewer Widget.html b/Apps/Sandcastle/gallery/Cesium Viewer Widget.html
@@ -15,6 +15,7 @@
             { name: 'dojo', location: 'ThirdParty/dojo-release-1.7.2-src/dojo' },
             { name: 'dijit', location: 'ThirdParty/dojo-release-1.7.2-src/dijit' },
             { name: 'dojox', location: 'ThirdParty/dojo-release-1.7.2-src/dojox' },
+            { name: 'Assets', location: 'Source/Assets' },
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
@@ -84,10 +85,8 @@
         enableDragDrop : true
     });
     widget.placeAt(dom.byId('cesiumContainer'));
-    widget.startWidget();
+    widget.startup();
     dom.byId('toolbar').innerHTML = '';
-
-    widget.startRenderLoop();
 });
 </script>
 </body>