From d3cd41ca470b337d7234157ac783211ebd234557 Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Sun, 3 Nov 2024 22:41:22 +0800
Subject: [PATCH 1/8] Avoid iterating appear animation node when it's invisible

---
 src/items/item.cpp | 90 +++++++++++++++++++++++-----------------------
 src/items/item.hpp |  3 ++
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/items/item.cpp b/src/items/item.cpp
index 7514d5e79aa..ea4d4413292 100644
--- a/src/items/item.cpp
+++ b/src/items/item.cpp
@@ -223,7 +223,8 @@ Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal,
 {
     m_icon_node = NULL;
     m_was_available_previously = true;
-    m_animation_start_ticks = 0;
+    // Prevent appear animation at start
+    m_animation_start_ticks = -9999;
     m_distance_2        = 1.2f;
     initItem(type, xyz, normal);
     m_graphical_type    = getGrahpicalType();
@@ -251,6 +252,7 @@ Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal,
         // when already quite far.
         lodnode->autoComputeLevel(24); // The distance grows with the square root of the scaling factor
         m_node = lodnode;
+        m_appear_anime_node = irr_driver->getSceneManager()->addEmptySceneNode(m_node);
     }
     setType(type);
     handleNewMesh(getGrahpicalType());
@@ -273,7 +275,7 @@ Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal,
     {
         scene::ISceneNode* billboard =
             irr_driver->addBillboard(core::dimension2df(SPARK_SIZE, SPARK_SIZE),
-                                     "item_spark.png", m_node);
+                                     "item_spark.png", m_appear_anime_node);
 #ifdef DEBUG
         billboard->setName("spark");
 #endif
@@ -361,9 +363,11 @@ Item::~Item()
     if (m_node != NULL)
     {
         for (auto* node : m_spark_nodes)
-            m_node->removeChild(node);
+            m_appear_anime_node->removeChild(node);
         if (m_icon_node)
-            m_node->removeChild(m_icon_node);
+            m_appear_anime_node->removeChild(m_icon_node);
+        
+        m_node->removeChild(m_appear_anime_node);
 
         irr_driver->removeNode(m_node);
         m_node->drop();
@@ -380,7 +384,7 @@ Item::~Item()
 void Item::reset()
 {
     m_was_available_previously = true;
-    m_animation_start_ticks = 0;
+    m_animation_start_ticks = -9999;
     ItemState::reset();
 
     if (m_node != NULL)
@@ -417,7 +421,7 @@ void Item::handleNewMesh(ItemType type)
     if (!icon.empty())
     {
         m_icon_node = irr_driver->addBillboard(core::dimension2df(1.0f, 1.0f),
-                                        icon, m_node);
+                                        icon, m_appear_anime_node);
 
         m_icon_node->setPosition(core::vector3df(0.0f, 0.5f, 0.0f));
         m_icon_node->setVisible(false);
@@ -503,60 +507,54 @@ void Item::updateGraphics(float dt)
         m_node->setRotation(hpr.toIrrHPR());
     } // if item is available
 
-    for (size_t i = 0; i < SPARK_AMOUNT; i++)
+    bool is_in_appear_anime = time_since_return < 1.0f
+                             || (!isAvailable() && time_till_return < 1.0f);
+    m_appear_anime_node->setVisible(is_in_appear_anime);
+
+    if (is_in_appear_anime)
     {
-        if (time_since_return >= 1.0f)
+        for (size_t i = 0; i < SPARK_AMOUNT; i++)
         {
-            m_spark_nodes[i]->setVisible(false);
-            continue;
-        }
+            float t = time_since_return + 0.5f;
+            float t2 = time_since_return + 1.0f;
 
-        float t = time_since_return + 0.5f;
-        float t2 = time_since_return + 1.0f;
+            float node_angle = !rotating() ? 0.0f :
+                    fmodf((float)World::getWorld()->getTicksSinceStart() / 40.0f,
+                    M_PI * 2);
 
-        float node_angle = !rotating() ? 0.0f :
-                fmodf((float)World::getWorld()->getTicksSinceStart() / 40.0f,
-                M_PI * 2);
+            float x = sin(float(i) / float(SPARK_AMOUNT) * 2.0f * M_PI - node_angle)
+                        * t * SPARK_SPEED_H;
+            float y = 2.0f * t2 - t2 * t2 - 0.5f;
+            float z = cos(float(i) / float(SPARK_AMOUNT) * 2.0f * M_PI - node_angle)
+                        * t * SPARK_SPEED_H;
 
-        float x = sin(float(i) / float(SPARK_AMOUNT) * 2.0f * M_PI - node_angle)
-                    * t * SPARK_SPEED_H;
-        float y = 2.0f * t2 - t2 * t2 - 0.5f;
-        float z = cos(float(i) / float(SPARK_AMOUNT) * 2.0f * M_PI - node_angle)
-                    * t * SPARK_SPEED_H;
+            m_spark_nodes[i]->setPosition(core::vector3df(x, y, z));
 
-        m_spark_nodes[i]->setPosition(core::vector3df(x, y, z));
+            float factor = std::max(0.0f, 1.0f - t / 2.0f);
 
-        float factor = std::max(0.0f, 1.0f - t / 2.0f);
-
-        if (factor < 0.001f)
-        {
-            m_spark_nodes[i]->setVisible(false);
-        }
-        else
-        {
             m_spark_nodes[i]->setVisible(true);
 
             ((scene::IBillboardSceneNode*)m_spark_nodes[i])
                     ->setSize(core::dimension2df(factor * SPARK_SIZE,
-                                                 factor * SPARK_SIZE));
+                                                factor * SPARK_SIZE));
         }
-    }
 
-    if (m_icon_node)
-    {
-        if (!isAvailable() && time_till_return <= 1.0f)
-        {
-            m_icon_node->setVisible(true);
-            float size = 1.0f / (pow(6.0f, -time_till_return - 0.2f) *
-                        (-time_till_return - 0.2f)) + 7.0f;
-
-            ((scene::IBillboardSceneNode*)m_icon_node)
-                    ->setSize(core::dimension2df(size * ICON_SIZE,
-                                                 size * ICON_SIZE));
-        }
-        else
+        if (m_icon_node)
         {
-            m_icon_node->setVisible(false);
+            if (!isAvailable())
+            {
+                m_icon_node->setVisible(true);
+                float size = 1.0f / (pow(6.0f, -time_till_return - 0.2f) *
+                            (-time_till_return - 0.2f)) + 7.0f;
+
+                ((scene::IBillboardSceneNode*)m_icon_node)
+                        ->setSize(core::dimension2df(size * ICON_SIZE,
+                                                    size * ICON_SIZE));
+            }
+            else
+            {
+                m_icon_node->setVisible(false);
+            }
         }
     }
 
diff --git a/src/items/item.hpp b/src/items/item.hpp
index 4f218513b7b..6e319cf4fd4 100644
--- a/src/items/item.hpp
+++ b/src/items/item.hpp
@@ -330,6 +330,9 @@ class Item : public ItemState, public NoCopy
     /** Graphical type of the mesh. */
     ItemType m_graphical_type;
 
+    /** The parent of m_spark_nodes and m_icon_node */
+    scene::ISceneNode* m_appear_anime_node;
+
     /** Vector containing the sparks */
     std::vector<scene::ISceneNode*> m_spark_nodes;
 

From 9805f0cec1caa06391998e2df8da09ff8e61fd4f Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Thu, 7 Nov 2024 21:40:12 +0800
Subject: [PATCH 2/8] Support Ghost Replay Info

---
 data/gui/dialogs/ghost_replay_info_dialog.stkgui        | 1 +
 src/replay/replay_play.cpp                              | 9 +++++++++
 src/replay/replay_play.hpp                              | 1 +
 src/states_screens/dialogs/ghost_replay_info_dialog.cpp | 6 +++++-
 src/states_screens/dialogs/ghost_replay_info_dialog.hpp | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/data/gui/dialogs/ghost_replay_info_dialog.stkgui b/data/gui/dialogs/ghost_replay_info_dialog.stkgui
index 5836f779c1c..f6f71c1ccd9 100644
--- a/data/gui/dialogs/ghost_replay_info_dialog.stkgui
+++ b/data/gui/dialogs/ghost_replay_info_dialog.stkgui
@@ -34,6 +34,7 @@
                         <spacer width="1%"/>
                         <label proportion="1" id="compare-ghost-text" height="100%" text_align="left" I18N="Ghost replay info action" text="Compare to another ghost"/>
                     </div>
+                    <bubble id="info" width="100%" proportion="1" word_wrap="true"/>
                 </div>
 
                 <div width="95%" height="40%" align="center">
