Skip to content
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.

Sign up for GitHub

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

Fix 3D Tiles credits #7877

Merged
merged 2 commits into from
May 29, 2019
Merged

Fix 3D Tiles credits #7877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
088a20a
Fix credits
lilleyse May 29, 2019
c2cf844
Ordering
lilleyse May 29, 2019
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
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Change Log
==========

### 1.58 - 2019-06-03

##### Additions :tada:
Expand All @@ -13,6 +14,7 @@ Change Log
* Fixed an edge case where Cesium would provide ion access token credentials to non-ion servers if the actual asset entrypoint was being hosted by ion. [#7839](https://github.com/AnalyticalGraphicsInc/cesium/pull/7839)
* Fixed a bug that caused Cesium to request non-existent tiles for terrain tilesets lacking tile availability, i.e. a `layer.json` file.
* Fixed memory leak when removing entities that had a `HeightReference` of `CLAMP_TO_GROUND` or `RELATIVE_TO_GROUND`. This includes when removing a `DataSource`.
* Fixed 3D Tiles credits not being shown in the data attribution box. [#7877](https://github.com/AnalyticalGraphicsInc/cesium/pull/7877)

### 1.57 - 2019-05-01

Expand Down
10 changes: 5 additions & 5 deletions Source/Scene/Scene.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3198,9 +3198,12 @@ define([
}

function prePassesUpdate(scene) {
var frameState = scene._frameState;
frameState.creditDisplay.update();
frameState.creditDisplay.beginFrame();

scene._jobScheduler.resetBudgets();

var frameState = scene._frameState;
var primitives = scene.primitives;
primitives.prePassesUpdate(frameState);

Expand All @@ -3209,7 +3212,6 @@ define([
}

scene._pickPositionCacheDirty = true;
frameState.creditDisplay.update();
}

function postPassesUpdate(scene) {
Expand All @@ -3218,6 +3220,7 @@ define([
primitives.postPassesUpdate(frameState);

RequestScheduler.update();
frameState.creditDisplay.endFrame();
}

var scratchBackgroundColor = new Color();
Expand Down Expand Up @@ -3245,8 +3248,6 @@ define([
}
frameState.backgroundColor = backgroundColor;

frameState.creditDisplay.beginFrame();

scene.fog.update(frameState);

us.update(frameState);
Expand Down Expand Up @@ -3292,7 +3293,6 @@ define([
}
}

frameState.creditDisplay.endFrame();
context.endFrame();
}

Expand Down