Skip to content

Commit

Permalink
Reorganize project. Move Cesium up one level, so now the root of the …
Browse files Browse the repository at this point in the history
…git repository is the root of the source tree, and the root of the Eclipse project.
  • Loading branch information
shunter committed Apr 25, 2012
1 parent 65ca856 commit c2105b7
Show file tree
Hide file tree
Showing 363 changed files with 121 additions and 104 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Cesium"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Cesium/build.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.metadata
Build
Build
Instrumented
14 changes: 7 additions & 7 deletions Cesium/.project → .project
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<triggers>auto,full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/build.launch</value>
<value>&lt;project&gt;/.externalToolBuilders/automaticBuild.launch</value>
</dictionary>
</arguments>
</buildCommand>
Expand All @@ -32,16 +32,16 @@
</natures>
<filteredResources>
<filter>
<id>1335302974732</id>
<id>1335364040877</id>
<name></name>
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-Instrumented</arguments>
<arguments>1.0-name-matches-false-false-Build</arguments>
</matcher>
</filter>
<filter>
<id>1335302974753</id>
<id>1335364040881</id>
<name></name>
<type>10</type>
<matcher>
Expand All @@ -50,12 +50,12 @@
</matcher>
</filter>
<filter>
<id>1335302974776</id>
<id>1335364040891</id>
<name></name>
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-Instrumented</arguments>
<arguments>1.0-name-matches-false-false-Tools</arguments>
</matcher>
</filter>
<filter>
Expand Down
14 changes: 7 additions & 7 deletions Cesium/.settings/.jsdtscope → .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary/StandardBrowser/html5"/>
<classpathentry kind="output" path=""/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="ThirdParty/" kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary/StandardBrowser/html5"/>
<classpathentry kind="output" path=""/>
</classpath>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
enabled=true
excluded=Source/ThirdParty/Tween.js\:Source/ThirdParty/Chain.js
options=eqeqeq\: true, nonew\: true, noarg\: true, newcap\: true, latedef\: true, forin\: true
projectSpecificOptions=true
eclipse.preferences.version=1
enabled=true
excluded=Source/ThirdParty/Tween.js\:Source/ThirdParty/Chain.js\:ThirdParty
options=eqeqeq\: true, nonew\: true, noarg\: true, newcap\: true, latedef\: true, forin\: true
projectSpecificOptions=true
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions Cesium/Cesium.build.js → Cesium.build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
//replace the version of UglifyJS that the r.js optimizer uses with a newer one with far better performance
//adapted from https://github.com/jrburke/r.js/blob/master/build/tests/override/override.js

var uglify = require('../Tools/uglify-js'),
requirejs = require('../Tools/r.js');
var uglify = require('./Tools/uglify-js'),
requirejs = require('./Tools/r.js');

