Added STK atmosphere improvements #5741
Conversation
|
@klingerj thanks for the pull request! I noticed that I am a bot who helps you make Cesium awesome! Thanks again. |
|
Looks awesome! Here's master, with the high-quality stars:
And here's this branch:
|
|
At quick glance the code is OK with me. @emackey do you want to review and merge? |
Source/Shaders/SkyAtmosphereVS.glsl
Outdated
| @@ -126,5 +127,6 @@ void main(void) | |||
| v_mieColor = frontColor * KmESun; | |||
| v_rayleighColor = frontColor * (InvWavelength * KrESun); | |||
| v_toCamera = czm_viewerPositionWC - positionV3; | |||
| v_radii = u_cameraAndRadiiAndDynamicAtmosphereColor.zy; | |||
There was a problem hiding this comment.
Why pass this in as a varying, when the FS also has access to the same uniform?
/cc @abwood
|
@emackey 'fraid I don't have a good answer as to why I did that...fixed it though. Thanks for pointing that out. |
Source/Shaders/SkyAtmosphereFS.glsl
Outdated
| @@ -73,5 +75,12 @@ void main (void) | |||
| l = min(l, czm_luminance(rgb)); | |||
| #endif | |||
|
|
|||
| gl_FragColor = vec4(rgb, min(smoothstep(0.0, 0.1, l), 1.0) * smoothstep(0.0, 1.0, czm_morphTime)); | |||
| // Alter alpha based on how close the viewer is to the ground (1.0 = on ground, 0.0 = at edge of atmosphere) | |||
| float atmosphereAlpha = clamp((u_cameraAndRadiiAndDynamicAtmosphereColor.y - length(czm_viewerPositionWC)) / (u_cameraAndRadiiAndDynamicAtmosphereColor.y - u_cameraAndRadiiAndDynamicAtmosphereColor.z), 0.0, 1.0); | |||
There was a problem hiding this comment.
length(czm_viewerPositionWC) can be replaced by u_cameraAndRadiiAndDynamicAtmosphereColor.x (camera height)
|
PR looks good to me too. Awesome work @klingerj! |
|
Thanks again @klingerj! |
Applies alpha to the atmosphere that causes the atmosphere (as viewed from the ground) to disappear as the sun goes down if the lighting flag is enabled. Also alters alpha based on viewer position relative to the ground.