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 clamping when switching terrain providers #6820

Merged
merged 3 commits into from
Jul 19, 2018
Merged

Fix clamping when switching terrain providers #6820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c82c93
make sure callback is called
Jul 19, 2018
2a24f6a
CHANGES.md
Jul 19, 2018
210f1a3
Merge branch 'master' into fix-height-callback
Jul 19, 2018
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Change Log
* Fixed an issue where glTF 2.0 models sometimes wouldn't be centered in the view after putting the camera on them. [#6784](https://github.com/AnalyticalGraphicsInc/cesium/issues/6784)
* Fixed a bug that caused eye dome lighting for point clouds to fail in Safari on macOS and Edge on Windows by removing the dependency on floating point color textures. [#6792](https://github.com/AnalyticalGraphicsInc/cesium/issues/6792)
* Fixed a bug that caused polylines on terrain to render incorrectly in 2D and Columbus View with a `WebMercatorProjection`. [#6809](https://github.com/AnalyticalGraphicsInc/cesium/issues/6809)
* Fixed bug where entities with a height reference weren't being updated correctly when the terrain provider was changed. [#6820](https://github.com/AnalyticalGraphicsInc/cesium/pull/6820)
* Fixed a bug that caused billboard positions to be set incorrectly when using a `CallbackProperty`. [#6815](https://github.com/AnalyticalGraphicsInc/cesium/pull/6815)

### 1.47 - 2018-07-02
Expand Down
3 changes: 1 addition & 2 deletions Source/Scene/QuadtreePrimitive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,8 @@ define([
var position = tile.data.pick(scratchRay, mode, projection, false, scratchPosition);
if (defined(position)) {
data.callback(position);
data.level = tile.level;
}

data.level = tile.level;
} else if (tile.level === data.level) {
var children = tile.children;
var childrenLength = children.length;
Expand Down