From 8116b21c2e51c836e77894e309ac273caf2917b3 Mon Sep 17 00:00:00 2001 From: Joshua Yanovski Date: Sat, 25 Apr 2020 23:54:43 +0200 Subject: [PATCH] I like this coloring. --- assets/voxygen/shaders/include/sky.glsl | 4 ++-- assets/voxygen/shaders/lod-terrain-vert.glsl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/voxygen/shaders/include/sky.glsl b/assets/voxygen/shaders/include/sky.glsl index 4f4d7371b6..4370dde3e5 100644 --- a/assets/voxygen/shaders/include/sky.glsl +++ b/assets/voxygen/shaders/include/sky.glsl @@ -7,7 +7,7 @@ const float PI = 3.141592; const vec3 SKY_DAY_TOP = vec3(0.1, 0.5, 0.9); const vec3 SKY_DAY_MID = vec3(0.02, 0.28, 0.8); const vec3 SKY_DAY_BOT = vec3(0.1, 0.2, 0.3); -const vec3 DAY_LIGHT = vec3(1.2, 1.0, 1.0) * 3.0; +const vec3 DAY_LIGHT = vec3(1.2, 1.0, 1.0) * 1.8; const vec3 SUN_HALO_DAY = vec3(0.35, 0.35, 0.0); const vec3 SKY_DUSK_TOP = vec3(0.06, 0.1, 0.20); @@ -420,7 +420,7 @@ vec3 illuminate(/*vec3 max_light, */vec3 emitted, vec3 reflected) { // vec3 c = pow(col_adjusted, vec3(s)) * T; // vec3 c = col_adjusted * T; // vec3 c = sqrt(col_adjusted) * T; - vec3 c = col_adjusted * col_adjusted * T; + vec3 c = /*col_adjusted * */col_adjusted * T; return c; // float sum_col = color.r + color.g + color.b; diff --git a/assets/voxygen/shaders/lod-terrain-vert.glsl b/assets/voxygen/shaders/lod-terrain-vert.glsl index 12306c777d..d4a7e32ba7 100644 --- a/assets/voxygen/shaders/lod-terrain-vert.glsl +++ b/assets/voxygen/shaders/lod-terrain-vert.glsl @@ -27,7 +27,7 @@ void main() { //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); - f_pos.z -= max(view_distance.x - distance(focus_pos.xy, f_pos.xy), 0.0); + f_pos.z -= max(view_distance.x - distance(focus_pos.xy, f_pos.xy), 0.0) * 65536; // f_light = 1.0;