Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved or patches various water shader issues

Browse Source
This commit is contained in:
Joshua Barretto 2020-11-17 20:59:22 +00:00
parent 5b8231e5b8
commit c9586265f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/voxygen/shaders/include/cloud/regular.glsl
View File

@ -26,7 +26,7 @@ vec4 cloud_at(vec3 pos, float dist, out vec3 emission) {
// Mist sits close to the ground in valleys (TODO: use base_alt to put it closer to water) // Mist sits close to the ground in valleys (TODO: use base_alt to put it closer to water)
float mist_min_alt = 0.5; float mist_min_alt = 0.5;
#if (CLOUD_MODE > CLOUD_MODE_LOW) #if (CLOUD_MODE > CLOUD_MODE_LOW)
mist_min_alt = (texture(t_noise, pos.xy * 0.00015).x - 0.5) * 2 + 0.5; mist_min_alt = (texture(t_noise, pos.xy * 0.00015).x - 0.5) * 1.25 + 0.5;
#endif #endif
mist_min_alt *= 250; mist_min_alt *= 250;
const float MIST_FADE_HEIGHT = 500; const float MIST_FADE_HEIGHT = 500;
@ -173,6 +173,9 @@ vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of
float ldist = cdist; float ldist = cdist;
// i is an emergency brake // i is an emergency brake
for (int i = 0; cdist > 4 /* && i < 250 */; i ++) { for (int i = 0; cdist > 4 /* && i < 250 */; i ++) {
ldist = cdist;
cdist = step_to_dist(trunc(dist_to_step(cdist - 0.25, quality)), quality);
vec3 emission; vec3 emission;
vec4 sample = cloud_at(origin + (dir + dir_diff / ldist) * ldist * splay, cdist, emission); vec4 sample = cloud_at(origin + (dir + dir_diff / ldist) * ldist * splay, cdist, emission);
@ -197,9 +200,6 @@ vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of
// Global illumination (uniform scatter from the sky) // Global illumination (uniform scatter from the sky)
sky_color * sun_access * scatter_factor * get_sun_brightness() + sky_color * sun_access * scatter_factor * get_sun_brightness() +
sky_color * moon_access * scatter_factor * get_moon_brightness(); sky_color * moon_access * scatter_factor * get_moon_brightness();
ldist = cdist;
cdist = step_to_dist(trunc(dist_to_step(cdist - 0.25, quality)), quality);
} }
return surf_color; return surf_color;