diff --git a/src/replay/replay_play.cpp b/src/replay/replay_play.cpp
index adb95709695..9dbda4256e0 100644
--- a/src/replay/replay_play.cpp
+++ b/src/replay/replay_play.cpp
@@ -284,6 +284,15 @@ bool ReplayPlay::addReplayFile(const std::string& fn, bool custom_replay, int ca
     rd.m_track = t;
 
     fgets(s, 1023, fd);
+    if (sscanf(s, "info: %1023s", s1) == 1)
+    {
+        int last = strlen(s);
+        if (s[last - 1] == '\n')
+            s[last - 1] = '\0';
+         
+        rd.m_info = s + 6;
+        fgets(s, 1023, fd);
+    }
     if (sscanf(s, "laps: %u", &rd.m_laps) != 1)
     {
         Log::warn("Replay", "No number of laps found in replay file, '%s'.", fn.c_str());
diff --git a/src/replay/replay_play.hpp b/src/replay/replay_play.hpp
index 2c6f57415b2..53b30985975 100644
--- a/src/replay/replay_play.hpp
+++ b/src/replay/replay_play.hpp
@@ -62,6 +62,7 @@ class ReplayPlay : public ReplayBase
         std::string                m_minor_mode;
         core::stringw              m_stk_version;
         core::stringw              m_user_name;
+        core::stringw              m_info;
         std::vector<std::string>   m_kart_list;
         std::vector<core::stringw> m_name_list;
         std::vector<float>         m_kart_color; //no sorting for this
diff --git a/src/states_screens/dialogs/ghost_replay_info_dialog.cpp b/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
index d94ed930707..d70f3bf9ae8 100644
--- a/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
+++ b/src/states_screens/dialogs/ghost_replay_info_dialog.cpp
@@ -21,6 +21,7 @@
 #include "config/player_manager.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
 #include "graphics/stk_tex_manager.hpp"
+#include "guiengine/widgets/bubble_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
@@ -43,7 +44,7 @@ using namespace irr::core;
 // -----------------------------------------------------------------------------
 GhostReplayInfoDialog::GhostReplayInfoDialog(unsigned int replay_id,
                      uint64_t compare_replay_uid, bool compare_ghost)
-                      : ModalDialog(0.95f,0.75f), m_replay_id(replay_id)
+                      : ModalDialog(0.95f,0.9f), m_replay_id(replay_id)
 {
     m_self_destroy         = false;
     m_record_race          = false;
@@ -56,6 +57,9 @@ GhostReplayInfoDialog::GhostReplayInfoDialog(unsigned int replay_id,
 
     loadFromFile("ghost_replay_info_dialog.stkgui");
 
+    m_info_widget = getWidget<BubbleWidget>("info");
+    m_info_widget->setText(m_rd.m_info);
+
     Track* track = track_manager->getTrack(m_rd.m_track_name);
 
     m_track_screenshot_widget = getWidget<IconButtonWidget>("track_screenshot");
diff --git a/src/states_screens/dialogs/ghost_replay_info_dialog.hpp b/src/states_screens/dialogs/ghost_replay_info_dialog.hpp
index f8306934852..9fc24db9ae7 100644
--- a/src/states_screens/dialogs/ghost_replay_info_dialog.hpp
+++ b/src/states_screens/dialogs/ghost_replay_info_dialog.hpp
@@ -24,6 +24,7 @@
 
 namespace GUIEngine
 {
+    class BubbleWidget;
     class CheckBoxWidget; class IconButtonWidget; class ListWidget;
     class RibbonWidget;
 }
@@ -48,6 +49,7 @@ class GhostReplayInfoDialog : public GUIEngine::ModalDialog
 
     ReplayPlay::ReplayData m_rd;
 
+    GUIEngine::BubbleWidget*      m_info_widget;
     GUIEngine::RibbonWidget*      m_action_widget;
     GUIEngine::IconButtonWidget*  m_back_widget;
     GUIEngine::CheckBoxWidget*    m_record_widget;

From d64b15650e9f8eee50dd29ee24bf1b0e30413c56 Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Tue, 4 Feb 2025 00:47:07 +0800
Subject: [PATCH 3/8] Implement PCSS & Revert graphics level 8

---
 data/gui/dialogs/custom_video_settings.stkgui | 54 ++++++++------
 src/config/user_config.hpp                    |  4 ++
 src/graphics/lighting_passes.cpp              | 72 +++++++++++++++++--
 src/graphics/lighting_passes.hpp              |  3 +-
 src/graphics/shader_based_renderer.cpp        |  3 +-
 src/graphics/shadow_matrices.cpp              |  8 ++-
 src/graphics/shadow_matrices.hpp              |  9 ++-
 src/graphics/texture_shader.cpp               | 13 ++++
 src/graphics/texture_shader.hpp               |  2 +
 .../dialogs/custom_video_settings.cpp         | 13 ++--
 .../options/options_screen_video.cpp          | 40 +++++------
 .../options/options_screen_video.hpp          |  1 +
 12 files changed, 159 insertions(+), 63 deletions(-)

diff --git a/data/gui/dialogs/custom_video_settings.stkgui b/data/gui/dialogs/custom_video_settings.stkgui
index 840890f479a..86e9ff09e83 100644
--- a/data/gui/dialogs/custom_video_settings.stkgui
+++ b/data/gui/dialogs/custom_video_settings.stkgui
@@ -29,7 +29,7 @@
             <div layout="horizontal-row" proportion="1" height="fit">
                 <label text="Shadows" I18N="Video settings"/>
                 <spacer width="10" height="10"/>
-                <gauge id="shadows" min_value="0" max_value="4" proportion="1"/>
+                <gauge id="shadows" min_value="0" max_value="3" proportion="1"/>
             </div>
         </div>
 
@@ -39,17 +39,17 @@
             <spacer width="70" height="10"/>
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="mlaa"/>
+                <checkbox id="bloom"/>
                 <spacer width="10" height="10"/>
-                <label text="Anti-aliasing" I18N="Video settings"/>
+                <label text="Bloom" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="lightscattering"/>
+                <checkbox id="lightshaft"/>
                 <spacer width="10" height="10"/>
-                <label text="Light Scattering" I18N="Video settings"/>
+                <label text="Light shaft (God rays)" I18N="Video settings"/>
             </div>
         </div>
 
@@ -59,17 +59,17 @@
             <spacer width="70" height="10"/>
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="glow"/>
+                <checkbox id="ssao"/>
                 <spacer width="10" height="10"/>
-                <label text="Glow (Outlines)" I18N="Video settings"/>
+                <label text="Ambient occlusion" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="lightshaft"/>
+                <checkbox id="dof"/>
                 <spacer width="10" height="10"/>
-                <label text="Light shaft (God rays)" I18N="Video settings"/>
+                <label text="Depth of field" I18N="Video settings"/>
             </div>
         </div>
 
@@ -77,19 +77,19 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10"/>
-
+        
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="ibl"/>
+                <checkbox id="glow"/>
                 <spacer width="10" height="10"/>
-                <label text="Image-based lighting" I18N="Video settings"/>
+                <label text="Glow (Outlines)" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="bloom"/>
+                <checkbox id="mlaa"/>
                 <spacer width="10" height="10"/>
-                <label text="Bloom" I18N="Video settings"/>
+                <label text="Anti-aliasing" I18N="Video settings"/>
             </div>
         </div>
         
@@ -97,11 +97,19 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10"/>
+            
+            <div layout="horizontal-row" proportion="1" height="fit">
+                <checkbox id="motionblur"/>
+                <spacer width="10" height="10"/>
+                <label text="Motion blur" I18N="Video settings"/>
+            </div>
+
+            <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="ssao"/>
+                <checkbox id="ibl"/>
                 <spacer width="10" height="10"/>
-                <label text="Ambient occlusion" I18N="Video settings"/>
+                <label text="Image-based lighting" I18N="Video settings"/>
             </div>
         </div>
         
@@ -109,19 +117,19 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10"/>
-
+            
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="motionblur"/>
+                <checkbox id="lightscattering"/>
                 <spacer width="10" height="10"/>
-                <label text="Motion blur" I18N="Video settings"/>
+                <label text="Light Scattering" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="dof"/>
+                <checkbox id="pcss"/>
                 <spacer width="10" height="10"/>
-                <label text="Depth of field" I18N="Video settings"/>
+                <label text="Soft shadows" I18N="Video settings"/>
             </div>
         </div>
         
@@ -167,7 +175,7 @@
             <gauge id="geometry_detail" min_value="0" max_value="5" width="50%" />
         </div>
 
-        <spacer height="10" width="10"/>
+        <spacer height="10" width="10" />
 
         <buttonbar id="buttons" height="15%" width="30%" align="center">
             <icon-button id="cancel" width="128" height="128" icon="gui/icons/red_x.png"
@@ -176,4 +184,4 @@
                 I18N="Video settings" text="Apply" align="center"/>
         </buttonbar>
     </div>
-</stkgui>
+</stkgui>
\ No newline at end of file
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index e61441e8207..18194c2981d 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -1013,6 +1013,10 @@ namespace UserConfigParams
             PARAM_DEFAULT(BoolUserConfigParam(true,
                            "light_scatter", &m_graphics_quality,
                            "Enable light scattering shaders") );
+    PARAM_PREFIX BoolUserConfigParam         m_pcss
+            PARAM_DEFAULT(BoolUserConfigParam(false,
+                           "pcss", &m_graphics_quality,
+                           "Enable Percentage Filtered Soft Shadows (Very heavy, needs high shadow resolution)") );
     PARAM_PREFIX IntUserConfigParam          m_shadows_resolution
             PARAM_DEFAULT( IntUserConfigParam(0,
                            "shadows_resolution", &m_graphics_quality,
diff --git a/src/graphics/lighting_passes.cpp b/src/graphics/lighting_passes.cpp
index 76459bb8954..8908fb151ce 100644
--- a/src/graphics/lighting_passes.cpp
+++ b/src/graphics/lighting_passes.cpp
@@ -241,6 +241,53 @@ class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF
     }    // render
 };   // ShadowedSunLightShaderPCF
 
+// ============================================================================
+class ShadowedSunLightShaderPCSS : public TextureShader<ShadowedSunLightShaderPCSS,
+                                                        4,  float, float, float,
+                                                        float, float, float,
+                                                        core::vector3df, core::vector3df,
+                                                        core::vector3df, core::vector3df,
+                                                        core::vector3df, video::SColorf>
+{
+public:
+    ShadowedSunLightShaderPCSS()
+    {
+        loadProgram(OBJECT, GL_VERTEX_SHADER, "screenquad.vert",
+                            GL_FRAGMENT_SHADER, "sunlightshadowpcss.frag");
+
+        // Use 8 to circumvent a catalyst bug when binding sampler
+        assignSamplerNames(0, "ntex", ST_NEAREST_FILTERED,
+                           1, "dtex", ST_NEAREST_FILTERED,
+                           8, "shadowtexdepth", ST_NEAREST_FILTERED_ARRAY2D,
+                           16, "shadowtex", ST_SHADOW_SAMPLER);
+        assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res",
+            "overlap_proportion", "box0", "box1", "box2", "box3", "sundirection", "sun_color");
+    }   // ShadowedSunLightShaderPCF
+    // ------------------------------------------------------------------------
+    void render(GLuint normal_depth_texture,
+                GLuint depth_stencil_texture,
+                const FrameBuffer* shadow_framebuffer,
+                const core::vector3df &direction,
+                const video::SColorf &col,
+                const core::vector3df* shadow_box_extents)
+    {
+        setTextureUnits(normal_depth_texture,
+                        depth_stencil_texture,
+                        shadow_framebuffer->getDepthTexture(),
+                        shadow_framebuffer->getDepthTexture()                );
+       drawFullScreenEffect(ShadowMatrices::m_shadow_split[1],
+                            ShadowMatrices::m_shadow_split[2],
+                            ShadowMatrices::m_shadow_split[3],
+                            ShadowMatrices::m_shadow_split[4],
+                            float(UserConfigParams::m_shadows_resolution),
+                            ShadowMatrices::m_shadow_overlap_proportion,
+                            shadow_box_extents[0], shadow_box_extents[1],
+                            shadow_box_extents[2], shadow_box_extents[3],
+                            direction, col);
+
+    }    // render
+};   // ShadowedSunLightShaderPCSS
+
 // ============================================================================
 class SunLightShader : public TextureShader<SunLightShader, 2,
                                             core::vector3df, video::SColorf>
@@ -443,7 +490,8 @@ void LightingPasses::renderLights(  bool has_shadow,
                                     const FrameBuffer* shadow_framebuffer,
                                     GLuint ssao_texture,
                                     GLuint diffuse_color_texture,
-                                    GLuint specular_probe)
+                                    GLuint specular_probe,
+                                    const core::vector3df* shadow_box_extents)
 {
     {
         ScopedGPUTimer timer(irr_driver->getGPUTimer(Q_ENVMAP));
@@ -466,11 +514,23 @@ void LightingPasses::renderLights(  bool has_shadow,
             glDisable(GL_DEPTH_TEST);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
-            ShadowedSunLightShaderPCF::getInstance()->render(normal_depth_texture,
-                                                             depth_stencil_texture,
-                                                             shadow_framebuffer,
-                                                             irr_driver->getSunDirection(),
-                                                             irr_driver->getSunColor());
+            if (UserConfigParams::m_pcss)
+            {
+                ShadowedSunLightShaderPCSS::getInstance()->render(normal_depth_texture,
+                                                                  depth_stencil_texture,
+                                                                  shadow_framebuffer,
+                                                                  irr_driver->getSunDirection(),
+                                                                  irr_driver->getSunColor(),
+                                                                  shadow_box_extents);
+            }
+            else
+            {
+                ShadowedSunLightShaderPCF::getInstance()->render(normal_depth_texture,
+                                                                 depth_stencil_texture,
+                                                                 shadow_framebuffer,
+                                                                 irr_driver->getSunDirection(),
+                                                                 irr_driver->getSunColor());
+            }
         }
         else
             renderSunlight(irr_driver->getSunDirection(),
diff --git a/src/graphics/lighting_passes.hpp b/src/graphics/lighting_passes.hpp
index aef150a52bc..19e82cb5016 100644
--- a/src/graphics/lighting_passes.hpp
+++ b/src/graphics/lighting_passes.hpp
@@ -69,7 +69,8 @@ class LightingPasses
                         const FrameBuffer* shadow_framebuffer,
                         GLuint ssao_texture,
                         GLuint diffuse_color_texture,
-                        GLuint specular_probe);
+                        GLuint specular_probe,
+                        const core::vector3df* shadow_box_extents);
     void renderLightsScatter(GLuint depth_stencil_texture,
                              const FrameBuffer& half1_framebuffer,
                              const FrameBuffer& half2_framebuffer,
diff --git a/src/graphics/shader_based_renderer.cpp b/src/graphics/shader_based_renderer.cpp
index 6f1f17e7c8c..12e126bcbf2 100644
--- a/src/graphics/shader_based_renderer.cpp
+++ b/src/graphics/shader_based_renderer.cpp
@@ -292,7 +292,8 @@ void ShaderBasedRenderer::renderSceneDeferred(scene::ICameraSceneNode * const ca
                                         m_rtts->getShadowFrameBuffer(),
                                         m_rtts->getRenderTarget(RTT_HALF1_R),
                                         m_rtts->getRenderTarget(RTT_SP_DIFF_COLOR),
-                                        specular_probe);
+                                        specular_probe,
+                                        m_shadow_matrices.getShadowFrustumBoxExtent());
         PROFILER_POP_CPU_MARKER();
     }
 
diff --git a/src/graphics/shadow_matrices.cpp b/src/graphics/shadow_matrices.cpp
index c655e1b0c74..3dd29e5e41a 100644
--- a/src/graphics/shadow_matrices.cpp
+++ b/src/graphics/shadow_matrices.cpp
@@ -145,7 +145,8 @@ static std::vector<vector3df> getFrustrumVertex(const scene::SViewFrustum &frust
  *  \param pointsInside a vector of point in 3d space.
  */
 core::matrix4 ShadowMatrices::getTightestFitOrthoProj(const core::matrix4 &transform,
-                                    const std::vector<vector3df> &pointsInside)
+                                    const std::vector<vector3df> &pointsInside,
+                                    core::vector3df& bounding_box_extent)
 {
     float xmin = std::numeric_limits<float>::infinity();
     float xmax = -std::numeric_limits<float>::infinity();
@@ -178,6 +179,9 @@ core::matrix4 ShadowMatrices::getTightestFitOrthoProj(const core::matrix4 &trans
     tmp_matrix.buildProjectionMatrixOrthoLH(left, right,
         down, up,
         zmin - 100, zmax);
+    bounding_box_extent.X = right - left;
+    bounding_box_extent.Y = down - up;
+    bounding_box_extent.Z = zmax - zmin + 100;
     return tmp_matrix;
 }   // getTightestFitOrthoProj
 
@@ -275,7 +279,7 @@ void ShadowMatrices::computeMatrixesAndCameras(scene::ICameraSceneNode *const ca
             memcpy(m_shadows_cam[i], tmp, 24 * sizeof(float));
 
             std::vector<vector3df> vectors = getFrustrumVertex(*frustrum);
-            tmp_matrix = getTightestFitOrthoProj(sun_cam_view_matrix, vectors);
+            tmp_matrix = getTightestFitOrthoProj(sun_cam_view_matrix, vectors, m_frustum_box_extent[i]);
 
 
             m_shadow_cam_nodes[i]->setProjectionMatrix(tmp_matrix, true);
diff --git a/src/graphics/shadow_matrices.hpp b/src/graphics/shadow_matrices.hpp
index 183438f9226..60054a20666 100644
--- a/src/graphics/shadow_matrices.hpp
+++ b/src/graphics/shadow_matrices.hpp
@@ -51,9 +51,11 @@ class ShadowMatrices
     float                      m_shadows_cam[4][24];
     bool                       m_rsm_map_available;
     float                      m_mat_ubo[16 * 9 + 2];
+    core::vector3df            m_frustum_box_extent[4];
 
     core::matrix4 getTightestFitOrthoProj(const core::matrix4 &transform,
-                              const std::vector<core::vector3df> &pointsInside);
+                              const std::vector<core::vector3df> &pointsInside,
+                              core::vector3df& bounding_box_extent);
     void renderWireFrameFrustrum(float *tmp, unsigned i);
 public:
 
@@ -75,6 +77,11 @@ class ShadowMatrices
         return m_shadow_cam_nodes;
     }   // getShadowCamNodes
     // ------------------------------------------------------------------------
+    core::vector3df* getShadowFrustumBoxExtent()
+    {
+        return m_frustum_box_extent;
+    }   // getShadowCamNodes
+    // ------------------------------------------------------------------------
     scene::ICameraSceneNode* getSunCam() { return m_sun_cam; }
     // ------------------------------------------------------------------------
     std::vector<core::matrix4>& getSunOrthoMatrices()
diff --git a/src/graphics/texture_shader.cpp b/src/graphics/texture_shader.cpp
index a6026a0d055..443844cd28e 100644
--- a/src/graphics/texture_shader.cpp
+++ b/src/graphics/texture_shader.cpp
@@ -28,6 +28,7 @@ TextureShaderBase::BindFunction TextureShaderBase::m_all_bind_functions[] =
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ &TextureShaderBase::bindTextureTrilinearAnisotropic,
   /* ST_TRILINEAR_CUBEMAP              */ &TextureShaderBase::bindCubemapTrilinear,
   /* ST_BILINEAR_FILTERED              */ &TextureShaderBase::bindTextureBilinear,
+  /* ST_NEAREST_FILTERED_ARRAY2D       */ &TextureShaderBase::bindTextureNearestArrayTexture,
   /* ST_SHADOW_SAMPLER                 */ &TextureShaderBase::bindTextureShadow,
   /* ST_TRILINEAR_CLAMPED_ARRAY2D      */ &TextureShaderBase::bindTrilinearClampedArrayTexture,
   /* ST_VOLUME_LINEAR_FILTERED         */ &TextureShaderBase::bindTextureVolume,
@@ -42,6 +43,7 @@ GLuint TextureShaderBase::m_all_texture_types[] =
   /* ST_TRILINEAR_ANISOTROPIC_FILTERED */ GL_TEXTURE_2D,
   /* ST_TRILINEAR_CUBEMAP              */ GL_TEXTURE_CUBE_MAP,
   /* ST_BILINEAR_FILTERED              */ GL_TEXTURE_2D ,
+  /* ST_NEAREST_FILTERED_ARRAY2D       */ GL_TEXTURE_2D_ARRAY,
   /* ST_SHADOW_SAMPLER                 */ GL_TEXTURE_2D_ARRAY,
   /* ST_TRILINEAR_CLAMPED_ARRAY2D      */ GL_TEXTURE_2D_ARRAY,
   /* ST_VOLUME_LINEAR_FILTERED         */ GL_TEXTURE_3D,
@@ -168,6 +170,17 @@ void TextureShaderBase::bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id)
         glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1.);
 }   // bindTextureSemiTrilinear
 
