bloom/noise constants

ThirteenAG · Mar 26, 2024 · 50f2326 · 50f2326
1 parent b576dba
commit 50f2326
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 15 deletions.
diff --git a/data/update/TBoGT/common/data/frontend_menus.xml b/data/update/TBoGT/common/data/frontend_menus.xml
@@ -365,13 +365,13 @@
     </menu>
     <menupc enum="MENU_DISPLAY_TIMECYC">
       <options text="MO_DEF" action="ACTION_NONE" value="1" />
-      <options text="OFF" action="ACTION_NONE" value="2" />
+      <options text="MO_OFF" action="ACTION_NONE" value="2" />
       <options text="IV" action="ACTION_NONE" value="3" />
       <options text="TLAD" action="ACTION_NONE" value="4" />
       <options text="TBOGT" action="ACTION_NONE" value="5" />
     </menupc>
     <menupc enum="MENU_DISPLAY_FRAMELIMIT">
-      <options text="OFF" action="ACTION_NONE" value="0" />
+      <options text="MO_OFF" action="ACTION_NONE" value="0" />
       <options text="Custom" action="ACTION_NONE" value="1" />
       <options text="30" action="ACTION_NONE" value="2" />
       <options text="40" action="ACTION_NONE" value="3" />
@@ -386,12 +386,12 @@
       <options text="360" action="ACTION_NONE" value="12" />
     </menupc>
     <menupc enum="MENU_DISPLAY_BLOOM">
-      <options text="Off" action="ACTION_NONE" value="1" />
+      <options text="MO_OFF" action="ACTION_NONE" value="1" />
       <options text="Cross" action="ACTION_NONE" value="2" />
       <options text="Circle" action="ACTION_NONE" value="3" />
     </menupc>
     <menupc enum="MENU_DISPLAY_DOF">
-      <options text="Off" action="ACTION_NONE" value="1" />
+      <options text="MO_OFF" action="ACTION_NONE" value="1" />
       <options text="Cutscenes Only" action="ACTION_NONE" value="2" />
       <options text="Low" action="ACTION_NONE" value="3" />
       <options text="Medium" action="ACTION_NONE" value="4" />
@@ -579,6 +579,9 @@
       <options action="MENUOPT_ADJUST" label="MO_SAT"
         value="PREF_SATURATION" scaler="11"
         displayValue="MENU_DISPLAY_SLIDERBAR" />
+      <options action="MENUOPT_ADJUST" label="Noise Effect"
+       value="PREF_EPISODIC_NOISE_FILTER" scaler="2"
+        displayValue="MENU_DISPLAY_ON_OFF" />
       <options action="MENUOPT_ADJUST" label="MO_SUB"
         value="PREF_SUBTITLES" scaler="2"
         displayValue="MENU_DISPLAY_ON_OFF" />

diff --git a/data/update/TLAD/common/data/frontend_menus.xml b/data/update/TLAD/common/data/frontend_menus.xml
@@ -441,13 +441,13 @@
     </menu>
     <menupc enum="MENU_DISPLAY_TIMECYC">
       <options text="MO_DEF" action="ACTION_NONE" value="1" />
-      <options text="OFF" action="ACTION_NONE" value="2" />
+      <options text="MO_OFF" action="ACTION_NONE" value="2" />
       <options text="IV" action="ACTION_NONE" value="3" />
       <options text="TLAD" action="ACTION_NONE" value="4" />
       <options text="TBOGT" action="ACTION_NONE" value="5" />
     </menupc>
     <menupc enum="MENU_DISPLAY_FRAMELIMIT">
-      <options text="OFF" action="ACTION_NONE" value="0" />
+      <options text="MO_OFF" action="ACTION_NONE" value="0" />
       <options text="Custom" action="ACTION_NONE" value="1" />
       <options text="30" action="ACTION_NONE" value="2" />
       <options text="40" action="ACTION_NONE" value="3" />
@@ -462,12 +462,12 @@
       <options text="360" action="ACTION_NONE" value="12" />
     </menupc>
     <menupc enum="MENU_DISPLAY_BLOOM">
-      <options text="Off" action="ACTION_NONE" value="1" />
+      <options text="MO_OFF" action="ACTION_NONE" value="1" />
       <options text="Cross" action="ACTION_NONE" value="2" />
       <options text="Circle" action="ACTION_NONE" value="3" />
     </menupc>
     <menupc enum="MENU_DISPLAY_DOF">
