Skip to content
Browse files

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.
  • Loading branch information...
1 parent 53842a8 commit 00bcc4a02abecb9b0ae0b0771807703b4f9789a6 @shunter shunter committed
Showing with 153 additions and 91 deletions.
  1. +9 −6 Apps/CesiumViewer/boot.js
  2. 0 {Images → Apps/CesiumViewer}/favicon.ico
  3. +1 −1 Apps/CesiumViewer/index.html
  4. +1 −0 Apps/Sandcastle/gallery/Animations.html
  5. +8 −7 Apps/Sandcastle/gallery/Billboards.html
  6. +1 −0 Apps/Sandcastle/gallery/Camera Reference Frames.html
  7. +1 −0 Apps/Sandcastle/gallery/Camera.html
  8. +1 −0 Apps/Sandcastle/gallery/Cesium Viewer Widget.html
  9. +1 −0 Apps/Sandcastle/gallery/Cesium Widget.html
  10. +1 −0 Apps/Sandcastle/gallery/Circles and Ellipses.html
  11. +1 −0 Apps/Sandcastle/gallery/Custom Rendering.html
  12. +6 −4 Apps/Sandcastle/gallery/Hello World.html
  13. +10 −5 Apps/Sandcastle/gallery/Imagery Layers.html
  14. +1 −0 Apps/Sandcastle/gallery/Labels.html
  15. +1 −0 Apps/Sandcastle/gallery/Map Projections.html
  16. +20 −19 Apps/Sandcastle/gallery/Materials.html
  17. +7 −5 Apps/Sandcastle/gallery/Minimalist.html
  18. +2 −1 Apps/Sandcastle/gallery/Picking.html
  19. +1 −0 Apps/Sandcastle/gallery/Polygons.html
  20. +1 −0 Apps/Sandcastle/gallery/Polylines.html
  21. +1 −0 Apps/Sandcastle/gallery/Sensors.html
  22. +1 −0 Apps/Sandcastle/gallery/Simple CZML Demo.html
  23. +8 −5 Apps/Sandcastle/gallery/Two Canvases.html
  24. +1 −0 Apps/Sandcastle/gallery/Two Viewer Widgets.html
  25. +1 −0 Apps/Sandcastle/gallery/Volumes.html
  26. +6 −4 Apps/Sandcastle/gallery/jQuery UI Demo.html
  27. 0 {Images → Apps/Sandcastle/images}/Cesium_Logo_Color.jpg
  28. 0 {Images → Apps/Sandcastle/images}/Cesium_Logo_overlay.png
  29. 0 {Images → Apps/Sandcastle/images}/DownArrow.png
  30. 0 {Images → Apps/Sandcastle/images}/UpArrow.png
  31. 0 {Images → Apps/Sandcastle/images}/bumpmap.png
  32. 0 {Images → Apps/Sandcastle/images}/checkerboard.png
  33. 0 {Images → Apps/Sandcastle/images}/facility.gif
  34. 0 {Images → Apps/Sandcastle/images}/normalmap.png
  35. 0 {Images → Apps/Sandcastle/images}/whiteShapes.png
  36. +1 −0 Apps/Sandcastle/templates/bucket-dojo.html
  37. +1 −0 CHANGES.md
  38. BIN Images/Cesium_Logo_Medium.jpg
  39. BIN Images/Satellite.png
  40. 0 {Images → Source/Resources}/NE2_50M_SR_W_2048.jpg
  41. 0 {Images → Source/Resources}/NE2_50M_SR_W_4096.jpg
  42. +8 −0 Source/Resources/Resources.profile.js
  43. 0 {Images → Source/Resources}/earthbump1k.jpg
  44. 0 {Images → Source/Resources}/earthcloudmaptrans.jpg
  45. 0 {Images → Source/Resources}/earthspec1k.jpg
  46. 0 {Images → Source/Resources}/land_ocean_ice_lights_2048.jpg
  47. 0 {Images → Source/Resources}/land_ocean_ice_lights_512.jpg
  48. +6 −0 Source/Resources/package.json
  49. +2 −2 Source/Widgets/Dojo/CesiumViewerWidget.css
  50. +11 −7 Source/Widgets/Dojo/CesiumViewerWidget.js
  51. +1 −1 Source/Widgets/Dojo/CesiumWidget.html
  52. +7 −7 Source/Widgets/Dojo/CesiumWidget.js
  53. 0 { → Source/Widgets}/Images/Bing_Logo_51x19_White.png
  54. BIN Source/Widgets/Images/Cesium_Logo_overlay.png
  55. 0 Source/Widgets/{ → Images}/TimelineIcons.png
  56. +1 −1 Source/Widgets/Timeline.css
  57. +3 −15 build.xml
  58. BIN favicon.ico
  59. +1 −1 index.html
  60. +19 −0 launches/buildApps.launch
  61. 0 launches/{documentation.launch → generateDocumentation.launch}
