feat(rendering): add configSplitDistances to DirectionalShadowCaster

This prevents the CSM plugin from overriding user-defined values with defaults
GameDevTecnico · Oct 1, 2024 · 4bd089b · 4bd089b
1 parent 52f8e80
commit 4bd089b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/engine/include/cubos/engine/render/shadows/directional_caster.hpp b/engine/include/cubos/engine/render/shadows/directional_caster.hpp
@@ -29,8 +29,12 @@ namespace cubos::engine
 
         int configNumSplits = 3; ///< Target number of splits for PSSM/CSM.
         int numSplits = 0;       ///< Current number of splits for PSSM/CSM.
-        std::vector<float>
-            splitDistances;        ///< Distance of each split's near plane from 0 to 1 (relative to maxDistance).
+
+        std::vector<float> configSplitDistances; ///< Target distance of each split's near plane from 0 to 1 (relative
+                                                 ///< to maxDistance). If the amount of distances doesn't match the
+                                                 ///< number of splits, default values will be used.
+        std::vector<float> splitDistances;       ///< Distance of each split's near plane from 0 to 1.
+
         float maxDistance = 0;     ///< Max distance (if 0, uses camera zFar).
         float nearDistance = 0.1F; ///< Minimum near plane distance of splits frustum.
 

diff --git a/engine/src/render/cascaded_shadow_maps/plugin.cpp b/engine/src/render/cascaded_shadow_maps/plugin.cpp
@@ -45,24 +45,29 @@ void cubos::engine::cascadedShadowMapsPlugin(Cubos& cubos)
                 if (caster.size != caster.configSize || caster.numSplits != caster.configNumSplits)
                 {
                     caster.size = caster.configSize;
-                    if (caster.numSplits != caster.configNumSplits)
-                    {
-                        caster.numSplits = caster.configNumSplits;
-
-                        // Set default split distances
-                        caster.splitDistances.clear();
-                        for (int i = 0; i < caster.numSplits; i++)
-                        {
-                            caster.splitDistances.push_back(float(i) / float(caster.numSplits));
-                        }
-                    }
+                    caster.numSplits = caster.configNumSplits;
 
                     for (auto& [camera, shadowMap] : caster.shadowMaps)
                     {
                         shadowMap.resize(window->renderDevice(), caster.size, caster.numSplits);
                     }
                 }
 
+                // Set split distances
+                if (caster.configSplitDistances.size() == static_cast<unsigned long>(caster.numSplits))
+                {
+                    caster.splitDistances = caster.configSplitDistances;
+                }
+                else
+                {
+                    // Set default split distances
+                    caster.splitDistances.clear();
+                    for (int i = 0; i < caster.numSplits; i++)
+                    {
+                        caster.splitDistances.push_back(float(i) / float(caster.numSplits));
+                    }
+                }
+
                 // Create shadow maps for new cameras
                 for (auto [entity, camera] : cameras)
                 {

diff --git a/engine/src/render/shadows/directional_caster.cpp b/engine/src/render/shadows/directional_caster.cpp
@@ -14,7 +14,7 @@ CUBOS_REFLECT_IMPL(cubos::engine::DirectionalShadowCaster)
     return core::ecs::TypeBuilder<DirectionalShadowCaster>("cubos::engine::DirectionalShadowCaster")
         .withField("baseSettings", &DirectionalShadowCaster::baseSettings)
         .withField("configNumSplits", &DirectionalShadowCaster::configNumSplits)
-        .withField("splitDistances", &DirectionalShadowCaster::splitDistances)
+        .withField("configSplitDistances", &DirectionalShadowCaster::configSplitDistances)
         .withField("maxDistance", &DirectionalShadowCaster::maxDistance)
         .withField("nearDistance", &DirectionalShadowCaster::nearDistance)
         .withField("configSize", &DirectionalShadowCaster::configSize)