mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 12:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added night texture.

Browse Source
This commit is contained in:
Jonathas Costa
2016-06-07 10:49:26 -04:00
parent 388bb15461
commit f0b76267c4
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/base/shaders/atmosphere_fs.glsl
View File

@@ -68,11 +68,6 @@ uniform sampler2D transmittanceTexture;
uniform sampler2D irradianceTexture;
uniform sampler3D inscatterTexture;
// TODO: Remove from there!
// the transmittance sampler is in scatteringinclude.glsl
//layout(origin_upper_left) in vec4 gl_FragCoord;
in vec2 vs_st;
in vec2 vs_nightTex;
in vec4 vs_normal;
@@ -421,8 +416,8 @@ Fragment getFragment() {
//diffuse = HDR(vec4(groundColor, 1.0));
//diffuse = HDR(vec4(inscatterColor, 1.0));
//diffuse = HDR(vec4(sunColor + groundColor + inscatterColor, 1.0) + diffuse2 + clouds);
diffuse = HDR(vec4(sunColor + groundColor + inscatterColor, 1.0) *
//diffuse = HDR(vec4(sunColor + groundColor + inscatterColor, 1.0) + diffuse2);
diffuse = HDR((vec4(sunColor + groundColor + inscatterColor, 1.0) + diffuse2) *
calcShadow(shadowDataArray, vs_posWorld.xyz) );
}
// else