View
15 Apps/CesiumViewer/boot.js
@@ -11,18 +11,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'
}, {
@@ -32,6 +29,12 @@ require({
name : 'ThirdParty',
location : 'Source/ThirdParty'
}, {
+ name : 'Widgets',
+ location : 'Source/Widgets'
+ }, {
+ name : 'Workers',
+ location : 'Source/Workers'
+ }, {
name : 'CesiumViewer',
location : 'Apps/CesiumViewer'
}]
View
0 Images/favicon.ico → Apps/CesiumViewer/favicon.ico
File renamed without changes.
View
2 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>
View
1 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' },
View
15 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) {
View
1 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' },
View
1 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' },
View
1 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' },
View
1 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' },
View
1 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' },
View
1 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' },
View
10 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;
View
15 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,7 +62,7 @@
}
.upArrow {
- background-image: url("../../../Images/UpArrow.png");
+ background-image: url("../images/UpArrow.png");
background-repeat: no-repeat;
width: 16px;
height: 16px;
@@ -69,7 +70,7 @@
}
.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),
View
1 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' },
View
1 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' },
View
39 Apps/Sandcastle/gallery/Materials.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' },
@@ -83,7 +84,7 @@
alphaMaterial : {
type : 'AlphaMap',
uniforms : {
- image : '../../../Images/Cesium_Logo_Color.jpg',
+ image : '../images/Cesium_Logo_Color.jpg',
channel : 'r'
}
}
@@ -120,13 +121,13 @@
diffuseMaterial : {
type : 'DiffuseMap',
uniforms : {
- image : '../../../Images/bumpmap.png'
+ image : '../images/bumpmap.png'
}
},
bumpMaterial : {
type : 'BumpMap',
uniforms : {
- image : '../../../Images/bumpmap.png',
+ image : '../images/bumpmap.png',
strength : 0.8
}
}
@@ -194,14 +195,14 @@
context: scene.getContext(),
fabric: {
uniforms : {
- image: '../../../Images/earthspec1k.jpg',
- heightField : '../../../Images/earthbump1k.jpg'
+ image: require.toUrl('Resources/earthspec1k.jpg'),
+ heightField : require.toUrl('Resources/earthbump1k.jpg')
},
materials: {
bumpMap: {
type : 'BumpMap',
uniforms : {
- image : '../../../Images/earthbump1k.jpg'
+ image : require.toUrl('Resources/earthbump1k.jpg')
}
}
},
@@ -231,7 +232,7 @@
fabric : {
type : 'DiffuseMap',
uniforms : {
- image : '../../../Images/Cesium_Logo_Color.jpg'
+ image : '../images/Cesium_Logo_Color.jpg'
}
}
});
@@ -246,13 +247,13 @@
diffuseMaterial : {
type : 'DiffuseMap',
uniforms : {
- image : '../../../Images/Cesium_Logo_Color.jpg'
+ image : '../images/Cesium_Logo_Color.jpg'
}
},
emissionMaterial : {
type : 'EmissionMap',
uniforms : {
- image : '../../../Images/checkerboard.png',
+ image : '../images/checkerboard.png',
repeat : {
x : 1,
y : 0.5
@@ -276,12 +277,12 @@
function applyFresnelMaterial(primitive, scene) {
Sandcastle.declare(applyFresnelMaterial); // For highlighting in Sandcastle.
- var imagePath = '../../../Images/checkerboard.png';
+ var imagePath = '../images/checkerboard.png';
primitive.material = new Cesium.Material({
context : scene.getContext(),
fabric : {
uniforms : {
- image : '../../../Images/earthspec1k.jpg'
+ image : require.toUrl('Resources/earthspec1k.jpg')
},
materials : {
fresnel : {
@@ -334,7 +335,7 @@
fabric : {
type : 'Image',
uniforms : {
- image : '../../../Images/Cesium_Logo_Color.jpg'
+ image : '../images/Cesium_Logo_Color.jpg'
}
}
});
@@ -349,13 +350,13 @@
diffuseMaterial : {
type : 'DiffuseMap',
uniforms : {
- image : '../../../Images/bumpmap.png'
+ image : '../images/bumpmap.png'
}
},
normalMap : {
type : 'NormalMap',
uniforms : {
- image : '../../../Images/normalmap.png',
+ image : '../images/normalmap.png',
strength : 0.6
}
}
@@ -371,12 +372,12 @@
function applyReflectionMaterial(primitive, scene) {
Sandcastle.declare(applyReflectionMaterial); // For highlighting in Sandcastle.
- var imagePath = '../../../Images/checkerboard.png';
+ var imagePath = '../images/checkerboard.png';
primitive.material = new Cesium.Material({
context : scene.getContext(),
fabric : {
uniforms : {
- image : '../../../Images/earthspec1k.jpg'
+ image : require.toUrl('Resources/earthspec1k.jpg')
},
materials : {
reflection: {
@@ -403,12 +404,12 @@
function applyRefractionMaterial(primitive, scene) {
Sandcastle.declare(applyRefractionMaterial); // For highlighting in Sandcastle.
- var imagePath = '../../../Images/checkerboard.png';
+ var imagePath = '../images/checkerboard.png';
primitive.material = new Cesium.Material({
context : scene.getContext(),
fabric : {
uniforms : {
- image : '../../../Images/earthspec1k.jpg'
+ image : require.toUrl('Resources/earthspec1k.jpg')
},
materials : {
refraction: {
@@ -441,7 +442,7 @@
fabric : {
type : 'SpecularMap',
uniforms : {
- image : '../../../Images/Cesium_Logo_Color.jpg',
+ image : '../images/Cesium_Logo_Color.jpg',
channel : 'r'
}
}
View
12 Apps/Sandcastle/gallery/Minimalist.html
@@ -52,14 +52,16 @@
var ellipsoid = Cesium.Ellipsoid.WGS84;
var scene = new Cesium.Scene(canvas);
var primitives = scene.getPrimitives();
- var imagery = new Cesium.SingleTileImageryProvider({
- url : '../../../Images/NE2_50M_SR_W_2048.jpg'
+
+ var resourcesUrl = '../../../Source/Resources/';
+ var imageryProvider = new Cesium.SingleTileImageryProvider({
+ url : resourcesUrl + 'NE2_50M_SR_W_2048.jpg'
});
var cb = new Cesium.CentralBody(ellipsoid);
- cb.getImageryLayers().addImageryProvider(imagery);
- cb.nightImageSource = '../../../Images/land_ocean_ice_lights_2048.jpg';
- cb.specularMapSource = '../../../Images/earthspec1k.jpg';
+ cb.getImageryLayers().addImageryProvider(imageryProvider);
+ cb.nightImageSource = resourcesUrl + 'land_ocean_ice_lights_2048.jpg';
+ cb.specularMapSource = resourcesUrl + 'earthspec1k.jpg';
cb.showSkyAtmosphere = true;
cb.showGroundAtmosphere = false;
primitives.setCentralBody(cb);
View
3 Apps/Sandcastle/gallery/Picking.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' },
@@ -88,7 +89,7 @@
});
primitives.add(billboards);
};
- image.src = '../../../Images/Cesium_Logo_overlay.png';
+ image.src = '../images/Cesium_Logo_overlay.png';
}
function cleanup() {
View
1 Apps/Sandcastle/gallery/Polygons.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' },
View
1 Apps/Sandcastle/gallery/Polylines.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' },
View
1 Apps/Sandcastle/gallery/Sensors.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' },
View
1 Apps/Sandcastle/gallery/Simple CZML Demo.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' },
View
13 Apps/Sandcastle/gallery/Two Canvases.html
@@ -82,14 +82,17 @@
function createScene(canvas) {
var scene = new Cesium.Scene(canvas);
var primitives = scene.getPrimitives();
- var imagery = new Cesium.SingleTileImageryProvider({
- url : '../../../Images/NE2_50M_SR_W_2048.jpg'
+
+ var resourcesUrl = '../../../Source/Resources/';
+ var imageryProvider = new Cesium.SingleTileImageryProvider({
+ url : resourcesUrl + 'NE2_50M_SR_W_2048.jpg'
});
var cb = new Cesium.CentralBody(ellipsoid);
- cb.getImageryLayers().addImageryProvider(imagery);
- cb.nightImageSource = '../../../Images/land_ocean_ice_lights_2048.jpg';
- cb.specularMapSource = '../../../Images/earthspec1k.jpg';
+ cb.getImageryLayers().addImageryProvider(imageryProvider);
+ cb.nightImageSource = resourcesUrl + 'land_ocean_ice_lights_2048.jpg';
+ cb.specularMapSource = resourcesUrl + 'earthspec1k.jpg';
+
cb.showSkyAtmosphere = (canvas === canvas3D);
cb.showGroundAtmosphere = false;
primitives.setCentralBody(cb);
View
1 Apps/Sandcastle/gallery/Two Viewer Widgets.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' },
View
1 Apps/Sandcastle/gallery/Volumes.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' },
View
10 Apps/Sandcastle/gallery/jQuery UI Demo.html
@@ -80,11 +80,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;
View
0 Images/Cesium_Logo_Color.jpg → Apps/Sandcastle/images/Cesium_Logo_Color.jpg
File renamed without changes
View
0 Images/Cesium_Logo_overlay.png → ...Sandcastle/images/Cesium_Logo_overlay.png
File renamed without changes
View
0 Images/DownArrow.png → Apps/Sandcastle/images/DownArrow.png
File renamed without changes
View
0 Images/UpArrow.png → Apps/Sandcastle/images/UpArrow.png
File renamed without changes
View
0 Images/bumpmap.png → Apps/Sandcastle/images/bumpmap.png
File renamed without changes
View
0 Images/checkerboard.png → Apps/Sandcastle/images/checkerboard.png
File renamed without changes
View
0 Images/facility.gif → Apps/Sandcastle/images/facility.gif
File renamed without changes
View
0 Images/normalmap.png → Apps/Sandcastle/images/normalmap.png
File renamed without changes
View
0 Images/whiteShapes.png → Apps/Sandcastle/images/whiteShapes.png
File renamed without changes
View
1 Apps/Sandcastle/templates/bucket-dojo.html
@@ -17,6 +17,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' },
View
1 CHANGES.md
@@ -9,6 +9,7 @@ Beta Releases
* Breaking changes:
* Widget render loop now started by default. Startup code changed, see Sandcastle examples.
* Changed Timeline.makeLabel() to take a julianDate instead of a JavaScript date parameter.
+ * Default Earth imagery has been moved to a new package `Resources`. Images used by `Sandcastle` examples have been moved to the Sandcastle folder, and images used by the Dojo widgets are now self-contained in the `Widgets` package.
### b10 - 11/02/2012
View
BIN Images/Cesium_Logo_Medium.jpg
Deleted file not rendered
View
BIN Images/Satellite.png
Deleted file not rendered
View
0 Images/NE2_50M_SR_W_2048.jpg → Source/Resources/NE2_50M_SR_W_2048.jpg
File renamed without changes
View
0 Images/NE2_50M_SR_W_4096.jpg → Source/Resources/NE2_50M_SR_W_4096.jpg
File renamed without changes
View
8 Source/Resources/Resources.profile.js
@@ -0,0 +1,8 @@
+var profile = {
+ resourceTags : {
+ amd : function(filename, mid) {
+ "use strict";
+ return (/\.js$/).test(filename);
+ }
+ }
+};
View
0 Images/earthbump1k.jpg → Source/Resources/earthbump1k.jpg
File renamed without changes
View
0 Images/earthcloudmaptrans.jpg → Source/Resources/earthcloudmaptrans.jpg
File renamed without changes
View
0 Images/earthspec1k.jpg → Source/Resources/earthspec1k.jpg
File renamed without changes
View
0 Images/land_ocean_ice_lights_2048.jpg → .../Resources/land_ocean_ice_lights_2048.jpg
File renamed without changes
View
0 Images/land_ocean_ice_lights_512.jpg → ...e/Resources/land_ocean_ice_lights_512.jpg
File renamed without changes
View
6 Source/Resources/package.json
@@ -0,0 +1,6 @@
+{
+ "name": "Resources",
+ "description": "Cesium Resources",
+ "version": "0.6.0",
+ "dojoBuild": "Resources.profile.js"
+}
View
4 Source/Widgets/Dojo/CesiumViewerWidget.css
@@ -45,7 +45,7 @@
}
.cw-bingIcon {
- background-image: url('../../../Images/Bing_Logo_51x19_White.png');
+ background-image: url('../Images/Bing_Logo_51x19_White.png');
background-repeat: no-repeat;
background-position:center;
width: 51px;
@@ -78,7 +78,7 @@
bottom: 68px;
left: 5px;
text-decoration: none;
- background-image: url(../../../Images/Cesium_Logo_overlay.png);
+ background-image: url(../Images/Cesium_Logo_overlay.png);
width: 118px;
height: 26px;
}
View
18 Source/Widgets/Dojo/CesiumViewerWidget.js
@@ -240,6 +240,10 @@ define([
this.ellipsoid = Ellipsoid.WGS84;
},
+ postCreate : function() {
+ this.cesiumLogo.style.backgroundImage = 'url(' + require.toUrl('../Images/Cesium_Logo_overlay.png') + ')';
+ },
+
/**
* This function will get a callback in the event of setup failure, likely indicating
* a problem with WebGL support or the availability of a GL context.
@@ -647,15 +651,15 @@ define([
var maxTextureSize = context.getMaximumTextureSize();
if (maxTextureSize < 4095) {
// Mobile, or low-end card
- this.dayImageUrl = this.dayImageUrl || require.toUrl('Images/NE2_50M_SR_W_2048.jpg');
- this.nightImageUrl = this.nightImageUrl || require.toUrl('Images/land_ocean_ice_lights_512.jpg');
+ this.dayImageUrl = this.dayImageUrl || require.toUrl('../../Resources/NE2_50M_SR_W_2048.jpg');
+ this.nightImageUrl = this.nightImageUrl || require.toUrl('../../Resources/land_ocean_ice_lights_512.jpg');
} else {
// Desktop
- this.dayImageUrl = this.dayImageUrl || require.toUrl('Images/NE2_50M_SR_W_4096.jpg');
- this.nightImageUrl = this.nightImageUrl || require.toUrl('Images/land_ocean_ice_lights_2048.jpg');
- this.specularMapUrl = this.specularMapUrl || require.toUrl('Images/earthspec1k.jpg');
- this.cloudsMapUrl = this.cloudsMapUrl || require.toUrl('Images/earthcloudmaptrans.jpg');
- this.bumpMapUrl = this.bumpMapUrl || require.toUrl('Images/earthbump1k.jpg');
+ this.dayImageUrl = this.dayImageUrl || require.toUrl('../../Resources/NE2_50M_SR_W_4096.jpg');
+ this.nightImageUrl = this.nightImageUrl || require.toUrl('../../Resources/land_ocean_ice_lights_2048.jpg');
+ this.specularMapUrl = this.specularMapUrl || require.toUrl('../../Resources/earthspec1k.jpg');
+ this.cloudsMapUrl = this.cloudsMapUrl || require.toUrl('../../Resources/earthcloudmaptrans.jpg');
+ this.bumpMapUrl = this.bumpMapUrl || require.toUrl('../../Resources/earthbump1k.jpg');
}
var centralBody = this.centralBody = new CentralBody(ellipsoid);
View
2 Source/Widgets/Dojo/CesiumWidget.html
@@ -1,4 +1,4 @@
<div data-dojo-attach-point="containerNode" style="width: 100%; height: 100%;">
- <a style="display: block; position: absolute; bottom: 4px; left: 0; text-decoration: none; background-image: url(../../../Images/Cesium_Logo_overlay.png); width: 118px; height: 26px;" data-dojo-attach-point="cesiumLogo" href="http://cesium.agi.com/" target="_blank"></a>
+ <a data-dojo-attach-point="cesiumLogo" style="display: block; position: absolute; bottom: 4px; left: 0; text-decoration: none; width: 118px; height: 26px;" href="http://cesium.agi.com/" target="_blank"></a>
<canvas data-dojo-attach-point="canvas" style="width: 100%; height: 100%;"></canvas>
</div>
View
14 Source/Widgets/Dojo/CesiumWidget.js
@@ -193,15 +193,15 @@ define([
var maxTextureSize = scene.getContext().getMaximumTextureSize();
if (maxTextureSize < 4095) {
// Mobile, or low-end card
- this.dayImageUrl = this.dayImageUrl || require.toUrl('Images/NE2_50M_SR_W_2048.jpg');
- this.nightImageUrl = this.nightImageUrl || require.toUrl('Images/land_ocean_ice_lights_512.jpg');
+ this.dayImageUrl = this.dayImageUrl || require.toUrl('../../Resources/NE2_50M_SR_W_2048.jpg');
+ this.nightImageUrl = this.nightImageUrl || require.toUrl('../../Resources/land_ocean_ice_lights_512.jpg');
} else {
// Desktop
- this.dayImageUrl = this.dayImageUrl || require.toUrl('Images/NE2_50M_SR_W_4096.jpg');
- this.nightImageUrl = this.nightImageUrl || require.toUrl('Images/land_ocean_ice_lights_2048.jpg');
- this.specularMapUrl = this.specularMapUrl || require.toUrl('Images/earthspec1k.jpg');
- this.cloudsMapUrl = this.cloudsMapUrl || require.toUrl('Images/earthcloudmaptrans.jpg');
- this.bumpMapUrl = this.bumpMapUrl || require.toUrl('Images/earthbump1k.jpg');
+ this.dayImageUrl = this.dayImageUrl || require.toUrl('../../Resources/NE2_50M_SR_W_4096.jpg');
+ this.nightImageUrl = this.nightImageUrl || require.toUrl('../../Resources/land_ocean_ice_lights_2048.jpg');
+ this.specularMapUrl = this.specularMapUrl || require.toUrl('../../Resources/earthspec1k.jpg');
+ this.cloudsMapUrl = this.cloudsMapUrl || require.toUrl('../../Resources/earthcloudmaptrans.jpg');
+ this.bumpMapUrl = this.bumpMapUrl || require.toUrl('../../Resources/earthbump1k.jpg');
}
var centralBody = this.centralBody = new CentralBody(ellipsoid);
View
0 Images/Bing_Logo_51x19_White.png → .../Widgets/Images/Bing_Logo_51x19_White.png
File renamed without changes
View
BIN Source/Widgets/Images/Cesium_Logo_overlay.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 Source/Widgets/TimelineIcons.png → Source/Widgets/Images/TimelineIcons.png
File renamed without changes
View
2 Source/Widgets/Timeline.css
@@ -107,7 +107,7 @@
position: absolute;
width: 16px;
height: 16px;
- background-image: url("TimelineIcons.png");
+ background-image: url("Images/TimelineIcons.png");
background-repeat: no-repeat;
z-index: 10;
}
View
18 build.xml
@@ -37,7 +37,7 @@
</antcall>
</target>
- <target name="release" description="A full release build that creates a shippable product, including documentation.">
+ <target name="release" description="A full release build that creates a shippable product, including building apps and generating documentation.">
<antcall target="combine">
<param name="build.minification" value="true" />
</antcall>
@@ -57,7 +57,6 @@
<include name="Build/**" />
<include name="Apps/**" />
<include name="Examples/**" />
- <include name="Images/**" />
<include name="Source/**" />
<include name="Specs/**" />
<include name="ThirdParty/**" />
@@ -89,7 +88,6 @@
<property name="examplesDirectory" location="Examples" />
<property name="galleryDirectory" location="Apps/Sandcastle/gallery" />
<property name="specsDirectory" location="Specs" />
- <property name="imagesDirectory" location="Images" />
<property name="toolsDirectory" location="Tools" />
<property name="tasksDirectory" location="${toolsDirectory}/buildTasks" />
<property name="thirdPartyDirectory" location="ThirdParty" />
@@ -208,10 +206,6 @@
<target name="combineJavaScript" depends="combineJavaScript.createUnminified,combineJavaScript.createMinified" />
- <target name="copyIndexHtml">
- <copy file="index.html" todir="${buildDirectory}" />
- </target>
-
<target name="generateDocumentation">
<extractShaderComments>
<glslfiles dir="${shadersDirectory}" includes="**/*.glsl" />
@@ -238,7 +232,7 @@
</copy>
</target>
- <target name="runServer">
+ <target name="runServer" description="Runs a local web server ">
<taskdef name="server" classname="com.agi.ServerTask">
<classpath>
<fileset dir="${webProxyDirectory}" includes="**/*.jar" />
@@ -255,7 +249,7 @@
<server proxyContextPath="/proxy" terrainTranscodingContextPath="/terrain" allowedHostList="localhost,*.arcgisonline.com,tile.openstreetmap.org,otile1.mqcdn.com,oatile1.mqcdn.com,tile.stamen.com,*.virtualearth.net,mesonet.agron.iastate.edu" port="8080" baseDir="${basedir}" />
</target>
- <target name="buildApps" depends="build">
+ <target name="buildApps" depends="build" description="Create built versions of all example applications.">
<antcall target="buildApp">
<param name="app.path" value="Apps/CesiumViewer" />
</antcall>
@@ -279,12 +273,6 @@
<fileset dir="${buildDirectory}/${app.path}" includes="**/*.uncompressed.js" />
</delete>
- <copy todir="${buildDirectory}/${app.path}">
- <fileset dir=".">
- <include name="Images/*" />
- </fileset>
- </copy>
-
<replace dir="${buildDirectory}/${app.path}" summary="true">
<include name="index.html" />
<include name="*.css" />
View
BIN favicon.ico
Binary file not shown.
View
2 index.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Cesium</title>
- <link rel="shortcut icon" href="/Images/favicon.ico" type="image/x-icon" />
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<style>
body { font-family: sans-serif; }
li { margin-top: 5px; }
View
19 launches/buildApps.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Cesium/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Cesium"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="buildApps,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Cesium/build.xml}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
View
0 launches/documentation.launch → launches/generateDocumentation.launch 100644 → 100755
File renamed without changes.

0 comments on commit 00bcc4a

Please sign in to comment.
Something went wrong with that request. Please try again.