Eliminate Images folder.

Earth imagery is now in a new package Resources. Images used by Sandcastle examples are now in the Sandcastle folder. Images used by the Widgets are now self-contained in the Widgets package. Also clean up the build file a bit, and create Eclipse launches for all of the build.xml targets.
CesiumGS · Nov 7, 2012 · 00bcc4a · 00bcc4a
1 parent 53842a8
commit 00bcc4a
Show file tree

Hide file tree

Showing 61 changed files with 153 additions and 91 deletions.
diff --git a/Apps/CesiumViewer/boot.js b/Apps/CesiumViewer/boot.js
@@ -10,18 +10,15 @@ require({
     }, {
         name : 'Core',
         location : 'Source/Core'
-    }, {
-        name : 'Widgets',
-        location : 'Source/Widgets'
-    }, {
-        name : 'Workers',
-        location : 'Source/Workers'
     }, {
         name : 'DynamicScene',
         location : 'Source/DynamicScene'
     }, {
         name : 'Renderer',
         location : 'Source/Renderer'
+    }, {
+        name : 'Resources',
+        location : 'Source/Resources'
     }, {
         name : 'Scene',
         location : 'Source/Scene'
@@ -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/gallery/Animations.html b/Apps/Sandcastle/gallery/Animations.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Billboards.html b/Apps/Sandcastle/gallery/Billboards.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },
@@ -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) {

diff --git a/Apps/Sandcastle/gallery/Camera Reference Frames.html b/Apps/Sandcastle/gallery/Camera Reference Frames.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Camera.html b/Apps/Sandcastle/gallery/Camera.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Cesium Viewer Widget.html b/Apps/Sandcastle/gallery/Cesium Viewer Widget.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Cesium Widget.html b/Apps/Sandcastle/gallery/Cesium Widget.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Circles and Ellipses.html b/Apps/Sandcastle/gallery/Circles and Ellipses.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Custom Rendering.html b/Apps/Sandcastle/gallery/Custom Rendering.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Hello World.html b/Apps/Sandcastle/gallery/Hello World.html
@@ -76,11 +76,13 @@
 
     var cb = new Cesium.CentralBody(ellipsoid);
     cb.getImageryLayers().addImageryProvider(bing);
-    cb.nightImageSource = '../../../Images/land_ocean_ice_lights_2048.jpg';
-    cb.specularMapSource = '../../../Images/earthspec1k.jpg';
+
+    var resourcesUrl = '../../../Source/Resources/';
+    cb.nightImageSource = resourcesUrl + 'land_ocean_ice_lights_2048.jpg';
+    cb.specularMapSource = resourcesUrl + 'earthspec1k.jpg';
     if (scene.getContext().getMaximumTextureSize() > 2048) {
-        cb.cloudsMapSource = '../../../Images/earthcloudmaptrans.jpg';
-        cb.bumpMapSource = '../../../Images/earthbump1k.jpg';
+        cb.cloudsMapSource = resourcesUrl + 'earthcloudmaptrans.jpg';
+        cb.bumpMapSource = resourcesUrl + 'earthbump1k.jpg';
     }
     cb.showSkyAtmosphere = true;
     cb.showGroundAtmosphere = true;

diff --git a/Apps/Sandcastle/gallery/Imagery Layers.html b/Apps/Sandcastle/gallery/Imagery Layers.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },
@@ -61,15 +62,15 @@
 }
 
 .upArrow {
-	background-image: url("../../../Images/UpArrow.png");
+	background-image: url("../images/UpArrow.png");
 	background-repeat: no-repeat;
 	width: 16px;
 	height: 16px;
 	text-align: center;
 }
 
 .downArrow {
-	background-image: url("../../../Images/DownArrow.png");
+	background-image: url("../images/DownArrow.png");
 	background-repeat: no-repeat;
 	width: 16px;
 	height: 16px;
@@ -153,8 +154,12 @@
                     proxy: new Cesium.DefaultProxy('/proxy/'),
                     credit: 'Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under CC BY SA.'
                 }));
-        addBaseLayerOption('Single Image', new Cesium.SingleTileImageryProvider({url : '../../../Images/NE2_50M_SR_W_4096.jpg'}));
-
+        addBaseLayerOption(
+                'Single Image',
+                new Cesium.SingleTileImageryProvider({
+                    url : require.toUrl('Resources/NE2_50M_SR_W_4096.jpg')
+                }));
+
         // Create the additional layers
         addAdditionalLayerOption(
                 'United States GOES infrared',
@@ -183,7 +188,7 @@
         addAdditionalLayerOption(
                 'Single image',
                 new Cesium.SingleTileImageryProvider({
-                    url : '../../../Images/Cesium_Logo_overlay.png',
+                    url : '../images/Cesium_Logo_overlay.png',
                     extent : new Cesium.Extent(
                             Cesium.Math.toRadians(-115.0),
                             Cesium.Math.toRadians(38.0),

diff --git a/Apps/Sandcastle/gallery/Labels.html b/Apps/Sandcastle/gallery/Labels.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },

diff --git a/Apps/Sandcastle/gallery/Map Projections.html b/Apps/Sandcastle/gallery/Map Projections.html
@@ -18,6 +18,7 @@
             { name: 'Core', location: 'Source/Core' },
             { name: 'DynamicScene', location: 'Source/DynamicScene' },
             { name: 'Renderer', location: 'Source/Renderer' },
+            { name: 'Resources', location: 'Source/Resources' },
             { name: 'Scene', location: 'Source/Scene' },
             { name: 'Shaders', location: 'Source/Shaders' },
             { name: 'ThirdParty', location: 'Source/ThirdParty' },