From 6dac045d2fd54a3dd98e696300d4df7dc8b4d5b2 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Fri, 15 Oct 2021 18:43:10 +0100
Subject: [PATCH] Aurora light tint
---
.../voxygen/shaders/include/cloud/regular.glsl | 18 ++++++------------
assets/voxygen/shaders/include/sky.glsl | 9 +++++++--
voxygen/src/hud/mod.rs | 2 +-
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/assets/voxygen/shaders/include/cloud/regular.glsl b/assets/voxygen/shaders/include/cloud/regular.glsl
index ad73deaaa4..68e94ffce8 100644
--- a/assets/voxygen/shaders/include/cloud/regular.glsl
+++ b/assets/voxygen/shaders/include/cloud/regular.glsl
@@ -150,22 +150,15 @@ vec4 cloud_at(vec3 pos, float dist, out vec3 emission, out float not_underground
+ textureLod(sampler2D(t_noise, s_noise), wind_pos.xy * 0.0005 + nz * 0.5, 0).x * 0.3
- 0.5) * 2)
* max(0, 1.0 - abs(textureLod(sampler2D(t_noise, s_noise), wind_pos.xy * 0.00001, 0).x - 0.5) * 4)
- , 2);
+ , 2) * emission_strength;
float t = clamp((pos.z - emission_alt) / emission_height, 0, 1);
- float br = 0.5; // blue vs red
- #if (CLOUD_MODE > CLOUD_MODE_LOW)
- br += (magnetosphere_tint.r - 0.6) * 4;
- #else
- br = 1.0;
- #endif
- br = clamp(br, 0, 1);
t = pow(t - 0.5, 2) * sign(t - 0.5) + 0.5;
float top = pow(t, 2);
float bot = pow(max(0.8 - t, 0), 2) * 2;
const vec3 cyan = vec3(0, 0.5, 1);
const vec3 red = vec3(1, 0, 0);
const vec3 green = vec3(0, 8, 0);
- emission = 100 * emission_factor * nz * (cyan * top * max(0, 1 - br) + red * max(br, 0) + green * bot);
+ emission = 10 * emission_factor * nz * (cyan * top * max(0, 1 - emission_br) + red * max(emission_br, 0) + green * bot);
}
// We track vapor density and air density separately. Why? Because photons will ionize particles in air
@@ -247,8 +240,9 @@ vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of
float cloud_scatter_factor = density_integrals.x;
float global_scatter_factor = density_integrals.y;
- float cloud_darken = pow(1.0 / (1.0 + cloud_scatter_factor), (ldist - cdist) * 0.01);
- float global_darken = pow(1.0 / (1.0 + global_scatter_factor), (ldist - cdist) * 0.01);
+ float step = (ldist - cdist) * 0.01;
+ float cloud_darken = pow(1.0 / (1.0 + cloud_scatter_factor), step);
+ float global_darken = pow(1.0 / (1.0 + global_scatter_factor), step);
surf_color =
// Attenuate light passing through the clouds
@@ -257,7 +251,7 @@ vec3 get_cloud_color(vec3 surf_color, vec3 dir, vec3 origin, const float time_of
sun_color * sun_scatter * get_sun_brightness() * (sun_access * (1.0 - cloud_darken) /*+ sky_color * global_scatter_factor*/) +
moon_color * moon_scatter * get_moon_brightness() * (moon_access * (1.0 - cloud_darken) /*+ sky_color * global_scatter_factor*/) +
sky_light * (1.0 - global_darken) * not_underground +
- emission * density_integrals.y;
+ emission * density_integrals.y * step;
}
return surf_color;
diff --git a/assets/voxygen/shaders/include/sky.glsl b/assets/voxygen/shaders/include/sky.glsl
index 3201a98328..2714563de0 100644
--- a/assets/voxygen/shaders/include/sky.glsl
+++ b/assets/voxygen/shaders/include/sky.glsl
@@ -126,7 +126,12 @@ float magnetosphere = sin(time_of_day.x / (3600 * 24));
vec3 magnetosphere_tint = _magnetosphere_change / length(_magnetosphere_change);
#endif
#if (CLOUD_MODE > CLOUD_MODE_NONE)
- float emission_strength = clamp((magnetosphere - 0.8) / 0.1, 0, 1) * max(sun_dir.z, 0);
+ float emission_strength = clamp((magnetosphere - 0.3) * 1.3, 0, 1) * max(-moon_dir.z, 0);
+ #if (CLOUD_MODE > CLOUD_MODE_MEDIUM)
+ float emission_br = abs(pow(fract(time_of_day.x * 0.000005) * 2 - 1, 2));
+ #else
+ float emission_br = 0.5;
+ #endif
#endif
float get_sun_brightness(/*vec3 sun_dir*/) {
@@ -392,7 +397,7 @@ float get_sun_diffuse2(DirectionalLight sun_info, DirectionalLight moon_info, ve
vec3 emission = vec3(0);
#if (CLOUD_MODE > CLOUD_MODE_NONE)
if (emission_strength > 0.0) {
- emission = normalize(pow(magnetosphere_tint, vec3(3))) * emission_strength * magnetosphere * 0.1;
+ emission = mix(vec3(0, 0.5, 1), vec3(1, 0, 0), emission_br) * emission_strength * 0.025;
}
#endif
diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
index b80108275f..2281261fa5 100644
--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
@@ -4065,7 +4065,7 @@ pub fn get_sprite_desc(sprite: SpriteKind, localized_strings: &Localization) ->
SpriteKind::Loom => "hud.crafting.loom",
SpriteKind::SpinningWheel => "hud.crafting.spinning_wheel",
SpriteKind::TanningRack => "hud.crafting.tanning_rack",
- sprite => return Cow::Owned(format!("{:?}", sprite)),
+ sprite => return Some(Cow::Owned(format!("{:?}", sprite))),
};
Some(Cow::Borrowed(localized_strings.get(i18n_key)))
}