From cb5d97e751dc7dd8791f404771efe32b915a6597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gef=C3=BCllte=20Taubenbrust?= <72752000+GefullteTaubenbrust2@users.noreply.github.com> Date: Sat, 28 Dec 2024 10:47:57 +0100 Subject: [PATCH] Apply suggestions --- .../shaders/nodes_shader/opengl_vertex.glsl | 13 ++++++----- .../shaders/object_shader/opengl_vertex.glsl | 13 ++++++----- src/client/clouds.cpp | 22 +++++++++---------- src/network/clientpackethandler.cpp | 8 +++---- src/network/networkprotocol.cpp | 2 +- 5 files changed, 30 insertions(+), 28 deletions(-) diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl index 02a3741db..8eeee8796 100644 --- a/client/shaders/nodes_shader/opengl_vertex.glsl +++ b/client/shaders/nodes_shader/opengl_vertex.glsl @@ -270,16 +270,17 @@ void main(void) sunTint = vec3(1.0); nightFactor = 0.; - if (f_timeofday < 0.21) { + // The sun rises at 5:00 and sets at 19:00, which corresponds to 5/24=0.208 and 19/24 = 0.792. + if (f_timeofday < 0.208) { adj_shadow_strength = f_shadow_strength * 0.5 * - (1.0 - mtsmoothstep(0.18, 0.21, f_timeofday)); - } else if (f_timeofday >= 0.793) { + (1.0 - mtsmoothstep(0.178, 0.208, f_timeofday)); + } else if (f_timeofday >= 0.792) { adj_shadow_strength = f_shadow_strength * 0.5 * - mtsmoothstep(0.793, 0.823, f_timeofday); + mtsmoothstep(0.792, 0.822, f_timeofday); } else { adj_shadow_strength = f_shadow_strength * - mtsmoothstep(0.21, 0.24, f_timeofday) * - (1.0 - mtsmoothstep(0.763, 0.793, f_timeofday)); + mtsmoothstep(0.208, 0.238, f_timeofday) * + (1.0 - mtsmoothstep(0.762, 0.792, f_timeofday)); nightFactor = adj_shadow_strength / f_shadow_strength; #ifdef ENABLE_TINTED_SUNLIGHT sunTint = mix(vec3(1.0), getDirectLightScatteringAtGround(v_LightDirection), adj_shadow_strength / f_shadow_strength); diff --git a/client/shaders/object_shader/opengl_vertex.glsl b/client/shaders/object_shader/opengl_vertex.glsl index 5be797dbc..6dc1b8bda 100644 --- a/client/shaders/object_shader/opengl_vertex.glsl +++ b/client/shaders/object_shader/opengl_vertex.glsl @@ -173,17 +173,18 @@ void main(void) shadow_position.z -= z_bias; perspective_factor = pFactor; + // The sun rises at 5:00 and sets at 19:00, which corresponds to 5/24=0.208 and 19/24 = 0.792. sunTint = vec3(1.0); - if (f_timeofday < 0.21) { + if (f_timeofday < 0.208) { adj_shadow_strength = f_shadow_strength * 0.5 * - (1.0 - mtsmoothstep(0.18, 0.21, f_timeofday)); - } else if (f_timeofday >= 0.793) { + (1.0 - mtsmoothstep(0.178, 0.208, f_timeofday)); + } else if (f_timeofday >= 0.792) { adj_shadow_strength = f_shadow_strength * 0.5 * - mtsmoothstep(0.793, 0.823, f_timeofday); + mtsmoothstep(0.792, 0.822, f_timeofday); } else { adj_shadow_strength = f_shadow_strength * - mtsmoothstep(0.21, 0.24, f_timeofday) * - (1.0 - mtsmoothstep(0.763, 0.793, f_timeofday)); + mtsmoothstep(0.208, 0.238, f_timeofday) * + (1.0 - mtsmoothstep(0.762, 0.792, f_timeofday)); sunTint = mix(vec3(1.0), getDirectLightScatteringAtGround(v_LightDirection), adj_shadow_strength / f_shadow_strength); } } diff --git a/src/client/clouds.cpp b/src/client/clouds.cpp index 62fc2c270..44caf93fd 100644 --- a/src/client/clouds.cpp +++ b/src/client/clouds.cpp @@ -211,7 +211,7 @@ void Clouds::updateMesh() switch (i) { case 0: // top - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Normal.set(0, 1, 0); } v[0].Pos.set(-rx, ry,-rz); @@ -226,14 +226,14 @@ void Clouds::updateMesh() continue; } if (soft_clouds_enabled) { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Normal.set(0, 0, -1); } v[2].Color = c_bottom; v[3].Color = c_bottom; } else { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Color = c_side_1; vertex.Normal.set(0, 0, -1); } @@ -250,14 +250,14 @@ void Clouds::updateMesh() continue; } if (soft_clouds_enabled) { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Normal.set(1, 0, 0); } v[2].Color = c_bottom; v[3].Color = c_bottom; } else { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Color = c_side_2; vertex.Normal.set(1, 0, 0); } @@ -274,14 +274,14 @@ void Clouds::updateMesh() continue; } if (soft_clouds_enabled) { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Normal.set(0, 0, -1); } v[2].Color = c_bottom; v[3].Color = c_bottom; } else { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Color = c_side_1; vertex.Normal.set(0, 0, -1); } @@ -298,14 +298,14 @@ void Clouds::updateMesh() continue; } if (soft_clouds_enabled) { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Normal.set(-1, 0, 0); } v[2].Color = c_bottom; v[3].Color = c_bottom; } else { - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Color = c_side_2; vertex.Normal.set(-1, 0, 0); } @@ -316,7 +316,7 @@ void Clouds::updateMesh() v[3].Pos.set(-rx, 0, rz); break; case 5: // bottom - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Color = c_bottom; vertex.Normal.set(0, -1, 0); } @@ -327,7 +327,7 @@ void Clouds::updateMesh() break; } - for (video::S3DVertex& vertex : v) { + for (video::S3DVertex &vertex : v) { vertex.Pos += pos; vertices.push_back(vertex); } diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index e69718533..6423640f3 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -1813,13 +1813,13 @@ void Client::handleCommand_SetLighting(NetworkPacket *pkt) *pkt >> lighting.bloom_intensity >> lighting.bloom_strength_factor >> lighting.bloom_radius; - if (pkt->getRemainingBytes() >= 4) + } + if (pkt->getRemainingBytes() >= 72) { *pkt >> lighting.artificial_light_color; - if (pkt->getRemainingBytes() >= 68) *pkt >> lighting.volumetric_beta_r0; *pkt >> lighting.vignette.dark - >> lighting.vignette.bright - >> lighting.vignette.power; + >> lighting.vignette.bright + >> lighting.vignette.power; *pkt >> lighting.cdl.slope; *pkt >> lighting.cdl.offset; *pkt >> lighting.cdl.power; diff --git a/src/network/networkprotocol.cpp b/src/network/networkprotocol.cpp index 6b4cf791d..6884be504 100644 --- a/src/network/networkprotocol.cpp +++ b/src/network/networkprotocol.cpp @@ -58,10 +58,10 @@ Rename TOCLIENT_DEATHSCREEN to TOCLIENT_DEATHSCREEN_LEGACY Rename TOSERVER_RESPAWN to TOSERVER_RESPAWN_LEGACY Support float animation frame numbers in TOCLIENT_LOCAL_PLAYER_ANIMATIONS - Add beta_r0, vignette, specular intensity, foliage translucency and cdl parameters to Lighting packets [scheduled bump for 5.10.0] PROTOCOL VERSION 47 Add particle blend mode "clip" + Add artificial light color, beta_r0, vignette, specular intensity, foliage translucency and cdl parameters to Lighting packets [scheduled bump for 5.11.0] */