mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update water rendering.

Browse Source
This commit is contained in:
Kalle Bladin
2016-06-08 22:38:43 -04:00
parent 2fc61dcf6d
commit ebdcfcfa44
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/globebrowsing/shaders/texturetilemapping.hglsl
View File

@@ -350,7 +350,7 @@ vec4 calculateWater(
const TextureTile waterTilesParent1[NUMLAYERS_WATERMASK],
const TextureTile waterTilesParent2[NUMLAYERS_WATERMASK]) {
vec4 color = currentColor;
vec4 waterColor = vec4(0,0,0,0);
// The shader compiler will remove unused code when variables are multiplied by
// a constant 0
@@ -394,11 +394,11 @@ vec4 calculateWater(
w2 * texture(waterTilesParent1[#{i}].textureSampler, samplePosParent1) +
w3 * texture(waterTilesParent2[#{i}].textureSampler, samplePosParent2);
color = blendOver(color, colorSample);
waterColor = blendOver(waterColor, colorSample);
}
#endfor
return color;
return blendOver(currentColor, waterColor);
}
#endif // TEXTURETILEMAPPING_HGLSL