-      <options text="Off" action="ACTION_NONE" value="1" />
+      <options text="MO_OFF" action="ACTION_NONE" value="1" />
       <options text="Cutscenes Only" action="ACTION_NONE" value="2" />
       <options text="Low" action="ACTION_NONE" value="3" />
       <options text="Medium" action="ACTION_NONE" value="4" />

diff --git a/data/update/common/data/frontend_menus.xml b/data/update/common/data/frontend_menus.xml
@@ -293,14 +293,14 @@
 
         <menupc enum="MENU_DISPLAY_TIMECYC">
             <options text="MO_DEF" action="ACTION_NONE" value="1" />
-            <options text="OFF" action="ACTION_NONE" value="2" />
+            <options text="MO_OFF" action="ACTION_NONE" value="2" />
             <options text="IV" action="ACTION_NONE" value="3" />
             <options text="TLAD" action="ACTION_NONE" value="4" />
             <options text="TBOGT" action="ACTION_NONE" value="5" />
         </menupc>
 
         <menupc enum="MENU_DISPLAY_FRAMELIMIT">
-            <options text="OFF" action="ACTION_NONE" value="0" />
+            <options text="MO_OFF" action="ACTION_NONE" value="0" />
             <options text="Custom" action="ACTION_NONE" value="1" />
             <options text="30" action="ACTION_NONE" value="2" />
             <options text="40" action="ACTION_NONE" value="3" />
@@ -316,13 +316,13 @@
         </menupc>
 
         <menupc enum="MENU_DISPLAY_BLOOM">
-            <options text="Off" action="ACTION_NONE" value="1" />
+            <options text="MO_OFF" action="ACTION_NONE" value="1" />
             <options text="Cross" action="ACTION_NONE" value="2" />
             <options text="Circle" action="ACTION_NONE" value="3" />
         </menupc>
 
         <menupc enum="MENU_DISPLAY_DOF">
-          <options text="Off" action="ACTION_NONE" value="1" />
+          <options text="MO_OFF" action="ACTION_NONE" value="1" />
           <options text="Cutscenes Only" action="ACTION_NONE" value="2" />
           <options text="Low" action="ACTION_NONE" value="3" />
           <options text="Medium" action="ACTION_NONE" value="4" />
@@ -501,6 +501,7 @@
             <options action="MENUOPT_ADJUST" label="MO_BRI" value="PREF_BRIGHTNESS" scaler="11" displayValue="MENU_DISPLAY_SLIDERBAR" />
             <options action="MENUOPT_ADJUST" label="MO_CON" value="PREF_CONTRAST" scaler="11" displayValue="MENU_DISPLAY_SLIDERBAR" />
             <options action="MENUOPT_ADJUST" label="MO_SAT" value="PREF_SATURATION" scaler="11" displayValue="MENU_DISPLAY_SLIDERBAR" />
+            <options action="MENUOPT_ADJUST" label="Noise Effect" value="PREF_EPISODIC_NOISE_FILTER" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
             <options action="MENUOPT_ADJUST" label="MO_SUB" value="PREF_SUBTITLES" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
             <options action="MENUOPT_ADJUST" label="MO_RAD" value="PREF_RADAR_MODE" scaler="3" displayValue="MENU_DISPLAY_RADAR_MODE" />
             <options action="MENUOPT_ADJUST" label="MO_HUD" value="PREF_DISPLAY_HUD" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />

diff --git a/source/shaders.ixx b/source/shaders.ixx
@@ -114,13 +114,27 @@ public:
                         pDevice->SetVertexShaderConstantF(227, &arr[0], 1);
                     }
 
-                    // DynamicShadowForTrees Wind Sway, More Shadows
+                    // DynamicShadowForTrees Wind Sway, More Shadows, Bloom and Noise
                     {
                         static float arr2[4];
                         arr2[0] = Natives::IsInteriorScene() ? 0.0f : *dw11A2948;
                         arr2[1] = static_cast<float>(bMoreShadows);
-                        arr2[2] = 0.0f;
-                        arr2[3] = 0.0f;
+
+                        switch (FusionFixSettings.Get("PREF_BLOOM"))
+                        {
+                        case FusionFixSettings.BloomText.eCross:
+                            arr2[2] = 1.0f;
+                            break;
+                        case FusionFixSettings.BloomText.eCircle:
+                            arr2[2] = 2.0f;
+                            break;
+                        case FusionFixSettings.BloomText.eOff:
+                        default:
+                            arr2[2] = 0.0f;
+                            break;
+                        }
+
+                        arr2[3] = static_cast<float>(FusionFixSettings.Get("PREF_EPISODIC_NOISE_FILTER"));
                         pDevice->SetVertexShaderConstantF(233, &arr2[0], 1);
                     }