+// ----------------------------------------------------------------------------
+void TextureShaderBase::bindTextureNearestArrayTexture(GLuint tex_unit, GLuint tex_id)
+{
+    glActiveTexture(GL_TEXTURE0 + tex_unit);
+    glBindTexture(GL_TEXTURE_2D_ARRAY, tex_id);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+}   // bindTextureShadow
+
 // ----------------------------------------------------------------------------
 void TextureShaderBase::bindTextureShadow(GLuint tex_unit, GLuint tex_id)
 {
diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index d05ba7af0d3..9e7dd059f19 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -37,6 +37,7 @@ enum SamplerTypeNew
     ST_TRILINEAR_ANISOTROPIC_FILTERED,
     ST_TRILINEAR_CUBEMAP,
     ST_BILINEAR_FILTERED,
+    ST_NEAREST_FILTERED_ARRAY2D,
     ST_SHADOW_SAMPLER,
     ST_TRILINEAR_CLAMPED_ARRAY2D,
     ST_VOLUME_LINEAR_FILTERED,
@@ -70,6 +71,7 @@ class TextureShaderBase
     static void   bindTextureTrilinearAnisotropic(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureSemiTrilinear(GLuint tex_unit, GLuint tex_id);
     static void   bindCubemapTrilinear(GLuint tex_unit, GLuint tex_id);
+    static void   bindTextureNearestArrayTexture(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureShadow(GLuint tex_unit, GLuint tex_id);
     static void   bindTrilinearClampedArrayTexture(GLuint tex_unit, GLuint tex_id);
     static void   bindTextureVolume(GLuint tex_unit, GLuint tex_id);
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index 738f9b0a79f..ca9c1a9e87d 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -103,9 +103,7 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
     shadows->addLabel(_("Low"));        // 1
     shadows->addLabel(_("Medium"));     // 2
     shadows->addLabel(_("High"));       // 3
-    shadows->addLabel(_("Very High"));  // 4
-    shadows->setValue(UserConfigParams::m_shadows_resolution == 4096 ? 4 :
-                      UserConfigParams::m_shadows_resolution == 2048 ? 3 :
+    shadows->setValue(UserConfigParams::m_shadows_resolution == 2048 ? 3 :
                       UserConfigParams::m_shadows_resolution == 1024 ? 2 :
                       UserConfigParams::m_shadows_resolution ==  512 ? 1 : 0);
 
@@ -118,6 +116,7 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
     getWidget<CheckBoxWidget>("ssao")->setState(UserConfigParams::m_ssao);
     getWidget<CheckBoxWidget>("bloom")->setState(UserConfigParams::m_bloom);
     getWidget<CheckBoxWidget>("lightscattering")->setState(UserConfigParams::m_light_scatter);
+    getWidget<CheckBoxWidget>("pcss")->setState(UserConfigParams::m_pcss);
     if (CVS->isEXTTextureCompressionS3TCUsable())
     {
         getWidget<CheckBoxWidget>("texture_compression")->setState(UserConfigParams::m_texture_compression);
@@ -163,8 +162,7 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
                 UserConfigParams::m_shadows_resolution =
                     getWidget<SpinnerWidget>("shadows")->getValue() == 1 ?  512 :
                     getWidget<SpinnerWidget>("shadows")->getValue() == 2 ? 1024 :
-                    getWidget<SpinnerWidget>("shadows")->getValue() == 3 ? 2048 :
-                    getWidget<SpinnerWidget>("shadows")->getValue() == 4 ? 4096 : 0;
+                    getWidget<SpinnerWidget>("shadows")->getValue() == 3 ? 2048 : 0;
             }
             else
             {
@@ -192,6 +190,9 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
             UserConfigParams::m_light_scatter =
                 advanced_pipeline && getWidget<CheckBoxWidget>("lightscattering")->getState();
 
+            UserConfigParams::m_pcss =
+                advanced_pipeline && getWidget<CheckBoxWidget>("pcss")->getState();
+
             UserConfigParams::m_texture_compression =
                 getWidget<CheckBoxWidget>("texture_compression")->getState();
 #ifndef SERVER_ONLY
@@ -261,6 +262,6 @@ void CustomVideoSettingsDialog::updateActivation()
     getWidget<CheckBoxWidget>("glow")->setActive(light);
     getWidget<CheckBoxWidget>("bloom")->setActive(light);
     getWidget<CheckBoxWidget>("lightscattering")->setActive(light);
+    getWidget<CheckBoxWidget>("pcss")->setActive(light);
 #endif
 }   // updateActivation
-
diff --git a/src/states_screens/options/options_screen_video.cpp b/src/states_screens/options/options_screen_video.cpp
index 8bed1953014..212e5fdef5e 100644
--- a/src/states_screens/options/options_screen_video.cpp
+++ b/src/states_screens/options/options_screen_video.cpp
@@ -43,7 +43,7 @@ void OptionsScreenVideo::initPresets()
         false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
         false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
         false /* animatedCharacters */, 1 /* particles */, 0 /* image_quality */,
-        true /* degraded IBL */, 0 /* Geometry Detail */
+        true /* degraded IBL */, 0 /* Geometry Detail */, false /* pcss */
     });
 
     m_presets.push_back // Level 2
@@ -51,7 +51,7 @@ void OptionsScreenVideo::initPresets()
         false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
         false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
-        true /* degraded IBL */, 1 /* Geometry Detail */
+        true /* degraded IBL */, 1 /* Geometry Detail */, false /* pcss */
     });
 
     m_presets.push_back // Level 3
