Upcoming shader changes, more fixes

.gitignore

@@ -332,6 +332,8 @@ ASALocalRun/
 
 data/**/*.img
 data/update/common/shaders/**/*.fxc
+source/**/*.cso
+!source/dxsdk/**
 
 data/update/common/shaders/db/gta_trees_new.sps
 data/update/common/shaders/dcl/gta_trees_new.dcl

.gitmodules

@@ -11,3 +11,6 @@
 	path = shaders/GTAIV.EFLC.FusionShaders
 	url = https://github.com/Parallellines0451/GTAIV.EFLC.FusionShaders
 	ignore = dirty
+[submodule "external/modupdater"]
+	path = external/modupdater
+	url = https://github.com/ThirteenAG/modupdater

buildwtd.bat

@@ -13,7 +13,7 @@ for /f "delims=" %%i in ('dir %src% /a:d/s/b') do (
     if not exist !modified! mkdir !modified!
     set "string=%%i"
     set "modified=!string:%src%=%dst%!"
-    ResourceBuilder.exe -c_wtd_v8 !modified! -f %%i
+    fftdc.exe -c_wtd_v8 !modified! -f %%i
   )
 )
 cd ..

data/plugins/GTAIV.EFLC.FusionFix.ini

@@ -6,7 +6,14 @@ AimingZoomFix = 1
 FlickeringShadowsFix = 1                      // known issue: disables player shadow from headlights
 ExtraDynamicShadows = 1                       // 1: restores some missing shadows  |  2: also adds vegetation shadows  |  3: forces all shadows to appear
 DynamicShadowForTrees = 1
-FixCascadedShadowMapResolution = 1
+ShadowSoftness = 1.5                          // multiplies shadow softness or blur intensity
+ShadowBias = 5.0                              // multiplies shadow bias, adjust according to ShadowSoftness
+ShadowBlendRange = 0.3                        // controls the size of the cascade blending regions | [0.0; 1.0]
+HighResolutionShadows = 0                     // doubles cascaded shadowmap resolution, very performance intensive
+LamppostShadows = 0                           // 0: disables shadows cast by lamppost lights (console behavior), improves CPU performance | 1: enables shadows
+HeadlightShadows = 1                          // 0: disables vehicle headlight shadows, reduces shadow flickering when there are lots of light sources in the scene with dynamic shadows enabled (e.g. lampposts, tunnel lights etc.)
+VehicleNightShadows = 0                       // 1: enables dynamic shadows ("night shadows") casted by vehicles from point lights (e.g. lampposts, tunnel lights etc.), HeadlightShadows needs to be 0 in order to avoid glitches.
+OverrideCascadeRanges = 1                     // increases shadow view distance and improves quality at lower settings
 
 [FRAMELIMIT]
 FrameLimitType = 2                            // 1: realtime (thread-lock)  |  2: accurate (sleep-yield), uses less resources
@@ -26,10 +33,40 @@ DoNotRunInside = 0                            // do not run inside interiors, us
 FixAutoExposure = 1
 ExtraCutsceneFix = 1
 ExtraInfo = 1                                 // shows extra info in the pause menu (loaded img files amount)
+TreeAlphaMultiplier = 1.0                     // multiplies tree leaf transparency, increase to 2.0 or more for a more console-like look | [1.0; 255.0]
+CoronaReflectionIntensity = 1.0               // controls intensity of coronas in reflections
 
 [BudgetedIV]
 VehicleBudget = 0                             // may cause issues, set to e.g. 260000000 to increase budget limit
 PedBudget = 0                                 // may cause issues
 
 [USERPROFILE]
-CustomUserProfilePath = 
+CustomUserProfilePath =
+
+[SUNSHAFTS]
+SSType = 2
+SSSamples = 30
+SSWeight = 1.5
+SSDensity = 0.95
+SSExposure = 0.01
+SSDecay = 0.975
+SSSunSize = 0.5
+SSPow = 1
+SSDepth = 2
+SSPower = 1.5
+
+[SRF]
+ScreenSpaceShadowsBlur = 0                    // 0 off, 1 horizontal, 2 vertical, 3 horizontal e vertical.
+BilateralDepthTreshold = 0.003
+
+DofSamples = 15                               // unfinished
+
+StippleFilter = 0                             // unfinished
+UseSSAO = 0                                   // unfinished
+
+NoiseSale = 0.00390625
+
+fixDXVKOutlines = 0
+
+[UnusedBug]
+NewShadowAtlas = 0

data/update/GTAIV.EFLC.FusionFix/cdimagemake.ims

@@ -18,11 +18,6 @@
 -rebuild
 -close
 
--create "FusionTrees.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
--importFromDirectory "FusionTrees"
--rebuild
--close
-
 -create "FusionLights.img" "3" "IMG_VERSION_3_ENCRYPTION_TYPE_NONE"
 -importFromDirectory "FusionLights"
 -rebuild

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" />
@@ -385,15 +385,13 @@
       <options text="240" action="ACTION_NONE" value="11" />
       <options text="360" action="ACTION_NONE" value="12" />
     </menupc>
-    <menupc enum="MENU_DISPLAY_SHADOWFILTER">
-      <options text="Sharp" action="ACTION_NONE" value="1" />
-      <options text="Soft" action="ACTION_NONE" value="2" />
-      <options text="Softer" action="ACTION_NONE" value="3" />
-      <options text="Softest" action="ACTION_NONE" value="4" />
-      <options text="PCSS" action="ACTION_NONE" value="5" />
+    <menupc enum="MENU_DISPLAY_BLOOM">
+      <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" />
@@ -438,15 +436,18 @@
       <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <optionspc action="MENUOPT_ADJUST" label="Skip Intro" value="PREF_SKIP_INTRO" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Skip Menu" value="PREF_SKIP_MENU" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Windowed" value="PREF_WINDOWED" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Borderless" value="PREF_BORDERLESS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Focus Loss" value="PREF_BLOCKONLOSTFOCUS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="LightSyncRGB" value="PREF_LEDILLUMINATION" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="FPS Counter" value="PREF_FPSCOUNTER" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Letterbox" value="PREF_LETTERBOX" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Pillarbox" value="PREF_PILLARBOX" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
-      <optionspc action="MENUOPT_ADJUST" label="SSAA 2x" value="PREF_SSAA" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <optionspc action="MENUOPT_ADJUST" label="Alt. Dialogues" value="PREF_ALTDIALOGUE" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
+      <optionspc action="MENUOPT_ADJUST" label="Check Updates" value="PREF_UPDATE" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <optionspc action="MENUOPT_QUIT" label="MO_EXITGAM" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <options action="END_OF_MENU_OPTIONS" label="" value="0" scaler="0" displayValue="0" />
     </menu>
@@ -606,8 +607,9 @@
         value="PREF_FLICKER_FILTER" scaler="2"
         displayValue="MENU_DISPLAY_ON_OFF" />
       <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
+      <options action="MENUOPT_ADJUST" label="Noise Effect" value="PREF_EPISODIC_NOISE_FILTER" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Motion Blur" value="PREF_MOTIONBLUR" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
-      <optionspc action="MENUOPT_ADJUST" label="Bloom" value="PREF_BLOOM" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Bloom" value="PREF_BLOOM" scaler="6" displayValue="MENU_DISPLAY_BLOOM" />
       <optionspc action="MENUOPT_ADJUST" label="Console Gamma" value="PREF_CONSOLE_GAMMA" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Screen Filter" value="PREF_TIMECYC" scaler="10" displayValue="MENU_DISPLAY_TIMECYC" />
       <optionspc action="MENUOPT_ADJUST" label="Depth of Field" value="PREF_TCYC_DOF" scaler="11" displayValue="MENU_DISPLAY_DOF" />
@@ -1110,8 +1112,7 @@
       <!--optionspc action="MENUOPT_ADJUST" label="MO_DOF" value="PREF_DOF" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" /-->
       <optionspc action="MENUOPT_ADJUST" label="MO_VSYNC" value="PREF_VSYNC" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
-      <optionspc action="MENUOPT_ADJUST" label="Shadow Filter" value="PREF_SHADOW_FILTER" scaler="8" displayValue="MENU_DISPLAY_SHADOWFILTER" />
-      <optionspc action="MENUOPT_ADJUST" label="Console Shadows" value="PREF_CONSOLE_SHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Sun Shafts" value="PREF_SUNSHAFTS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Antialiasing" value="PREF_ANTIALIASING" scaler="8" displayValue="MENU_DISPLAY_ANTIALIASING" />
       <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" />
       <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" />
@@ -1163,8 +1164,7 @@
       <optionspc action="MENUOPT_ADJUST" label="MO_CARS" value="PREF_DOF" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="MO_VSYNC" value="PREF_VSYNC" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <options action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
-      <optionspc action="MENUOPT_ADJUST" label="Shadow Filter" value="PREF_SHADOW_FILTER" scaler="8" displayValue="MENU_DISPLAY_SHADOWFILTER" />
-      <optionspc action="MENUOPT_ADJUST" label="Console Shadows" value="PREF_CONSOLE_SHADOWS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Sun Shafts" value="PREF_SUNSHAFTS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Antialiasing" value="PREF_ANTIALIASING" scaler="8" displayValue="MENU_DISPLAY_ANTIALIASING" />
       <optionspc action="MENUOPT_ADJUST" label="FPS Limiter" value="PREF_FPS_LIMIT_PRESET" scaler="15" displayValue="MENU_DISPLAY_FRAMELIMIT" />
       <optionspc action="MENUOPT_ADJUST" label="MO_FOV" value="PREF_EPISODIC_RACECLASS_RACE_3" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" />
@@ -1185,12 +1185,13 @@
       <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <optionspc action="MENUOPT_ADJUST" label="Skip Intro" value="PREF_SKIP_INTRO" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Skip Menu" value="PREF_SKIP_MENU" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Windowed" value="PREF_WINDOWED" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Borderless" value="PREF_BORDERLESS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
+      <optionspc action="MENUOPT_ADJUST" label="Focus Loss" value="PREF_BLOCKONLOSTFOCUS" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="LightSyncRGB" value="PREF_LEDILLUMINATION" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="FPS Counter" value="PREF_FPSCOUNTER" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Letterbox" value="PREF_LETTERBOX" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_ADJUST" label="Pillarbox" value="PREF_PILLARBOX" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
-      <optionspc action="MENUOPT_ADJUST" label="SSAA 2x" value="PREF_SSAA" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="END_OF_MENU_OPTIONS" label="" value="0"
         scaler="0" displayValue="0" />
     </menupc>