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

Selectively disable glow flicker for small wins on low-end systems

Browse Source
This commit is contained in:
Joshua Barretto 2021-06-21 17:06:43 +01:00
parent 288f2c13d4
commit 8ab222bf80
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/include/light.glsl
View File

@ -173,7 +173,7 @@ float lights_at(vec3 wpos, vec3 wnorm, vec3 /*cam_to_frag*/view_dir, vec3 mu, ve
float light_distance = sqrt(distance_2); float light_distance = sqrt(distance_2);
vec3 light_dir = -difference / light_distance; // normalize(-difference); vec3 light_dir = -difference / light_distance; // normalize(-difference);
// light_dir = faceforward(light_dir, wnorm, light_dir); // light_dir = faceforward(light_dir, wnorm, light_dir);
bool is_direct = dot(-light_dir, wnorm) > 0.0; bool is_direct = dot(difference, wnorm) > 0.0;
// reflected_light += color * (distance_2 == 0.0 ? vec3(1.0) : light_reflection_factor(wnorm, cam_to_frag, light_dir, k_d, k_s, alpha)); // reflected_light += color * (distance_2 == 0.0 ? vec3(1.0) : light_reflection_factor(wnorm, cam_to_frag, light_dir, k_d, k_s, alpha));
vec3 direct_light_dir = is_direct ? light_dir : -light_dir; vec3 direct_light_dir = is_direct ? light_dir : -light_dir;
// vec3 direct_norm_dir = is_direct ? wnorm : -wnorm; // vec3 direct_norm_dir = is_direct ? wnorm : -wnorm;

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

@ -54,7 +54,11 @@ const vec3 GLOW_COLOR = vec3(0.89, 0.95, 0.52);
// Calculate glow from static light sources, + some noise for flickering. // Calculate glow from static light sources, + some noise for flickering.
// TODO: Optionally disable the flickering for performance? // TODO: Optionally disable the flickering for performance?
vec3 glow_light(vec3 pos) { vec3 glow_light(vec3 pos) {
return GLOW_COLOR * (1.0 + (noise_3d(vec3(pos.xy * 0.005, tick.x * 0.5)) - 0.5) * 1.0); #if (SHADOW_MODE <= SHADOW_MODE_NONE)
return GLOW_COLOR;
#else
return GLOW_COLOR * (1.0 + (noise_3d(vec3(pos.xy * 0.005, tick.x * 0.5)) - 0.5) * 1.0);
#endif
} }
//vec3 get_sun_dir(float time_of_day) { //vec3 get_sun_dir(float time_of_day) {
@ -420,7 +424,7 @@ vec3 get_sky_light(vec3 dir, float time_of_day, bool with_stars) {
// Add white dots for stars. Note these flicker and jump due to FXAA // Add white dots for stars. Note these flicker and jump due to FXAA
float star = 0.0; float star = 0.0;
if (with_stars) { if (with_stars) {
vec3 star_dir = normalize(sun_dir.xyz * dir.z + cross(sun_dir.xyz, vec3(0, 1, 0)) * dir.x + vec3(0, 1, 0) * dir.y); vec3 star_dir = sun_dir.xyz * dir.z + cross(sun_dir.xyz, vec3(0, 1, 0)) * dir.x + vec3(0, 1, 0) * dir.y;
star = is_star_at(star_dir); star = is_star_at(star_dir);
} }
@ -485,7 +489,13 @@ vec3 get_sky_color(vec3 dir, float time_of_day, vec3 origin, vec3 f_pos, float q
pow(max(-sun_dir.z, 0.0), 0.5) pow(max(-sun_dir.z, 0.0), 0.5)
); );
vec3 sun_halo = sun_halo_color * 25 * pow(max(dot(dir, -sun_dir), 0), 20.0); float sun_halo_power = 20.0;
#if (CLOUD_MODE == CLOUD_MODE_NONE)
sun_halo_power = 1000.0;
sun_halo_color *= 0.1;
#endif
vec3 sun_halo = sun_halo_color * 25 * pow(max(dot(dir, -sun_dir), 0), sun_halo_power);
vec3 sun_surf = vec3(0); vec3 sun_surf = vec3(0);
if (with_features) { if (with_features) {
float angle = 0.00035; float angle = 0.00035;
@ -498,7 +508,14 @@ vec3 get_sky_color(vec3 dir, float time_of_day, vec3 origin, vec3 f_pos, float q
const vec3 MOON_HALO_COLOR = vec3(0.015, 0.015, 0.05) * 250; const vec3 MOON_HALO_COLOR = vec3(0.015, 0.015, 0.05) * 250;
vec3 moon_halo_color = MOON_HALO_COLOR; vec3 moon_halo_color = MOON_HALO_COLOR;
vec3 moon_halo = moon_halo_color * pow(max(dot(dir, -moon_dir), 0), 100.0);
float moon_halo_power = 20.0;
#if (CLOUD_MODE == CLOUD_MODE_NONE)
moon_halo_power = 2500.0;
moon_halo_color *= 0.1;
#endif
vec3 moon_halo = moon_halo_color * pow(max(dot(dir, -moon_dir), 0), moon_halo_power);
vec3 moon_surf = vec3(0); vec3 moon_surf = vec3(0);
if (with_features) { if (with_features) {
float angle = 0.00035; float angle = 0.00035;