Clean up global shadow max blur size variable

H-uru · Dec 30, 2022 · 5380d3f · 5380d3f
1 parent a8fb981
commit 5380d3f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
@@ -1240,10 +1240,12 @@ PF_CONSOLE_CMD( Graphics_Shadow,
                "...", 
                "Max shadowmap blur size." )
 {
-    extern float blurScale;
-    if( numParams > 0 )
-    {
-        blurScale = (float)atof( params[ 0 ] );
+    float blurScale;
+    if (numParams > 0) {
+        blurScale = (float)atof(params[0]);
+        plShadowMaster::SetGlobalMaxBlur(blurScale);
+    } else {
+        blurScale = plShadowMaster::GetGlobalMaxBlur();
     }
     pfConsolePrintF(PrintString, "Max shadowmap Blur {f}", blurScale);
 }

diff --git a/Sources/Plasma/FeatureLib/pfDXPipeline/plDXPipeline.cpp b/Sources/Plasma/FeatureLib/pfDXPipeline/plDXPipeline.cpp
@@ -110,6 +110,7 @@ You can contact Cyan Worlds, Inc. by email [email protected]
 #include "plGImage/plMipmap.h"
 #include "plGLight/plLightInfo.h"
 #include "plGLight/plShadowCaster.h"
+#include "plGLight/plShadowMaster.h"
 #include "plGLight/plShadowSlave.h"
 #include "plMessage/plDeviceRecreateMsg.h"
 #include "plResMgr/plLocalization.h"
@@ -9629,7 +9630,6 @@ const char  *plDXPipeline::IGetDXFormatName( D3DFORMAT format )
 
 
 
-float blurScale = -1.f;
 static  const int kL2NumSamples = 3; // Log2(4)
 
 // IBlurShadowMap //////////////////////////////////////////////////////////////////
@@ -10898,7 +10898,8 @@ bool plDXPipeline::IRenderShadowCaster(plShadowSlave* slave)
     }
 
     // Debug only.
-    if( blurScale >= 0.f )
+    float blurScale = plShadowMaster::GetGlobalMaxBlur();
+    if (blurScale >= 0.f)
         slave->fBlurScale = blurScale;
 
     // If this shadow requests being blurred, do it.

diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp b/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.cpp
@@ -66,6 +66,7 @@ uint32_t plShadowMaster::fGlobalMaxSize = 512;
 float plShadowMaster::fGlobalMaxDist = 160.f; // PERSPTEST
 // float plShadowMaster::fGlobalMaxDist = 100000.f; // PERSPTEST
 float plShadowMaster::fGlobalVisParm = 1.f;
+float plShadowMaster::fGlobalMaxBlur = -1.f;
 
 void plShadowMaster::SetGlobalShadowQuality(float s) 
 { 

diff --git a/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h b/Sources/Plasma/PubUtilLib/plGLight/plShadowMaster.h
@@ -74,19 +74,20 @@ class plShadowMaster : public plObjInterface
 
 protected:
     // Global clamp on shadow map size and stuff
-    static uint32_t                   fGlobalMaxSize;
-    static float                 fGlobalMaxDist;
-    static float                 fGlobalVisParm;
+    static uint32_t             fGlobalMaxSize;
+    static float                fGlobalMaxDist;
+    static float                fGlobalVisParm;
+    static float                fGlobalMaxBlur;
 
     // Constant parameter(s) for this master.
-    float                        fAttenDist;
-    float                        fMaxDist;
-    float                        fMinDist;
+    float                       fAttenDist;
+    float                       fMaxDist;
+    float                       fMinDist;
 
-    uint32_t                          fMaxSize;
-    uint32_t                          fMinSize;
+    uint32_t                    fMaxSize;
+    uint32_t                    fMinSize;
 
-    float                        fPower;
+    float                       fPower;
 
     // Temp data used for one frame and recycled.
     hsPoolVector<std::unique_ptr<plShadowSlave>> fSlavePool;
@@ -166,6 +167,9 @@ class plShadowMaster : public plObjInterface
 
     static void SetGlobalShadowQuality(float s);
     static float GetGlobalShadowQuality() { return fGlobalVisParm; }
+
+    static void SetGlobalMaxBlur(float s) { fGlobalMaxBlur = s; }
+    static float GetGlobalMaxBlur() { return fGlobalMaxBlur; }
 };