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 GEE terrain negative altitude handling #8109

Merged
merged 2 commits into from
Sep 3, 2019
Merged

Fix GEE terrain negative altitude handling #8109

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
dc9afaf
Fix GEE terrain negative altitude handling
mramato Aug 26, 2019
b317784
Update CHANGES
mramato Aug 26, 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
5 changes: 3 additions & 2 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Change Log

##### Additions :tada:
* Added optional `index` parameter to `PrimitiveCollection.add`. [#8041](https://github.com/AnalyticalGraphicsInc/cesium/pull/8041)
* Cesium now renders at native device resolution by default instead of CSS pixel resolution, to go back to the old behavior, `viewer.resolutionScale = 1.0 / window.devicePixelRatio`. [#8082](https://github.com/AnalyticalGraphicsInc/cesium/issues/8082)
* Cesium now renders at native device resolution by default instead of CSS pixel resolution, to go back to the old behavior, `viewer.resolutionScale = 1.0 / window.devicePixelRatio`. [#8082](https://github.com/AnalyticalGraphicsInc/cesium/issues/8082)
* Added `getByName` method to `DataSourceCollection` allowing to retreive `DataSource`s by their name property from the collection

##### Fixes :wrench:
Expand All @@ -14,7 +14,8 @@ Change Log
* Fixed post-processing selection filtering to work for bloom. [#7984](https://github.com/AnalyticalGraphicsInc/cesium/issues/7984)
* Disabled HDR by default to improve visual quality in most standard use cases. Set `viewer.scene.highDynamicRange = true` to re-enable. [#7966](https://github.com/AnalyticalGraphicsInc/cesium/issues/7966)
* Fixed a bug that causes hidden point primitives to still appear on some operating systems. [#8043](https://github.com/AnalyticalGraphicsInc/cesium/issues/8043)
* Fixed issue where KTX or CRN files would not be properly identified. [#7979](https://github.com/AnalyticalGraphicsInc/cesium/issues/7979)
* Fix negative altitude altitide handling in `GoogleEarthEnterpriseTerrainProvider`. [#8109](https://github.com/AnalyticalGraphicsInc/cesium/pull/8109)
* Fixed issue where KTX or CRN files would not be properly identified. [#7979](https://github.com/AnalyticalGraphicsInc/cesium/issues/7979)
* Fixed multiple globe materials making the globe darker. [#7726](https://github.com/AnalyticalGraphicsInc/cesium/issues/7726)

### 1.60 - 2019-08-01
Expand Down
12 changes: 7 additions & 5 deletions Source/Workers/createVerticesFromGoogleEarthEnterpriseBuffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,17 +237,19 @@ define([
scratchCartographic.longitude = longitude;
var latitude = originY + dv.getUint8(offset++) * stepY;
scratchCartographic.latitude = latitude;
// Height is stored in units of (1/EarthRadius) or (1/6371010.0)
var height = dv.getFloat32(offset, true) * 6371010.0;

var height = dv.getFloat32(offset, true);
offset += sizeOfFloat;

// In order to support old clients, negative altitude values are stored as
// height/-2^32. Old clients see the value as really close to 0 but new clients multiply
// by -2^32 to get the real negative altitude value.
if (height < negativeElevationThreshold) {
height *= negativeAltitudeExponentBias;
if (height !== 0 && height < negativeElevationThreshold) {
height *= -Math.pow(2, negativeAltitudeExponentBias);
}
height *= exaggeration;

// Height is stored in units of (1/EarthRadius) or (1/6371010.0)
height *= 6371010.0 * exaggeration;

scratchCartographic.height = height;

Expand Down