//Register the replacement module. Note that for uglifyjs, r.js uses the
//"uglifyjs/index" module name for it. The list of replaceable modules
Expand All @@ -18,9 +18,9 @@ var optimize = process.argv[2];
//Do the build.
requirejs.optimize({
baseUrl : ".",
name: "../../ThirdParty/almond.js",
name: "../ThirdParty/almond.js",
include: "main",
out: "../../Build/Cesium.js",
out: "../Build/Cesium.js",
wrap: true,
optimize: optimize ? "uglify" : "none",
//Usually requirejs.optimize() runs in "silent mode"
Expand Down
1 change: 0 additions & 1 deletion Cesium/.gitignore

This file was deleted.

20 changes: 0 additions & 20 deletions Cesium/Specs/SpecRunner.html

This file was deleted.

17 changes: 0 additions & 17 deletions Cesium/index.html

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
20 changes: 10 additions & 10 deletions Cesium/Examples/Sandbox/index.html → Examples/Sandbox/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<title>Cesium Sandbox</title>

<!-- StyleSheets: Dojo, Dijit, User Defined-->
<link rel=StyleSheet href="../../../ThirdParty/dojo-release-1.6.1/dojo/resources/dojo.css" type="text/css">
<link rel=Stylesheet href="../../../ThirdParty/dojo-release-1.6.1/dijit/themes/claro/claro.css" type="text/css">
<link rel=Stylesheet href="../../../ThirdParty/dojo-release-1.6.1/dojox/layout/resources/ExpandoPane.css" type="text/css">
<link rel="stylesheet" href="../../../ThirdParty/dojo-release-1.6.1/dojox/widget/Dialog/Dialog.css" />
<link rel=StyleSheet href="../../ThirdParty/dojo-release-1.6.1/dojo/resources/dojo.css" type="text/css">
<link rel=Stylesheet href="../../ThirdParty/dojo-release-1.6.1/dijit/themes/claro/claro.css" type="text/css">
<link rel=Stylesheet href="../../ThirdParty/dojo-release-1.6.1/dojox/layout/resources/ExpandoPane.css" type="text/css">
<link rel="stylesheet" href="../../ThirdParty/dojo-release-1.6.1/dojox/widget/Dialog/Dialog.css" />
<link rel=StyleSheet href="all.css" type="text/css">

<!-- load Dojo and required modules-->
<script src="../../../ThirdParty/dojo-release-1.6.1/dojo/dojo.js" data-dojo-config="isDebug: true, parseOnLoad: true"></script>
<script src="../../ThirdParty/dojo-release-1.6.1/dojo/dojo.js" data-dojo-config="isDebug: true, parseOnLoad: true"></script>
<script type="text/javascript">
/*global dojo*/
dojo.require("dojo.parser");
Expand All @@ -37,13 +37,13 @@
</script>

<!-- load Ace editor -->
<script src="../../../ThirdParty/ace-0.2.0-1/build/src/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="../../../ThirdParty/ace-0.2.0-1/build/src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
<script src="../../ThirdParty/ace-0.2.0-1/build/src/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="../../ThirdParty/ace-0.2.0-1/build/src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>

<script src="../../../ThirdParty/js-beautify/beautify.js" type="text/javascript"></script>
<script src="../../ThirdParty/js-beautify/beautify.js" type="text/javascript"></script>

<!-- Required Cesium Files -->
<script type="text/javascript" src="../../../Build/Cesium.js"></script>
<script type="text/javascript" src="../../Build/Cesium.js"></script>

<!-- Sandbox Files -->
<script src="Sandbox.js" type="text/javascript" ></script>
Expand Down Expand Up @@ -103,7 +103,7 @@
<div id="userOverlays" class="overlays"></div>
<div id="textOverlays" class="overlays"></div>
<div id="toolbar">
<a href="../../../Documentation/index.html" id="docLink" target="_blank"><img id="documentation" src="./icons/documentation.png" alt="documentation"/></a>
<a href="../../Documentation/index.html" id="docLink" target="_blank"><img id="documentation" src="./icons/documentation.png" alt="documentation"/></a>
<img id="addOverlay" src="./icons/addOverlay.png" alt="Add or Edit Overlay"/>
<img id="removeOverlay" src="./icons/removeOverlay.png" alt="Remove Overlays"/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ require({ baseUrl : '../../Source' }, [

var cb = new CentralBody(scene.getCamera(), ellipsoid);
cb.dayTileProvider = bing;
cb.nightImageSource = "../../../Images/land_ocean_ice_lights_2048.jpg";
cb.specularMapSource = "../../../Images/earthspec1k.jpg";
cb.nightImageSource = "../../Images/land_ocean_ice_lights_2048.jpg";
cb.specularMapSource = "../../Images/earthspec1k.jpg";
if (scene.getContext().getMaximumTextureSize() > 2048) {
cb.cloudsMapSource = "../../../Images/earthcloudmaptrans.jpg";
cb.bumpMapSource = "../../../Images/earthbump1k.jpg";
cb.cloudsMapSource = "../../Images/earthcloudmaptrans.jpg";
cb.bumpMapSource = "../../Images/earthbump1k.jpg";
}
cb.showSkyAtmosphere = true;
cb.showGroundAtmosphere = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="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">
<script type="text/javascript" src="../../../ThirdParty/requirejs-1.0.7/require.js"></script>
<script type="text/javascript" src="../../ThirdParty/requirejs-1.0.7/require.js"></script>
</head>

<body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Skeleton</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1"> <!-- Use Chrome Frame in IE -->
<script type="text/javascript" src="../../../ThirdParty/requirejs-1.0.7/require.js"></script>
<script type="text/javascript" src="../../ThirdParty/requirejs-1.0.7/require.js"></script>
</head>

<body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ require({ baseUrl : '../../Source' }, [
var primitives = scene.getPrimitives();
var cb = new CentralBody(scene.getCamera(), ellipsoid);
cb.dayTileProvider = bing;
cb.nightImageSource = "../../../Images/land_ocean_ice_lights_2048.jpg";
cb.specularMapSource = "../../../Images/earthspec1k.jpg";
cb.bumpMapSource = "../../../Images/earthbump1k.jpg";
cb.nightImageSource = "../../Images/land_ocean_ice_lights_2048.jpg";
cb.specularMapSource = "../../Images/earthspec1k.jpg";
cb.bumpMapSource = "../../Images/earthbump1k.jpg";
primitives.setCentralBody(cb);

///////////////////////////////////////////////////////////////////////////
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c2105b7

Please sign in to comment.