@@ -59,15 +59,15 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
         false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
-        true /* degraded IBL */, 2 /* Geometry Detail */
+        true /* degraded IBL */, 2 /* Geometry Detail */, false /* pcss */
     });
 
     m_presets.push_back // Level 4
     ({
-        true /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
+        true /* light */, 0 /* shadow */, false /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */,
-        false /* degraded IBL */, 3 /* Geometry Detail */
+        false /* degraded IBL */, 3 /* Geometry Detail */, false /* pcss */
     });
 
     m_presets.push_back // Level 5
@@ -75,15 +75,15 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 512 /* shadow */, true /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 3 /* Geometry Detail */
+        false /* degraded IBL */, 3 /* Geometry Detail */, false /* pcss */
     });
 
     m_presets.push_back // Level 6
     ({
         true /* light */, 1024 /* shadow */, true /* bloom */, true /* lightshaft */,
-        true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
+        true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 4 /* Geometry Detail */
+        false /* degraded IBL */, 4 /* Geometry Detail */, false /* pcss */
     });
 
     m_presets.push_back // Level 7
@@ -91,28 +91,20 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 2048 /* shadow */, true /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 5 /* Geometry Detail */
+        false /* degraded IBL */, 5 /* Geometry Detail */, true /* pcss */
     });
 
-    m_presets.push_back // Level 8
-    ({
-        true /* light */, 4096 /* shadow */, true /* bloom */, true /* lightshaft */,
-        true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */,
-        true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 5 /* Geometry Detail */
-    });
-
-    m_blur_presets.push_back // Level 0
+    m_blur_presets.push_back
     ({
         false /* motionblur */, false /* depth of field */
     });
 
-    m_blur_presets.push_back // Level 1
+    m_blur_presets.push_back
     ({
         true  /* motionblur */, false /* depth of field */
     });
 
-    m_blur_presets.push_back // Level 2
+    m_blur_presets.push_back
     ({
         true  /* motionblur */, true  /* depth of field */
     });
@@ -220,7 +212,7 @@ OptionsScreenVideo::OptionsScreenVideo() : Screen("options/options_video.stkgui"
 void OptionsScreenVideo::loadedFromFile()
 {
     m_inited = false;
-    assert(m_presets.size() == 8);
+    assert(m_presets.size() == 7);
     assert(m_blur_presets.size() == 3);
 
     GUIEngine::SpinnerWidget* gfx =
@@ -366,7 +358,8 @@ void OptionsScreenVideo::updateGfxSlider()
             m_presets[l].degraded_ibl == UserConfigParams::m_degraded_IBL &&
             m_presets[l].geometry_detail == (UserConfigParams::m_geometry_level == 0 ? 2 :
                                              UserConfigParams::m_geometry_level == 2 ? 0 :
-                                             UserConfigParams::m_geometry_level))
+                                             UserConfigParams::m_geometry_level) &&
+            m_presets[l].pcss == UserConfigParams::m_pcss)
         {
             gfx->setValue(l + 1);
             found = true;
@@ -615,6 +608,7 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
         UserConfigParams::m_geometry_level     = (m_presets[level].geometry_detail == 0 ? 2 :
                                                   m_presets[level].geometry_detail == 2 ? 0 :
                                                   m_presets[level].geometry_detail);
+        UserConfigParams::m_pcss               = m_presets[level].pcss;
 
         updateGfxSlider();
     }
@@ -749,4 +743,4 @@ void OptionsScreenVideo::unloaded()
     m_inited = false;
 }   // unloaded
 
-// --------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/src/states_screens/options/options_screen_video.hpp b/src/states_screens/options/options_screen_video.hpp
index 4b3a56910ae..7d99c68d987 100644
--- a/src/states_screens/options/options_screen_video.hpp
+++ b/src/states_screens/options/options_screen_video.hpp
@@ -40,6 +40,7 @@ struct GFXPreset
     int image_quality;
     bool degraded_ibl;
     int geometry_detail;
+    bool pcss;
 };
 
 struct BlurPreset

From 337b8ddaf77a9d14c5d1bd773b54ff0734b38f91 Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Tue, 4 Feb 2025 01:25:54 +0800
Subject: [PATCH 4/8] Add missing file

---
 data/shaders/sunlightshadowpcss.frag | 241 +++++++++++++++++++++++++++
 src/config/user_config.hpp           |   2 +-
 2 files changed, 242 insertions(+), 1 deletion(-)
 create mode 100644 data/shaders/sunlightshadowpcss.frag

