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

Made cheap water display velocity

Browse Source
This commit is contained in:
Joshua Barretto 2022-09-24 12:47:05 +01:00
parent ce7dda3e2f
commit b45586902a
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
assets/voxygen/shaders/fluid-frag/cheap.glsl
View File

@ -51,6 +51,29 @@ layout(location = 0) out vec4 tgt_color;
#include <light.glsl>
#include <lod.glsl>
vec4 water_col(vec4 posx, vec4 posy) {
posx = (posx + focus_off.x) * 0.1;
posy = (posy + focus_off.y) * 0.1;
return 0.5 + (vec4(
textureLod(sampler2D(t_noise, s_noise), vec2(posx.x, posy.x), 0).x,
textureLod(sampler2D(t_noise, s_noise), vec2(posx.y, posy.y), 0).x,
textureLod(sampler2D(t_noise, s_noise), vec2(posx.z, posy.z), 0).x,
textureLod(sampler2D(t_noise, s_noise), vec2(posx.w, posy.w), 0).x
) - 0.5) * 0.5;
}
float water_col_vel(vec2 pos){
vec4 cols = water_col(
pos.x - tick.x * floor(f_vel.x) - vec2(0.0, tick.x).xyxy,
pos.y - tick.x * floor(f_vel.y) - vec2(0.0, tick.x).xxyy
);
return mix(
mix(cols.x, cols.y, fract(f_vel.x + 1.0)),
mix(cols.z, cols.w, fract(f_vel.x + 1.0)),
fract(f_vel.y + 1.0)
);
}
void main() {
#ifdef EXPERIMENTAL_BAREMINIMUM
tgt_color = vec4(simple_lighting(f_pos.xyz, MU_SCATTER, 1.0), 0.5);
@ -87,6 +110,8 @@ void main() {
/*const */vec3 water_color = (1.0 - MU_WATER) * MU_SCATTER;//srgb_to_linear(vec3(0.2, 0.5, 1.0));
// /*const */vec3 water_color = srgb_to_linear(vec3(0.0, 0.25, 0.5));
water_color *= water_col_vel(f_pos.xy);
/* vec3 sun_dir = get_sun_dir(time_of_day.x);
vec3 moon_dir = get_moon_dir(time_of_day.x); */
#if (SHADOW_MODE == SHADOW_MODE_CHEAP || SHADOW_MODE == SHADOW_MODE_MAP || FLUID_MODE >= FLUID_MODE_MEDIUM)
@ -192,7 +217,7 @@ void main() {
// float reflected_light_point = /*length*/(diffuse_light_point.r) + f_light * point_shadow;
// reflected_light += k_d * (diffuse_light_point + f_light * point_shadow * shade_frac) + specular_light_point;
float passthrough = max(dot(f_norm, -cam_to_frag), 0) * 0.75;
float passthrough = max(dot(f_norm, -cam_to_frag), 0) * 0.25;
float min_refl = 0.0;
if (medium.x != MEDIUM_WATER) {
min_refl = min(emitted_light.r, min(emitted_light.g, emitted_light.b));

8
assets/voxygen/shaders/fluid-frag/shiny.glsl
View File

@ -107,7 +107,7 @@ vec4 wave_height(vec4 posx, vec4 posy) {
return w / ws * 20.0;
}
float wave_height2(vec2 pos){
float wave_height_vel(vec2 pos){
vec4 heights = wave_height(
pos.x - tick.x * floor(f_vel.x) - vec2(0.0, tick.x).xyxy,
pos.y - tick.x * floor(f_vel.y) - vec2(0.0, tick.x).xxyy
@ -165,9 +165,9 @@ void main() {
vec3 wave_pos = mod(f_pos + focus_off.xyz, vec3(3000.0)) - (f_pos.z + focus_off.z) * 0.2;
float wave_sample_dist = 0.1;
float wave00 = wave_height2(wave_pos.xy);
float wave10 = wave_height2(wave_pos.xy + vec2(wave_sample_dist, 0));
float wave01 = wave_height2(wave_pos.xy + vec2(0, wave_sample_dist));
float wave00 = wave_height_vel(wave_pos.xy);
float wave10 = wave_height_vel(wave_pos.xy + vec2(wave_sample_dist, 0));
float wave01 = wave_height_vel(wave_pos.xy + vec2(0, wave_sample_dist));
// Possibility of div by zero when slope = 0,
// however this only results in no water surface appearing