From 4ad5257e40246c469a1a54120a5c8ab42c203917 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Mon, 19 Apr 2021 22:26:56 +0100 Subject: [PATCH] Rebalanced mist --- assets/voxygen/shaders/include/cloud/regular.glsl | 6 +++--- assets/voxygen/shaders/include/sky.glsl | 2 +- common/sys/src/phys.rs | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/voxygen/shaders/include/cloud/regular.glsl b/assets/voxygen/shaders/include/cloud/regular.glsl index 682841780f..ae2d50ce53 100644 --- a/assets/voxygen/shaders/include/cloud/regular.glsl +++ b/assets/voxygen/shaders/include/cloud/regular.glsl @@ -30,7 +30,7 @@ vec4 cloud_at(vec3 pos, float dist, out vec3 emission) { #endif mist_min_alt = view_distance.z * 1.5 * (1.0 + mist_min_alt * 0.5); const float MIST_FADE_HEIGHT = 500; - float mist = 0.00025 * pow(clamp(1.0 - (pos.z - mist_min_alt) / MIST_FADE_HEIGHT, 0.0, 1), 4.0) / (1.0 + pow(1.0 + dist / 20000.0, 2.0)); + float mist = 0.0005 * pow(clamp(1.0 - (pos.z - mist_min_alt) / MIST_FADE_HEIGHT, 0.0, 1), 4.0); float alt = alt_at(pos.xy - focus_off.xy); @@ -54,10 +54,10 @@ vec4 cloud_at(vec3 pos, float dist, out vec3 emission) { vec3 turb_offset = vec3(1, 1, 0) * time_of_day.x * turb_speed; mist *= 0.5 #if (CLOUD_MODE >= CLOUD_MODE_LOW) - + 4 * (noise_2d(wind_pos.xy / 20000) - 0.5) + + 1.0 * (noise_2d(wind_pos.xy / 5000) - 0.5) #endif #if (CLOUD_MODE >= CLOUD_MODE_MEDIUM) - + 1 * (noise_3d(wind_pos / 1000) - 0.5) + + 0.25 * (noise_3d(wind_pos / 1000) - 0.5) #endif ; diff --git a/assets/voxygen/shaders/include/sky.glsl b/assets/voxygen/shaders/include/sky.glsl index 8c56bb1fda..b3203e958c 100644 --- a/assets/voxygen/shaders/include/sky.glsl +++ b/assets/voxygen/shaders/include/sky.glsl @@ -85,7 +85,7 @@ float cloud_scale = view_distance.z / 150.0; float cloud_tendency_at(vec2 pos) { float nz = texture(t_noise, (pos + wind_offset) / 60000.0 / cloud_scale).x - 0.3; - nz = pow(clamp(nz, 0, 1), 4); + nz = pow(clamp(nz, 0, 1), 3); return nz; } diff --git a/common/sys/src/phys.rs b/common/sys/src/phys.rs index a719821dc5..f1910a8c15 100644 --- a/common/sys/src/phys.rs +++ b/common/sys/src/phys.rs @@ -1359,7 +1359,6 @@ fn box_voxel_collision<'a, T: BaseVol + ReadVol>( z_range.clone(), ) && vel.0.z < 0.25 && vel.0.z > -1.5 - //&& was_on_ground && block_snap { let snap_height = terrain