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 water material alpha #8455

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Fix water material alpha #8455

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
62ce639
Apply water color alpha to the water material
lilleyse Dec 11, 2019
5516d45
Update CHANGES [skip ci]
lilleyse Dec 11, 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
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 @@ -7,6 +7,7 @@ Change Log
* Fixed Geocoder auto-complete suggestions when hosted inside Web Components. [#8425](https://github.com/AnalyticalGraphicsInc/cesium/pull/8425)
* Fixed terrain tile culling problems when under ellipsoid. [#8397](https://github.com/AnalyticalGraphicsInc/cesium/pull/8397)
* Fixed primitive culling when below the ellipsoid but above terrain. [#8398](https://github.com/AnalyticalGraphicsInc/cesium/pull/8398)
* Improved the translucency calculation for the Water material type. [#8455](https://github.com/AnalyticalGraphicsInc/cesium/pull/8455)

### 1.64.0 - 2019-12-02

Expand Down
2 changes: 1 addition & 1 deletion Source/Shaders/Materials/Water.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ czm_material czm_getMaterial(czm_materialInput materialInput)
float tsPerturbationRatio = clamp(dot(normalTangentSpace, vec3(0.0, 0.0, 1.0)), 0.0, 1.0);

// fade out water effect as specular map value decreases
material.alpha = specularMapValue;
material.alpha = mix(blendColor.a, baseWaterColor.a, specularMapValue) * specularMapValue;

// base color is a blend of the water and non-water color based on the value from the specular map
// may need a uniform blend factor to better control this
Expand Down