Skip to content

Update to Cesium 1.14 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 52 additions & 51 deletions Cesium/Cesium.js

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Cesium/Widgets/InfoBox/InfoBox.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cesium/Widgets/InfoBox/InfoBoxDescription.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cesium/Widgets/widgets.css

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cesium/Workers/combineGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createBoxGeometry.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions Cesium/Workers/createBoxOutlineGeometry.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cesium/Workers/createCircleGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createCircleOutlineGeometry.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/createCorridorGeometry.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/createCorridorOutlineGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createCylinderGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createCylinderOutlineGeometry.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cesium/Workers/createEllipseGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createEllipseOutlineGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createEllipsoidGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createEllipsoidOutlineGeometry.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cesium/Workers/createGeometry.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cesium/Workers/createPolygonGeometry.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cesium/Workers/createPolygonOutlineGeometry.js

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Cesium/Workers/createPolylineGeometry.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cesium/Workers/createPolylineVolumeGeometry.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/createPolylineVolumeOutlineGeometry.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cesium/Workers/createRectangleGeometry.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/createRectangleOutlineGeometry.js

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions Cesium/Workers/createSimplePolylineGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createSphereGeometry.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cesium/Workers/createSphereOutlineGeometry.js

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions Cesium/Workers/createVerticesFromHeightmap.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cesium/Workers/createVerticesFromQuantizedTerrainMesh.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/createWallGeometry.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/createWallOutlineGeometry.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cesium/Workers/upsampleQuantizedTerrainMesh.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demos/helloearth/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<script>
var viewer = new Cesium.Viewer('cesiumContainer');
viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
url : '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});

// Comparable Google Earth API code:
Expand Down
2 changes: 1 addition & 1 deletion demos/milktruck/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
clock : new Cesium.Clock({ currentTime : currentTime })
});
viewer.scene.terrainProvider = new Cesium.CesiumTerrainProvider({
url: '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});
viewer.scene.globe.depthTestAgainstTerrain = true;
viewer.scene.screenSpaceCameraController.enableInputs = false;
Expand Down
34 changes: 28 additions & 6 deletions demos/milktruck/shadow.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Shadow.prototype.update = function(context, frameState, commandList) {
}

if (!Cesium.defined(this._rs)) {
this._rs = context.createRenderState({
this._rs = Cesium.RenderState.fromCache({
blending : Cesium.BlendingState.ALPHA_BLEND,
depthTest : {
enabled : true
Expand All @@ -78,12 +78,25 @@ Shadow.prototype.update = function(context, frameState, commandList) {
if (!Cesium.defined(this._va)) {
var size = 4 * 2 * 3 * Cesium.ComponentDatatype.getSizeInBytes(Cesium.ComponentDatatype.FLOAT);
var usage = Cesium.BufferUsage.DYNAMIC_DRAW;
var positionBuffer = this._positionBuffer = context.createVertexBuffer(size, usage);
var positionBuffer = this._positionBuffer = Cesium.Buffer.createVertexBuffer({
context: context,
sizeInBytes: size,
usage: usage
});

usage = Cesium.BufferUsage.STATIC_DRAW;
var textureCoordinateBuffer = context.createVertexBuffer(new Float32Array([0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0]), usage);
var textureCoordinateBuffer = Cesium.Buffer.createVertexBuffer({
context: context,
typedArray: new Float32Array([0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0]),
usage: usage
});

var indexBuffer = context.createIndexBuffer(new Uint16Array([0, 1, 2, 0, 2, 3]), Cesium.BufferUsage.STATIC_DRAW, Cesium.IndexDatatype.UNSIGNED_SHORT);
var indexBuffer = Cesium.Buffer.createIndexBuffer({
context: context,
typedArray: new Uint16Array([0, 1, 2, 0, 2, 3]),
usage: Cesium.BufferUsage.STATIC_DRAW,
indexDatatype: Cesium.IndexDatatype.UNSIGNED_SHORT
});

var attributes = [{
index : attributeLocations.positionHigh,
Expand All @@ -106,7 +119,11 @@ Shadow.prototype.update = function(context, frameState, commandList) {
componentDatatype : Cesium.ComponentDatatype.FLOAT
}];

this._va = context.createVertexArray(attributes, indexBuffer);
this._va = new Cesium.VertexArray({
context: context,
attributes: attributes,
indexBuffer: indexBuffer
});
}

if (!Cesium.defined(this._sp)) {
Expand All @@ -127,7 +144,12 @@ Shadow.prototype.update = function(context, frameState, commandList) {
' gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0 - smoothstep(0.3, 0.5, length(v_textureCoordinates - vec2(0.5))));\n' +
'}\n';

this._sp = context.createShaderProgram(vs, fs, attributeLocations);
this._sp = Cesium.ShaderProgram.fromCache({
context: context,
vertexShaderSource : vs,
fragmentShaderSource : fs,
attributeLocations: attributeLocations
});
}

if (!Cesium.defined(this._command)) {
Expand Down
2 changes: 1 addition & 1 deletion examples/frameAnimation.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
var globe = scene.globe;
globe.depthTestAgainstTerrain = true;
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url: '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});
viewer.terrainProvider = cesiumTerrainProviderMeshes;

Expand Down
2 changes: 1 addition & 1 deletion examples/globeEvent.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
var globe = scene.globe;
globe.depthTestAgainstTerrain = true;
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url: '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});
viewer.terrainProvider = cesiumTerrainProviderMeshes;

Expand Down
2 changes: 1 addition & 1 deletion examples/groundAlt.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
var globe = scene.globe;
globe.depthTestAgainstTerrain = true;
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url: '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});
viewer.terrainProvider = cesiumTerrainProviderMeshes;

Expand Down
2 changes: 1 addition & 1 deletion examples/pinEvent.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
var globe = scene.globe;
globe.depthTestAgainstTerrain = true;
var cesiumTerrainProviderMeshes = new Cesium.CesiumTerrainProvider({
url: '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});
viewer.terrainProvider = cesiumTerrainProviderMeshes;

Expand Down
2 changes: 1 addition & 1 deletion examples/terrain.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
function relevantSource() {
var ellipsoidTerrainProvider = viewer.terrainProvider;
var cesiumTerrainProvider = new Cesium.CesiumTerrainProvider({
url: '//cesiumjs.org/stk-terrain/tilesets/world/tiles'
url : '//assets.agi.com/stk-terrain/world'
});

function showTerrain() {
Expand Down