diff --git a/data/shaders/sunlightshadowpcss.frag b/data/shaders/sunlightshadowpcss.frag
new file mode 100644
index 00000000000..5c76067f4b4
--- /dev/null
+++ b/data/shaders/sunlightshadowpcss.frag
@@ -0,0 +1,241 @@
+uniform sampler2D ntex;
+#if defined(GL_ES) && defined(GL_FRAGMENT_PRECISION_HIGH)
+uniform highp sampler2D dtex;
+#else
+uniform sampler2D dtex;
+#endif
+uniform sampler2DArray shadowtexdepth;
+uniform sampler2DArrayShadow shadowtex;
+
+uniform float split0;
+uniform float split1;
+uniform float split2;
+uniform float splitmax;
+uniform float shadow_res;
+uniform float overlap_proportion;
+
+uniform vec3 box0;
+uniform vec3 box1;
+uniform vec3 box2;
+uniform vec3 box3;
+
+uniform vec3 sundirection;
+uniform vec3 sun_color;
+
+in vec2 uv;
+#ifdef GL_ES
+layout (location = 0) out vec4 Diff;
+layout (location = 1) out vec4 Spec;
+#else
+out vec4 Diff;
+out vec4 Spec;
+#endif
+
+#stk_include "utils/decodeNormal.frag"
+#stk_include "utils/SpecularBRDF.frag"
+#stk_include "utils/DiffuseBRDF.frag"
+#stk_include "utils/getPosFromUVDepth.frag"
+#stk_include "utils/SunMRP.frag"
+
+// PCF with Vogel Disk Sampling
+// From https://drdesten.github.io/web/tools/vogel_disk/
+vec2 vogel_disk_16[16] = vec2[](
+    vec2(0.18993645671348536, 0.027087114076591513),
+    vec2(-0.21261242652069953, 0.23391293246949066),
+    vec2(0.04771781344140756, -0.3666840644525993),
+    vec2(0.297730981239584, 0.398259878229082),
+    vec2(-0.509063425827436, -0.06528681462854097),
+    vec2(0.507855152944665, -0.2875976005206389),
+    vec2(-0.15230616564632418, 0.6426121151781916),
+    vec2(-0.30240170651828074, -0.5805072900736001),
+    vec2(0.6978019230005561, 0.2771173334141519),
+    vec2(-0.6990963248129052, 0.3210960724922725),
+    vec2(0.3565142601623699, -0.7066415061851589),
+    vec2(0.266890002328106, 0.8360191043249159),
+    vec2(-0.7515861305520581, -0.41609876195815027),
+    vec2(0.9102937449894895, -0.17014527555321657),
+    vec2(-0.5343471434373126, 0.8058593459499529),
+    vec2(-0.1133270115046468, -0.9490025827627441)
+);
+
+vec2 vogel_disk_4[4] = vec2[](
+	vec2(0.21848650099008202, -0.09211370200809937),
+	vec2(-0.5866112654782878, 0.32153793477769893),
+	vec2(-0.06595078555407359, -0.879656059066481),
+	vec2(0.43407555004227927, 0.6502318262968816)
+);
+
+float interleavedGradientNoise(vec2 w)
+{
+    vec3 m = vec3(0.06711056, 0.00583715, 52.9829189);
+    return fract(m.z * fract(dot(w, m.xy)));
+}
+
+vec2 computeReceiverPlaneDepthBias(vec3 position)
+{
+    // see: GDC '06: Shadow Mapping: GPU-based Tips and Techniques
+    // Chain rule to compute dz/du and dz/dv
+    // |dz/du|   |du/dx du/dy|^-T   |dz/dx|
+    // |dz/dv| = |dv/dx dv/dy|    * |dz/dy|
+    vec3 duvz_dx = dFdx(position);
+    vec3 duvz_dy = dFdy(position);
+    vec2 dz_duv = inverse(transpose(mat2(duvz_dx.xy, duvz_dy.xy))) * vec2(duvz_dx.z, duvz_dy.z);
+    return dz_duv;
+}
+
+mat2 getRandomRotationMatrix(vec2 fragCoord)
+{
+    // rotate the vogel disk randomly
+    float randomAngle = interleavedGradientNoise(fragCoord) * 2.0 * 3.14159;
+    vec2 randomBase = vec2(cos(randomAngle), sin(randomAngle));
+    mat2 R = mat2(randomBase.x, randomBase.y, -randomBase.y, randomBase.x);
+    return R;
+}
+
+void blockerSearchAndFilter(out float occludedCount, out float z_occSum,
+        vec2 uv, float z_rec, uint layer, vec2 filterRadii, mat2 R, vec2 dz_duv)
+{
+    occludedCount = 0.0;
+    z_occSum = 0.0;
+    for (uint i = 0u; i < 4u; i++)
+    {
+        vec2 duv = R * (vogel_disk_4[i] * filterRadii);
+        vec2 tc = clamp(uv + duv, vec2(0.), vec2(1.));
+
+        float z_occ = texture(shadowtexdepth, vec3(tc, float(layer))).r;
+
+        // receiver plane depth bias
+        float z_bias = dot(dz_duv, duv);
+        float dz = z_rec - z_occ; // dz>0 when blocker is between receiver and light
+        float occluded = step(z_bias, dz);
+        occludedCount += occluded;
+        z_occSum += z_occ * occluded;
+    }
+    float z_occ = texture(shadowtexdepth, vec3(uv, float(layer))).r;
+    float dz = z_rec - z_occ;
+    float occluded = step(0., dz);
+    occludedCount += occluded;
+    z_occSum += z_occ * occluded;
+}
+
+float filterPCSS(vec2 uv, float z_rec, uint layer,
+        vec2 filterRadii, mat2 R, vec2 dz_duv)
+{
+    float occludedCount = 0.0; // must be to workaround a spirv-tools issue
+    for (uint i = 0u; i < 16u; i++)
+    {
+        vec2 duv = R * (vogel_disk_16[i] * filterRadii);
+        vec2 tc = clamp(uv + duv, vec2(0.), vec2(1.));
+        
+        // receiver plane depth bias
+        float z_bias = dot(dz_duv, duv); 
+        occludedCount += texture(shadowtex, vec4(tc, float(layer), z_rec + z_bias));
+    }
+    return occludedCount * (1.0 / 16.0);
+}
+
+float getShadowFactor(vec3 position, vec3 bbox, vec2 dz_duv, uint layer)
+{
+    float penumbra = tan(3.14 * sun_angle / 360.) * bbox.z * position.z;
+
+    // rotate the poisson disk randomly
+    mat2 R = getRandomRotationMatrix(gl_FragCoord.xy);
+
+    float occludedCount = 0.0;
+    float z_occSum = 0.0;
+
+    blockerSearchAndFilter(occludedCount, z_occSum, position.xy, position.z, layer, penumbra / bbox.xy, R, dz_duv);
+
+    // early exit if there is no occluders at all, also avoids a divide-by-zero below.
+    if (z_occSum == 0.0) {
+        return 1.0;
+    }
+
+    float penumbraRatio = 1.0 - z_occSum / occludedCount / position.z;
+
+    float percentageOccluded = filterPCSS(position.xy, position.z, layer, penumbra / bbox.xy * penumbraRatio, R, dz_duv);
+
+    return percentageOccluded;
+}
+
+float blend_start(float x) {
+    return x * (1.0 - overlap_proportion);
+}
+
+void main() {
+    vec2 uv = gl_FragCoord.xy / u_screen;
+    float z = texture(dtex, uv).x;
+    vec4 xpos = getPosFromUVDepth(vec3(uv, z), u_inverse_projection_matrix);
+
+    vec3 norm = DecodeNormal(texture(ntex, uv).xy);
+    float roughness =texture(ntex, uv).z;
+    vec3 eyedir = -normalize(xpos.xyz);
+
+    vec3 Lightdir = SunMRP(norm, eyedir);
+    float NdotL = clamp(dot(norm, Lightdir), 0., 1.);
+
+    vec3 Specular = SpecularBRDF(norm, eyedir, Lightdir, vec3(1.), roughness);
+    vec3 Diffuse = DiffuseBRDF(norm, eyedir, Lightdir, vec3(1.), roughness);
+
+    // Shadows
+    // Calculate all shadow positions to prevent bug of dFdx
+    vec4 position = (u_shadow_projection_view_matrices[0] * u_inverse_view_matrix * vec4(xpos.xyz, 1.0));
+    vec3 position1 = position.xyz * (1.0 / position.w) * 0.5 + 0.5;
+
+         position = (u_shadow_projection_view_matrices[1] * u_inverse_view_matrix * vec4(xpos.xyz, 1.0));
+    vec3 position2 = position.xyz * (1.0 / position.w) * 0.5 + 0.5;
+
+         position = (u_shadow_projection_view_matrices[2] * u_inverse_view_matrix * vec4(xpos.xyz, 1.0));
+    vec3 position3 = position.xyz * (1.0 / position.w) * 0.5 + 0.5;
+
+         position = (u_shadow_projection_view_matrices[3] * u_inverse_view_matrix * vec4(xpos.xyz, 1.0));
+    vec3 position4 = position.xyz * (1.0 / position.w) * 0.5 + 0.5;
+
+    // We need to use the shadow receiver plane depth bias to combat shadow acne due to the
+    // large kernel.
+    vec2 dz_duv1 = computeReceiverPlaneDepthBias(position1);
+    vec2 dz_duv2 = computeReceiverPlaneDepthBias(position2);
+    vec2 dz_duv3 = computeReceiverPlaneDepthBias(position3);
+    vec2 dz_duv4 = computeReceiverPlaneDepthBias(position4);
+
+    float factor;
+    if (xpos.z < split0) {
+        float factor2 = getShadowFactor(position1, box0, dz_duv1, 0);
+        factor = factor2;
+    }
+    if (blend_start(split0) < xpos.z && xpos.z < split1) {
+        float factor2 = getShadowFactor(position2, box1, dz_duv2, 1);
+        if (xpos.z < split0) {
+            factor = mix(factor, factor2, (xpos.z - blend_start(split0)) / split0 / overlap_proportion);
+        } else {
+            factor = factor2;
+        }
+    }
+    if (blend_start(split1) < xpos.z && xpos.z < split2) {
+        float factor2 = getShadowFactor(position3, box2, dz_duv3, 2);
+        if (xpos.z < split1) {
+            factor = mix(factor, factor2, (xpos.z - blend_start(split1)) / split1 / overlap_proportion);
+        } else {
+            factor = factor2;
+        }
+    }
+    if (blend_start(split2) < xpos.z && xpos.z < splitmax) {
+        float factor2 = getShadowFactor(position4, box3, dz_duv4, 3);
+        if (xpos.z < split2) {
+            factor = mix(factor, factor2, (xpos.z - blend_start(split2)) / split2 / overlap_proportion);
+        } else {
+            factor = factor2;
+        }
+    } 
+    if (blend_start(splitmax) < xpos.z) {
+        float factor2 = 1.;
+        if (xpos.z < splitmax) {
+            factor = mix(factor, factor2, (xpos.z - blend_start(splitmax)) / splitmax / overlap_proportion);
+        } else {
+            factor = factor2;
+        }
+    }
+
+    Diff = vec4(factor * NdotL * Diffuse * sun_color, 1.);
+    Spec = vec4(factor * NdotL * Specular * sun_color, 1.);
+}
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 18194c2981d..34aa9d38158 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -1016,7 +1016,7 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam         m_pcss
             PARAM_DEFAULT(BoolUserConfigParam(false,
                            "pcss", &m_graphics_quality,
-                           "Enable Percentage Filtered Soft Shadows (Very heavy, needs high shadow resolution)") );
+                           "Enable Percentage Filtered Soft Shadows (needs high shadow resolution)") );
     PARAM_PREFIX IntUserConfigParam          m_shadows_resolution
             PARAM_DEFAULT( IntUserConfigParam(0,
                            "shadows_resolution", &m_graphics_quality,

From 7c098623c4d83ebf32284e9abac9bd1ef6c4306a Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Tue, 4 Feb 2025 15:15:25 +0800
Subject: [PATCH 5/8] Order the effects & etc.

---
 data/gui/dialogs/custom_video_settings.stkgui | 50 +++++++++----------
 src/config/user_config.hpp                    |  2 +-
 .../dialogs/custom_video_settings.cpp         |  7 ++-
 .../options/options_screen_video.cpp          | 49 +++++++++---------
 4 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/data/gui/dialogs/custom_video_settings.stkgui b/data/gui/dialogs/custom_video_settings.stkgui
index 86e9ff09e83..d387fb86f29 100644
--- a/data/gui/dialogs/custom_video_settings.stkgui
+++ b/data/gui/dialogs/custom_video_settings.stkgui
@@ -39,17 +39,17 @@
             <spacer width="70" height="10"/>
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="bloom"/>
+                <checkbox id="mlaa"/>
                 <spacer width="10" height="10"/>
-                <label text="Bloom" I18N="Video settings"/>
+                <label text="Anti-aliasing" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="lightshaft"/>
+                <checkbox id="lightscattering"/>
                 <spacer width="10" height="10"/>
-                <label text="Light shaft (God rays)" I18N="Video settings"/>
+                <label text="Light Scattering" I18N="Video settings"/>
             </div>
         </div>
 
@@ -59,17 +59,17 @@
             <spacer width="70" height="10"/>
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="ssao"/>
+                <checkbox id="glow"/>
                 <spacer width="10" height="10"/>
-                <label text="Ambient occlusion" I18N="Video settings"/>
+                <label text="Glow (Outlines)" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="dof"/>
+                <checkbox id="lightshaft"/>
                 <spacer width="10" height="10"/>
-                <label text="Depth of field" I18N="Video settings"/>
+                <label text="Light shaft (God rays)" I18N="Video settings"/>
             </div>
         </div>
 
@@ -77,19 +77,19 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10"/>
-        
+
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="glow"/>
+                <checkbox id="ibl"/>
                 <spacer width="10" height="10"/>
-                <label text="Glow (Outlines)" I18N="Video settings"/>
+                <label text="Image-based lighting" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="mlaa"/>
+                <checkbox id="bloom"/>
                 <spacer width="10" height="10"/>
-                <label text="Anti-aliasing" I18N="Video settings"/>
+                <label text="Bloom" I18N="Video settings"/>
             </div>
         </div>
         
@@ -97,19 +97,19 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10"/>
-            
+
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="motionblur"/>
+                <checkbox id="ssao"/>
                 <spacer width="10" height="10"/>
-                <label text="Motion blur" I18N="Video settings"/>
+                <label text="Ambient occlusion" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="ibl"/>
+                <checkbox id="pcss"/>
                 <spacer width="10" height="10"/>
-                <label text="Image-based lighting" I18N="Video settings"/>
+                <label text="Soft shadows" I18N="Video settings"/>
             </div>
         </div>
         
@@ -117,19 +117,19 @@
 
         <div layout="horizontal-row" width="100%" proportion="1">
             <spacer width="70" height="10"/>
-            
+
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="lightscattering"/>
+                <checkbox id="motionblur"/>
                 <spacer width="10" height="10"/>
-                <label text="Light Scattering" I18N="Video settings"/>
+                <label text="Motion blur" I18N="Video settings"/>
             </div>
 
             <spacer height="4" width="10" />
 
             <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="pcss"/>
+                <checkbox id="dof"/>
                 <spacer width="10" height="10"/>
-                <label text="Soft shadows" I18N="Video settings"/>
+                <label text="Depth of field" I18N="Video settings"/>
             </div>
         </div>
         
@@ -175,7 +175,7 @@
             <gauge id="geometry_detail" min_value="0" max_value="5" width="50%" />
         </div>
 
-        <spacer height="10" width="10" />
+        <spacer height="10" width="10"/>
 
         <buttonbar id="buttons" height="15%" width="30%" align="center">
             <icon-button id="cancel" width="128" height="128" icon="gui/icons/red_x.png"
@@ -184,4 +184,4 @@
                 I18N="Video settings" text="Apply" align="center"/>
         </buttonbar>
     </div>
-</stkgui>
\ No newline at end of file
+</stkgui>
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 34aa9d38158..84eb09542e3 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -1016,7 +1016,7 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam         m_pcss
             PARAM_DEFAULT(BoolUserConfigParam(false,
                            "pcss", &m_graphics_quality,
-                           "Enable Percentage Filtered Soft Shadows (needs high shadow resolution)") );
+                           "Enable Percentage Closer Soft Shadows (needs high shadow resolution)") );
     PARAM_PREFIX IntUserConfigParam          m_shadows_resolution
             PARAM_DEFAULT( IntUserConfigParam(0,
                            "shadows_resolution", &m_graphics_quality,
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index ca9c1a9e87d..e6bc25afa61 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -235,6 +235,10 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
     {
         updateActivation();
     }
+    else if (eventSource == "shadows")
+    {
+        updateActivation();
+    }
 #endif
     return GUIEngine::EVENT_LET;
 }   // processEvent
@@ -245,6 +249,7 @@ void CustomVideoSettingsDialog::updateActivation()
 {
 #ifndef SERVER_ONLY
     bool light = getWidget<CheckBoxWidget>("dynamiclight")->getState();
+    bool shadows = getWidget<SpinnerWidget>("shadows")->getValue();
     if (!CVS->isGLSL())
     {
         getWidget<CheckBoxWidget>("dynamiclight")->setActive(false);
@@ -262,6 +267,6 @@ void CustomVideoSettingsDialog::updateActivation()
     getWidget<CheckBoxWidget>("glow")->setActive(light);
     getWidget<CheckBoxWidget>("bloom")->setActive(light);
     getWidget<CheckBoxWidget>("lightscattering")->setActive(light);
-    getWidget<CheckBoxWidget>("pcss")->setActive(light);
+    getWidget<CheckBoxWidget>("pcss")->setActive(light & shadows);
 #endif
 }   // updateActivation
diff --git a/src/states_screens/options/options_screen_video.cpp b/src/states_screens/options/options_screen_video.cpp
index 212e5fdef5e..3fc189540f5 100644
--- a/src/states_screens/options/options_screen_video.cpp
+++ b/src/states_screens/options/options_screen_video.cpp
@@ -470,45 +470,46 @@ void OptionsScreenVideo::updateTooltip()
     const core::stringw very_high = _("Very High");
     //I18N: in the graphical options tooltip;
     const core::stringw ultra = _("Ultra");
-
+    
     //I18N: in graphical options
-    tooltip = _("Particles Effects: %s",
-        UserConfigParams::m_particles_effects == 2 ? enabled :
-        UserConfigParams::m_particles_effects == 1 ? important_only :
-        disabled);
+    tooltip = _("Dynamic lights: %s",
+        UserConfigParams::m_dynamic_lights ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Animated Characters: %s",
-        UserConfigParams::m_animated_characters ? enabled : disabled);
+    if (UserConfigParams::m_shadows_resolution == 0)
+        tooltip = tooltip + L"\n" + _("Shadows: %s", disabled);
+    else
+        tooltip = tooltip + L"\n" + _("Shadows: %i", UserConfigParams::m_shadows_resolution);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Dynamic lights: %s",
-        UserConfigParams::m_dynamic_lights ? enabled : disabled);
+    tooltip = tooltip + L"\n" + _("Anti-aliasing: %s",
+        UserConfigParams::m_mlaa ? enabled : disabled);
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Light scattering: %s",
         UserConfigParams::m_light_scatter ? enabled : disabled);
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Anti-aliasing: %s",
-        UserConfigParams::m_mlaa ? enabled : disabled);
-    //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Ambient occlusion: %s",
-        UserConfigParams::m_ssao ? enabled : disabled);
+    tooltip = tooltip + L"\n" + _("Glow (outlines): %s",
+        UserConfigParams::m_glow ? enabled : disabled);
     //I18N: in graphical options
