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

Faster clouds, better water

Browse Source
This commit is contained in:
Joshua Barretto 2019-11-18 08:00:17 +00:00
parent 5162256e45
commit 7375c2c207
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/voxygen/shaders/fluid-frag.glsl
View File

@ -35,22 +35,22 @@ float wave_height(vec3 pos) {
);
vec3 warp = (
texture(t_waves, fract(pos.yx * 0.1 + tick.x * 0.02)).xyz * 0.3 +
texture(t_waves, fract(pos.yx * 0.1 - tick.x * 0.02)).xyz * 0.3 +
texture(t_noise, fract(pos.yx * 0.1 + tick.x * 0.02)).xyz * 0.3 +
texture(t_noise, fract(pos.yx * 0.1 - tick.x * 0.02)).xyz * 0.3 +
vec3(0)
);
float height = (
(texture(t_waves, pos.xy * 0.03 + big_warp.xy + tick.x * 0.05).y - 0.5) * 1.0 +
(texture(t_waves, pos.yx * 0.03 + big_warp.yx - tick.x * 0.05).y - 0.5) * 1.0 +
(texture(t_noise, pos.xy * 0.03 + big_warp.xy + tick.x * 0.05).y - 0.5) * 1.0 +
(texture(t_noise, pos.yx * 0.03 + big_warp.yx - tick.x * 0.05).y - 0.5) * 1.0 +
(texture(t_waves, pos.xy * 0.1 + warp.xy + tick.x * 0.1).x - 0.5) * 0.5 +
(texture(t_waves, pos.yx * 0.1 + warp.yx - tick.x * 0.1).x - 0.5) * 0.5 +
(texture(t_waves, pos.yx * 0.3 + warp.xy * 0.5 + tick.x * 0.1).x - 0.5) * 0.2 +
(texture(t_waves, pos.yx * 0.3 + warp.yx * 0.5 - tick.x * 0.1).x - 0.5) * 0.2 +
(texture(t_noise, pos.yx * 0.3 + warp.xy * 0.5 + tick.x * 0.1).x - 0.5) * 0.2 +
(texture(t_noise, pos.yx * 0.3 + warp.yx * 0.5 - tick.x * 0.1).x - 0.5) * 0.2 +
0.0
);
return pow(abs(height), 0.5) * sign(height) * 1.5;
return pow(abs(height), 0.5) * sign(height) * 5.5;
}
void main() {
@ -113,7 +113,9 @@ void main() {
vec3 surf_color = illuminate(srgb_to_linear(f_col), light, diffuse_light, ambient_light);
float fog_level = fog(f_pos.xyz, focus_pos.xyz, medium.x);
vec3 fog_color = get_sky_color(normalize(f_pos - cam_pos.xyz), time_of_day.x, f_pos, true);
vec3 fog_color = vec3(0);
if (fog_level > 0.0)
fog_color = get_sky_color(normalize(f_pos - cam_pos.xyz), time_of_day.x, f_pos, true);
vec3 reflect_ray_dir = reflect(cam_to_frag, norm);
// Hack to prevent the reflection ray dipping below the horizon and creating weird blue spots in the water

29
assets/voxygen/shaders/include/sky.glsl
View File

@ -114,7 +114,7 @@ float is_star_at(vec3 dir) {
return 0.0;
}
const float CLOUD_AVG_HEIGHT = 1200.0;
const float CLOUD_AVG_HEIGHT = 900.0;
const float CLOUD_HEIGHT_MIN = CLOUD_AVG_HEIGHT - 100.0;
const float CLOUD_HEIGHT_MAX = CLOUD_AVG_HEIGHT + 100.0;
const float CLOUD_THRESHOLD = 0.3;
@ -125,7 +125,11 @@ float spow(float x, float e) {
return sign(x) * pow(abs(x), e);
}
vec4 cloud_at(vec3 pos) {
float vsum(vec3 v) {
return v.x + v.y + v.z;
}
vec2 cloud_at(vec3 pos) {
float tick_offs = 0.0
+ texture(t_noise, pos.xy * 0.0001).x
+ texture(t_noise, pos.xy * 0.000003).x * 10.0;
@ -140,13 +144,13 @@ vec4 cloud_at(vec3 pos) {
float density = max((value - CLOUD_THRESHOLD) - abs(pos.z - CLOUD_AVG_HEIGHT) / 800.0, 0.0) * CLOUD_DENSITY;
vec3 color = vec3(1.0) * (0.5 - min(pow(max(CLOUD_AVG_HEIGHT - pos.z, 0.0), 0.5), 1.0) / 1.0);
float shade = 0.5 - min(pow(max(CLOUD_AVG_HEIGHT - pos.z, 0.0), 0.5), 1.0) / 1.0;
return vec4(color, density / (1.0 + distance(pos, cam_pos.xyz) / 10000));
return vec2(shade, density / (1.0 + vsum(abs(pos - cam_pos.xyz)) / 10000));
}
vec4 get_cloud_color(vec3 dir, float time_of_day, float max_dist) {
const float INCR = 0.04;
const float INCR = 0.05;
float mind = (CLOUD_HEIGHT_MIN - cam_pos.z) / dir.z;
float maxd = (CLOUD_HEIGHT_MAX - cam_pos.z) / dir.z;
@ -154,20 +158,20 @@ vec4 get_cloud_color(vec3 dir, float time_of_day, float max_dist) {
float start = max(min(mind, maxd), 0.0);
float delta = abs(mind - maxd);
float incr = INCR;//min(INCR + start / 100000.0, INCR * 2.0);
float incr = min(INCR + start / 100000.0, INCR * 2.0);
float fuzz = texture(t_noise, dir.xy * 1000000.0).x * 0.75 * incr * delta;
float fuzz = texture(t_noise, dir.xy * 1000000.0).x * 1.75 * incr * delta;
if (delta <= 0.0) {
return vec4(0);
}
vec3 cloud_col = vec3(1);
float cloud_shade = 1.0;
float passthrough = 1.0;
for (float d = 0.0; d < 1.0; d += incr) {
float dist = start + d * delta + fuzz;
vec3 pos = cam_pos.xyz + dir * dist;
vec4 sample = cloud_at(pos);
vec2 sample = cloud_at(pos);
float factor;
if (dist < max_dist) {
factor = 1.0;
@ -175,15 +179,16 @@ vec4 get_cloud_color(vec3 dir, float time_of_day, float max_dist) {
factor = incr * (dist - max_dist) / delta;
}
passthrough *= (1.0 - sample.a * incr * factor);
cloud_col = mix(cloud_col, sample.rgb, passthrough * sample.a * incr * factor);
float integral = sample.y * incr * factor;
passthrough *= 1.0 - integral;
cloud_shade = mix(cloud_shade, sample.x, passthrough * integral);
if (factor < 1.0) {
break;
}
}
return vec4(cloud_col, 1.0 - passthrough / (1.0 + delta * 0.0003));
return vec4(vec3(cloud_shade), 1.0 - passthrough / (1.0 + delta * 0.0003));
}
vec3 get_sky_color(vec3 dir, float time_of_day, vec3 f_pos, bool with_stars) {

4
assets/voxygen/shaders/terrain-frag.glsl
View File

@ -40,7 +40,9 @@ void main() {
vec3 surf_color = illuminate(srgb_to_linear(f_col), light, diffuse_light, ambient_light);
float fog_level = fog(f_pos.xyz, focus_pos.xyz, medium.x);
vec3 fog_color = get_sky_color(normalize(f_pos - cam_pos.xyz), time_of_day.x, f_pos, true);
vec3 fog_color = vec3(0);
if (fog_level > 0.0)
fog_color = get_sky_color(normalize(f_pos - cam_pos.xyz), time_of_day.x, f_pos, true);
vec3 color = mix(surf_color, fog_color, fog_level);
tgt_color = vec4(color, 1.0);