From c905819adc4a87b898e4bc80391a589c1a8c0c39 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 23 Aug 2020 14:30:24 +0100 Subject: [PATCH] Made below-ground LoD dark --- assets/voxygen/shaders/lod-terrain-frag.glsl | 3 ++- assets/voxygen/shaders/lod-terrain-vert.glsl | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/voxygen/shaders/lod-terrain-frag.glsl b/assets/voxygen/shaders/lod-terrain-frag.glsl index 8ae0f0ab2c..1625f902c4 100644 --- a/assets/voxygen/shaders/lod-terrain-frag.glsl +++ b/assets/voxygen/shaders/lod-terrain-frag.glsl @@ -25,6 +25,7 @@ in vec3 f_pos; in vec3 f_norm; +in float pull_down; // in vec2 v_pos_orig; // in vec4 f_shadow; // in vec4 f_square; @@ -106,7 +107,7 @@ void main() { // mat4 invfoo = foo * inverse(foo * all_mat); // vec3 old_coord = all_mat * vec4(f_pos.xyz, 1.0); // vec4 new_f_pos = invfoo * (old_coord);//vec4(f_pos, 1.0); - vec3 f_col = lod_col(f_pos.xy); + vec3 f_col = mix(lod_col(f_pos.xy), vec3(0), clamp(pull_down / 10, 0, 1)); // tgt_color = vec4(f_col, 1.0); // return; // vec3 f_col = srgb_to_linear(vec3(1.0)); diff --git a/assets/voxygen/shaders/lod-terrain-vert.glsl b/assets/voxygen/shaders/lod-terrain-vert.glsl index 6ef2dd7bdf..2e9d38da4d 100644 --- a/assets/voxygen/shaders/lod-terrain-vert.glsl +++ b/assets/voxygen/shaders/lod-terrain-vert.glsl @@ -29,6 +29,7 @@ uniform u_locals { out vec3 f_pos; out vec3 f_norm; +out float pull_down; // out vec2 v_pos_orig; // out vec4 f_square; // out vec4 f_shadow; @@ -48,7 +49,8 @@ void main() { // f_shadow = textureBicubic(t_horizon, pos_to_tex(f_pos.xy)); - f_pos.z -= 1.0 / pow(distance(focus_pos.xy, f_pos.xy) / (view_distance.x * 0.95), 20.0); + pull_down = 1.0 / pow(distance(focus_pos.xy, f_pos.xy) / (view_distance.x * 0.95), 20.0); + f_pos.z -= pull_down; // f_pos.z -= 100.0 * pow(1.0 + 0.01 / view_distance.x, -pow(distance(focus_pos.xy, f_pos.xy), 2.0)); // f_pos.z = mix(-f_pos.z, f_pos.z, view_distance.x <= distance(focus_pos.xy, f_pos.xy) + 32.0);