-    if (UserConfigParams::m_shadows_resolution == 0)
-        tooltip = tooltip + L"\n" + _("Shadows: %s", disabled);
-    else
-        tooltip = tooltip + L"\n" + _("Shadows: %i", UserConfigParams::m_shadows_resolution);
-
+    tooltip = tooltip + L"\n" + _("Light shaft (God rays): %s",
+        UserConfigParams::m_light_shaft ? enabled : disabled);
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Bloom: %s",
         UserConfigParams::m_bloom ? enabled : disabled);
-
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Glow (outlines): %s",
-        UserConfigParams::m_glow ? enabled : disabled);
+    tooltip = tooltip + L"\n" + _("Ambient occlusion: %s",
+        UserConfigParams::m_ssao ? enabled : disabled);
+    //I18N: in graphical options
+    tooltip = tooltip + L"\n" + _("Soft shadows: %s",
+        UserConfigParams::m_pcss ? enabled : disabled);
 
     //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Light shaft (God rays): %s",
-        UserConfigParams::m_light_shaft ? enabled : disabled);
+    tooltip = tooltip + L"\n" + _("Animated Characters: %s",
+        UserConfigParams::m_animated_characters ? enabled : disabled);
+    //I18N: in graphical options
+    tooltip = tooltip + L"\n" + _("Particles Effects: %s",
+        UserConfigParams::m_particles_effects == 2 ? enabled :
+        UserConfigParams::m_particles_effects == 1 ? important_only :
+        disabled);
 
     //I18N: in graphical options
     int quality = getImageQuality();

From b08bc20bc5ef0396755e5667054f4c47e1dc0eb4 Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Wed, 5 Feb 2025 21:33:46 +0800
Subject: [PATCH 6/8] Use fixed kernel & tune shadow height & remove
 translation string

---
 data/gui/dialogs/custom_video_settings.stkgui |  8 ----
 data/shaders/sunlightshadowpcss.frag          | 42 +++++++++++--------
 src/config/user_config.hpp                    |  8 ++--
 src/graphics/lighting_passes.cpp              |  2 +-
 src/graphics/shadow_matrices.cpp              |  6 ++-
 .../dialogs/custom_video_settings.cpp         | 10 -----
 .../options/options_screen_video.cpp          | 21 ++++------
 .../options/options_screen_video.hpp          |  1 -
 8 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/data/gui/dialogs/custom_video_settings.stkgui b/data/gui/dialogs/custom_video_settings.stkgui
index d387fb86f29..48a5e4cc2f7 100644
--- a/data/gui/dialogs/custom_video_settings.stkgui
+++ b/data/gui/dialogs/custom_video_settings.stkgui
@@ -103,14 +103,6 @@
                 <spacer width="10" height="10"/>
                 <label text="Ambient occlusion" I18N="Video settings"/>
             </div>
-
-            <spacer height="4" width="10" />
-
-            <div layout="horizontal-row" proportion="1" height="fit">
-                <checkbox id="pcss"/>
-                <spacer width="10" height="10"/>
-                <label text="Soft shadows" I18N="Video settings"/>
-            </div>
         </div>
         
         <spacer height="4" width="10" />
diff --git a/data/shaders/sunlightshadowpcss.frag b/data/shaders/sunlightshadowpcss.frag
index 5c76067f4b4..80a742772d8 100644
--- a/data/shaders/sunlightshadowpcss.frag
+++ b/data/shaders/sunlightshadowpcss.frag
@@ -1,3 +1,4 @@
+// Implementation from https://github.com/google/filament/blob/main/shaders/src/surface_shadowing.fs
 uniform sampler2D ntex;
 #if defined(GL_ES) && defined(GL_FRAGMENT_PRECISION_HIGH)
 uniform highp sampler2D dtex;
@@ -58,11 +59,16 @@ vec2 vogel_disk_16[16] = vec2[](
     vec2(-0.1133270115046468, -0.9490025827627441)
 );
 
-vec2 vogel_disk_4[4] = vec2[](
-	vec2(0.21848650099008202, -0.09211370200809937),
-	vec2(-0.5866112654782878, 0.32153793477769893),
-	vec2(-0.06595078555407359, -0.879656059066481),
-	vec2(0.43407555004227927, 0.6502318262968816)
+// https://learn.microsoft.com/en-us/windows/win32/api/d3d11/ne-d3d11-d3d11_standard_multisample_quality_levels?redirectedfrom=MSDN
+vec2 sample_point_pos[8] = vec2[](
+    vec2( 0.125, -0.375),
+    vec2(-0.125,  0.375),
+    vec2( 0.625,  0.125),
+    vec2(-0.375, -0.625),
+    vec2(-0.625,  0.625),
+    vec2(-0.875, -0.125),
+    vec2( 0.375,  0.875),
+    vec2( 0.875, -0.875)
 );
 
 float interleavedGradientNoise(vec2 w)
@@ -95,27 +101,26 @@ mat2 getRandomRotationMatrix(vec2 fragCoord)
 void blockerSearchAndFilter(out float occludedCount, out float z_occSum,
         vec2 uv, float z_rec, uint layer, vec2 filterRadii, mat2 R, vec2 dz_duv)
 {
-    occludedCount = 0.0;
-    z_occSum = 0.0;
-    for (uint i = 0u; i < 4u; i++)
+    // Make sure no light leaking
+    float z_occ = texture(shadowtexdepth, vec3(uv, float(layer))).r;
+    float dz = z_rec - z_occ;
+    float occluded = 0.01 * step(0., dz);
+    occludedCount = occluded;
+    z_occSum = z_occ * occluded;
+
+    for (uint i = 0u; i < 8u; i++)
     {
-        vec2 duv = R * (vogel_disk_4[i] * filterRadii);
+        vec2 duv = R * sample_point_pos[i] * filterRadii;
         vec2 tc = clamp(uv + duv, vec2(0.), vec2(1.));
-
-        float z_occ = texture(shadowtexdepth, vec3(tc, float(layer))).r;
-
         // receiver plane depth bias
         float z_bias = dot(dz_duv, duv);
+
+        float z_occ = texture(shadowtexdepth, vec3(tc, float(layer))).r;
         float dz = z_rec - z_occ; // dz>0 when blocker is between receiver and light
         float occluded = step(z_bias, dz);
         occludedCount += occluded;
         z_occSum += z_occ * occluded;
     }
-    float z_occ = texture(shadowtexdepth, vec3(uv, float(layer))).r;
-    float dz = z_rec - z_occ;
-    float occluded = step(0., dz);
-    occludedCount += occluded;
-    z_occSum += z_occ * occluded;
 }
 
 float filterPCSS(vec2 uv, float z_rec, uint layer,
@@ -152,8 +157,9 @@ float getShadowFactor(vec3 position, vec3 bbox, vec2 dz_duv, uint layer)
     }
 
     float penumbraRatio = 1.0 - z_occSum / occludedCount / position.z;
+    vec2 radius = max(penumbra / bbox.xy * penumbraRatio, vec2(0.5 / shadow_res));
 
-    float percentageOccluded = filterPCSS(position.xy, position.z, layer, penumbra / bbox.xy * penumbraRatio, R, dz_duv);
+    float percentageOccluded = filterPCSS(position.xy, position.z, layer, radius, R, dz_duv);
 
     return percentageOccluded;
 }
diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 84eb09542e3..f312d52410e 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -1013,14 +1013,14 @@ namespace UserConfigParams
             PARAM_DEFAULT(BoolUserConfigParam(true,
                            "light_scatter", &m_graphics_quality,
                            "Enable light scattering shaders") );
-    PARAM_PREFIX BoolUserConfigParam         m_pcss
-            PARAM_DEFAULT(BoolUserConfigParam(false,
-                           "pcss", &m_graphics_quality,
-                           "Enable Percentage Closer Soft Shadows (needs high shadow resolution)") );
     PARAM_PREFIX IntUserConfigParam          m_shadows_resolution
             PARAM_DEFAULT( IntUserConfigParam(0,
                            "shadows_resolution", &m_graphics_quality,
                            "Shadow resolution (0 = disabled") );
+    PARAM_PREFIX IntUserConfigParam          m_pcss_threshold
+            PARAM_DEFAULT( IntUserConfigParam(2048,
+                           "pcss_threshold", &m_graphics_quality,
+                           "Enable Percentage Closer Soft Shadows when shadow resolution is higher than this value") );
     PARAM_PREFIX BoolUserConfigParam          m_degraded_IBL
         PARAM_DEFAULT(BoolUserConfigParam(true,
         "Degraded_IBL", &m_graphics_quality,
diff --git a/src/graphics/lighting_passes.cpp b/src/graphics/lighting_passes.cpp
index 8908fb151ce..40ddca78f7d 100644
--- a/src/graphics/lighting_passes.cpp
+++ b/src/graphics/lighting_passes.cpp
@@ -514,7 +514,7 @@ void LightingPasses::renderLights(  bool has_shadow,
             glDisable(GL_DEPTH_TEST);
             glBlendFunc(GL_ONE, GL_ONE);
             glBlendEquation(GL_FUNC_ADD);
-            if (UserConfigParams::m_pcss)
+            if (UserConfigParams::m_pcss_threshold <= UserConfigParams::m_shadows_resolution)
             {
                 ShadowedSunLightShaderPCSS::getInstance()->render(normal_depth_texture,
                                                                   depth_stencil_texture,
diff --git a/src/graphics/shadow_matrices.cpp b/src/graphics/shadow_matrices.cpp
index 3dd29e5e41a..4c9bc3f557a 100644
--- a/src/graphics/shadow_matrices.cpp
+++ b/src/graphics/shadow_matrices.cpp
@@ -176,12 +176,14 @@ core::matrix4 ShadowMatrices::getTightestFitOrthoProj(const core::matrix4 &trans
     // Prevent Matrix without extend
     if (left == right || up == down)
         return tmp_matrix;
+    
+    float vnear = std::min((zmax + zmin) / 2 - 200, zmin); // 200m above karts
     tmp_matrix.buildProjectionMatrixOrthoLH(left, right,
         down, up,
-        zmin - 100, zmax);
+        vnear, zmax);
     bounding_box_extent.X = right - left;
     bounding_box_extent.Y = down - up;
-    bounding_box_extent.Z = zmax - zmin + 100;
+    bounding_box_extent.Z = zmax - vnear;
     return tmp_matrix;
 }   // getTightestFitOrthoProj
 
diff --git a/src/states_screens/dialogs/custom_video_settings.cpp b/src/states_screens/dialogs/custom_video_settings.cpp
index e6bc25afa61..3197e122481 100644
--- a/src/states_screens/dialogs/custom_video_settings.cpp
+++ b/src/states_screens/dialogs/custom_video_settings.cpp
@@ -116,7 +116,6 @@ void CustomVideoSettingsDialog::beforeAddingWidgets()
     getWidget<CheckBoxWidget>("ssao")->setState(UserConfigParams::m_ssao);
     getWidget<CheckBoxWidget>("bloom")->setState(UserConfigParams::m_bloom);
     getWidget<CheckBoxWidget>("lightscattering")->setState(UserConfigParams::m_light_scatter);
-    getWidget<CheckBoxWidget>("pcss")->setState(UserConfigParams::m_pcss);
     if (CVS->isEXTTextureCompressionS3TCUsable())
     {
         getWidget<CheckBoxWidget>("texture_compression")->setState(UserConfigParams::m_texture_compression);
@@ -190,9 +189,6 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
             UserConfigParams::m_light_scatter =
                 advanced_pipeline && getWidget<CheckBoxWidget>("lightscattering")->getState();
 
-            UserConfigParams::m_pcss =
-                advanced_pipeline && getWidget<CheckBoxWidget>("pcss")->getState();
-
             UserConfigParams::m_texture_compression =
                 getWidget<CheckBoxWidget>("texture_compression")->getState();
 #ifndef SERVER_ONLY
@@ -235,10 +231,6 @@ GUIEngine::EventPropagation CustomVideoSettingsDialog::processEvent(const std::s
     {
         updateActivation();
     }
-    else if (eventSource == "shadows")
-    {
-        updateActivation();
-    }
 #endif
     return GUIEngine::EVENT_LET;
 }   // processEvent
@@ -249,7 +241,6 @@ void CustomVideoSettingsDialog::updateActivation()
 {
 #ifndef SERVER_ONLY
     bool light = getWidget<CheckBoxWidget>("dynamiclight")->getState();
-    bool shadows = getWidget<SpinnerWidget>("shadows")->getValue();
     if (!CVS->isGLSL())
     {
         getWidget<CheckBoxWidget>("dynamiclight")->setActive(false);
@@ -267,6 +258,5 @@ void CustomVideoSettingsDialog::updateActivation()
     getWidget<CheckBoxWidget>("glow")->setActive(light);
     getWidget<CheckBoxWidget>("bloom")->setActive(light);
     getWidget<CheckBoxWidget>("lightscattering")->setActive(light);
-    getWidget<CheckBoxWidget>("pcss")->setActive(light & shadows);
 #endif
 }   // updateActivation
diff --git a/src/states_screens/options/options_screen_video.cpp b/src/states_screens/options/options_screen_video.cpp
index 3fc189540f5..a970fb72a4e 100644
--- a/src/states_screens/options/options_screen_video.cpp
+++ b/src/states_screens/options/options_screen_video.cpp
@@ -43,7 +43,7 @@ void OptionsScreenVideo::initPresets()
         false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
         false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
         false /* animatedCharacters */, 1 /* particles */, 0 /* image_quality */,
-        true /* degraded IBL */, 0 /* Geometry Detail */, false /* pcss */
+        true /* degraded IBL */, 0 /* Geometry Detail */
     });
 
     m_presets.push_back // Level 2
@@ -51,7 +51,7 @@ void OptionsScreenVideo::initPresets()
         false /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
         false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
-        true /* degraded IBL */, 1 /* Geometry Detail */, false /* pcss */
+        true /* degraded IBL */, 1 /* Geometry Detail */
     });
 
     m_presets.push_back // Level 3
@@ -59,7 +59,7 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 0 /* shadow */, false /* bloom */, false /* lightshaft */,
         false /* glow */, false /* mlaa */, false /* ssao */, false /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 1 /* image_quality */,
-        true /* degraded IBL */, 2 /* Geometry Detail */, false /* pcss */
+        true /* degraded IBL */, 2 /* Geometry Detail */
     });
 
     m_presets.push_back // Level 4
@@ -67,7 +67,7 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 0 /* shadow */, false /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 2 /* image_quality */,
-        false /* degraded IBL */, 3 /* Geometry Detail */, false /* pcss */
+        false /* degraded IBL */, 3 /* Geometry Detail */
     });
 
     m_presets.push_back // Level 5
@@ -75,7 +75,7 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 512 /* shadow */, true /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, false /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 3 /* Geometry Detail */, false /* pcss */
+        false /* degraded IBL */, 3 /* Geometry Detail */
     });
 
     m_presets.push_back // Level 6
@@ -83,7 +83,7 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 1024 /* shadow */, true /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 4 /* Geometry Detail */, false /* pcss */
+        false /* degraded IBL */, 4 /* Geometry Detail */
     });
 
     m_presets.push_back // Level 7
@@ -91,7 +91,7 @@ void OptionsScreenVideo::initPresets()
         true /* light */, 2048 /* shadow */, true /* bloom */, true /* lightshaft */,
         true /* glow */, true /* mlaa */, true /* ssao */, true /* light scatter */,
         true /* animatedCharacters */, 2 /* particles */, 3 /* image_quality */,
-        false /* degraded IBL */, 5 /* Geometry Detail */, true /* pcss */
+        false /* degraded IBL */, 5 /* Geometry Detail */
     });
 
     m_blur_presets.push_back
@@ -358,8 +358,7 @@ void OptionsScreenVideo::updateGfxSlider()
             m_presets[l].degraded_ibl == UserConfigParams::m_degraded_IBL &&
             m_presets[l].geometry_detail == (UserConfigParams::m_geometry_level == 0 ? 2 :
                                              UserConfigParams::m_geometry_level == 2 ? 0 :
-                                             UserConfigParams::m_geometry_level) &&
-            m_presets[l].pcss == UserConfigParams::m_pcss)
+                                             UserConfigParams::m_geometry_level))
         {
             gfx->setValue(l + 1);
             found = true;
@@ -498,9 +497,6 @@ void OptionsScreenVideo::updateTooltip()
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Ambient occlusion: %s",
         UserConfigParams::m_ssao ? enabled : disabled);
-    //I18N: in graphical options
-    tooltip = tooltip + L"\n" + _("Soft shadows: %s",
-        UserConfigParams::m_pcss ? enabled : disabled);
 
     //I18N: in graphical options
     tooltip = tooltip + L"\n" + _("Animated Characters: %s",
@@ -609,7 +605,6 @@ void OptionsScreenVideo::eventCallback(Widget* widget, const std::string& name,
         UserConfigParams::m_geometry_level     = (m_presets[level].geometry_detail == 0 ? 2 :
                                                   m_presets[level].geometry_detail == 2 ? 0 :
                                                   m_presets[level].geometry_detail);
-        UserConfigParams::m_pcss               = m_presets[level].pcss;
 
         updateGfxSlider();
     }
diff --git a/src/states_screens/options/options_screen_video.hpp b/src/states_screens/options/options_screen_video.hpp
index 7d99c68d987..4b3a56910ae 100644
--- a/src/states_screens/options/options_screen_video.hpp
+++ b/src/states_screens/options/options_screen_video.hpp
@@ -40,7 +40,6 @@ struct GFXPreset
     int image_quality;
     bool degraded_ibl;
     int geometry_detail;
-    bool pcss;
 };
 
 struct BlurPreset

From d0670f44ddef06fed24bad47bc32f5509d9aa5a7 Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Wed, 5 Feb 2025 22:22:23 +0800
Subject: [PATCH 7/8] Improve shadow bias

---
 data/shaders/sunlightshadow.frag | 46 ++++++++++++++++++++++++--------
 src/graphics/lighting_passes.cpp | 12 ++++++---
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/data/shaders/sunlightshadow.frag b/data/shaders/sunlightshadow.frag
index 6641cb25f44..30ca5197985 100644
--- a/data/shaders/sunlightshadow.frag
+++ b/data/shaders/sunlightshadow.frag
@@ -13,6 +13,11 @@ uniform float splitmax;
 uniform float shadow_res;
 uniform float overlap_proportion;
 
+uniform vec3 box0;
+uniform vec3 box1;
+uniform vec3 box2;
+uniform vec3 box3;
+
 uniform vec3 sundirection;
 uniform vec3 sun_color;
 
@@ -32,12 +37,12 @@ out vec4 Spec;
 #stk_include "utils/SunMRP.frag"
 
 // https://web.archive.org/web/20230210095515/http://the-witness.net/news/2013/09/shadow-mapping-summary-part-1
-float getShadowFactor(vec3 pos, int index, float bias)
+float getShadowFactor(vec3 pos, int index)
 {
     vec4 shadowcoord = (u_shadow_projection_view_matrices[index] * u_inverse_view_matrix * vec4(pos, 1.0));
     shadowcoord.xy /= shadowcoord.w;
     vec2 shadowtexcoord = shadowcoord.xy * 0.5 + 0.5;
-    float d = .5 * shadowcoord.z + .5 - bias;
+    float d = .5 * shadowcoord.z + .5;
 
     vec2 uv = shadowtexcoord * shadow_res;
     vec2 base_uv = floor(uv + 0.5);
@@ -83,13 +88,26 @@ float blend_start(float x) {
     return x * (1.0 - overlap_proportion);
 }
 
+vec3 getXcYcZc(int x, int y, float zC)
+{
+    // We use perspective symetric projection matrix hence P(0,2) = P(1, 2) = 0
+    float xC= (2. * (float(x)) / u_screen.x - 1.) * zC / u_projection_matrix[0][0];
+    float yC= (2. * (float(y)) / u_screen.y - 1.) * zC / u_projection_matrix[1][1];
+    return vec3(xC, yC, zC);
+}
+
 void main() {
     vec2 uv = gl_FragCoord.xy / u_screen;
     float z = texture(dtex, uv).x;
     vec4 xpos = getPosFromUVDepth(vec3(uv, z), u_inverse_projection_matrix);
 
+    // get the normal of current fragment
+    vec3 ddx = dFdx(xpos.xyz);
+    vec3 ddy = dFdy(xpos.xyz);
+    vec3 geo_norm = normalize(cross(ddy, ddx));
+
     vec3 norm = DecodeNormal(texture(ntex, uv).xy);
-    float roughness =texture(ntex, uv).z;
+    float roughness = texture(ntex, uv).z;
     vec3 eyedir = -normalize(xpos.xyz);
 
     vec3 Lightdir = SunMRP(norm, eyedir);
@@ -100,24 +118,30 @@ void main() {
 
     // Shadows
     float factor;
-    float bias = max(1.0 - NdotL, .2) / shadow_res;
+    vec3 lbias = 40. * Lightdir / shadow_res; // Scale with blur kernel size
+    vec3 nbias = geo_norm * (1.0 - max(dot(-geo_norm, Lightdir), 0.)) / shadow_res;
+    nbias -= Lightdir * dot(nbias, Lightdir); // Slope-scaled normal bias
+
     if (xpos.z < split0) {
-        factor = getShadowFactor(xpos.xyz, 0, bias);
+        factor = getShadowFactor(xpos.xyz + lbias + nbias * max(box0.x, box0.y), 0);
         if (xpos.z > blend_start(split0)) {
-            factor = mix(factor, getShadowFactor(xpos.xyz, 1, bias), (xpos.z - blend_start(split0)) / split0 / overlap_proportion);
+            factor = mix(factor, getShadowFactor(xpos.xyz + lbias + nbias * max(box1.x, box1.y), 1), 
+                            (xpos.z - blend_start(split0)) / split0 / overlap_proportion);
         }
     } else if (xpos.z < split1) {
-        factor = getShadowFactor(xpos.xyz, 1, bias);
+        factor = getShadowFactor(xpos.xyz + lbias + nbias * max(box1.x, box1.y), 1);
         if (xpos.z > blend_start(split1)) {
-            factor = mix(factor, getShadowFactor(xpos.xyz, 2, bias), (xpos.z - blend_start(split1)) / split1 / overlap_proportion);
+            factor = mix(factor, getShadowFactor(xpos.xyz + lbias + nbias * max(box2.x, box2.y), 2), 
+                            (xpos.z - blend_start(split1)) / split1 / overlap_proportion);
         }
     } else if (xpos.z < split2) {
-        factor = getShadowFactor(xpos.xyz, 2, bias);
+        factor = getShadowFactor(xpos.xyz + lbias + nbias * max(box2.x, box2.y), 2);
         if (xpos.z > blend_start(split2)) {
-            factor = mix(factor, getShadowFactor(xpos.xyz, 3, bias), (xpos.z - blend_start(split2)) / split2 / overlap_proportion);
+            factor = mix(factor, getShadowFactor(xpos.xyz + lbias + nbias * max(box3.x, box3.y), 3), 
+                            (xpos.z - blend_start(split2)) / split2 / overlap_proportion);
         }
     } else if (xpos.z < splitmax) {
-        factor = getShadowFactor(xpos.xyz, 3, bias);
+        factor = getShadowFactor(xpos.xyz + lbias + nbias * max(box3.x, box3.y), 3);
         if (xpos.z > blend_start(splitmax)) {
             factor = mix(factor, 1.0, (xpos.z - blend_start(splitmax)) / splitmax / overlap_proportion);
         }
diff --git a/src/graphics/lighting_passes.cpp b/src/graphics/lighting_passes.cpp
index 40ddca78f7d..c7e79c5cb5d 100644
--- a/src/graphics/lighting_passes.cpp
+++ b/src/graphics/lighting_passes.cpp
@@ -205,6 +205,8 @@ class DegradedIBLShader : public TextureShader<DegradedIBLShader, 2>
 class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF,
                                                        3,  float, float, float,
                                                        float, float, float,
+                                                       core::vector3df, core::vector3df,
+                                                       core::vector3df, core::vector3df,
                                                        core::vector3df, video::SColorf>
 {
 public:
@@ -218,14 +220,15 @@ class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF
                            1, "dtex", ST_NEAREST_FILTERED,
                            8, "shadowtex", ST_SHADOW_SAMPLER);
         assignUniforms("split0", "split1", "split2", "splitmax", "shadow_res",
-            "overlap_proportion", "sundirection", "sun_color");
+            "overlap_proportion", "box0", "box1", "box2", "box3", "sundirection", "sun_color");
     }   // ShadowedSunLightShaderPCF
     // ------------------------------------------------------------------------
     void render(GLuint normal_depth_texture,
                 GLuint depth_stencil_texture,
                 const FrameBuffer* shadow_framebuffer,
                 const core::vector3df &direction,
-                const video::SColorf &col)
+                const video::SColorf &col,
+                const core::vector3df* shadow_box_extents)
     {
         setTextureUnits(normal_depth_texture,
                         depth_stencil_texture,
@@ -236,6 +239,8 @@ class ShadowedSunLightShaderPCF : public TextureShader<ShadowedSunLightShaderPCF
                             ShadowMatrices::m_shadow_split[4],
                             float(UserConfigParams::m_shadows_resolution),
                             ShadowMatrices::m_shadow_overlap_proportion,
+                            shadow_box_extents[0], shadow_box_extents[1],
+                            shadow_box_extents[2], shadow_box_extents[3],
                             direction, col);
 
     }    // render
@@ -529,7 +534,8 @@ void LightingPasses::renderLights(  bool has_shadow,
                                                                  depth_stencil_texture,
                                                                  shadow_framebuffer,
                                                                  irr_driver->getSunDirection(),
-                                                                 irr_driver->getSunColor());
+                                                                 irr_driver->getSunColor(),
+                                                                 shadow_box_extents);
             }
         }
         else

From ac546b94c0bb969039eb72635223f4da7bf65d95 Mon Sep 17 00:00:00 2001
From: CodingJellyfish <dumaosen_main01@outlook.com>
Date: Wed, 5 Feb 2025 22:36:15 +0800
Subject: [PATCH 8/8] Tune

---
 data/shaders/sunlightshadowpcss.frag | 8 ++++----
 src/graphics/shadow_matrices.cpp     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/shaders/sunlightshadowpcss.frag b/data/shaders/sunlightshadowpcss.frag
index 80a742772d8..b702aa42161 100644
--- a/data/shaders/sunlightshadowpcss.frag
+++ b/data/shaders/sunlightshadowpcss.frag
@@ -99,18 +99,18 @@ mat2 getRandomRotationMatrix(vec2 fragCoord)
 }
 
 void blockerSearchAndFilter(out float occludedCount, out float z_occSum,
-        vec2 uv, float z_rec, uint layer, vec2 filterRadii, mat2 R, vec2 dz_duv)
+        vec2 uv, float z_rec, uint layer, vec2 filterRadii, vec2 dz_duv)
 {
     // Make sure no light leaking
     float z_occ = texture(shadowtexdepth, vec3(uv, float(layer))).r;
     float dz = z_rec - z_occ;
-    float occluded = 0.01 * step(0., dz);
+    float occluded = 0.01 * step(0.5 / shadow_res, dz);
     occludedCount = occluded;
     z_occSum = z_occ * occluded;
 
     for (uint i = 0u; i < 8u; i++)
     {
-        vec2 duv = R * sample_point_pos[i] * filterRadii;
+        vec2 duv = sample_point_pos[i] * filterRadii;
         vec2 tc = clamp(uv + duv, vec2(0.), vec2(1.));
         // receiver plane depth bias
         float z_bias = dot(dz_duv, duv);
@@ -149,7 +149,7 @@ float getShadowFactor(vec3 position, vec3 bbox, vec2 dz_duv, uint layer)
     float occludedCount = 0.0;
     float z_occSum = 0.0;
 
-    blockerSearchAndFilter(occludedCount, z_occSum, position.xy, position.z, layer, penumbra / bbox.xy, R, dz_duv);
+    blockerSearchAndFilter(occludedCount, z_occSum, position.xy, position.z, layer, penumbra / bbox.xy, dz_duv);
 
     // early exit if there is no occluders at all, also avoids a divide-by-zero below.
     if (z_occSum == 0.0) {
diff --git a/src/graphics/shadow_matrices.cpp b/src/graphics/shadow_matrices.cpp
index 4c9bc3f557a..27c2931b826 100644
--- a/src/graphics/shadow_matrices.cpp
+++ b/src/graphics/shadow_matrices.cpp
@@ -177,7 +177,7 @@ core::matrix4 ShadowMatrices::getTightestFitOrthoProj(const core::matrix4 &trans
     if (left == right || up == down)
         return tmp_matrix;
     
-    float vnear = std::min((zmax + zmin) / 2 - 200, zmin); // 200m above karts
+    float vnear = std::min((zmax + zmin) / 2 - 250, zmin); // 250m above karts
     tmp_matrix.buildProjectionMatrixOrthoLH(left, right,
         down, up,
         vnear, zmax);