From 32334a079f415351e8cf687e2e5fd21201a8c107 Mon Sep 17 00:00:00 2001
From: Asval <asval.contactme@gmail.com>
Date: Mon, 27 Jan 2025 09:57:39 +0100
Subject: [PATCH] fixed delta force, strinova, stalker2, gta, guilty gear +
 read shader maps option

---
 CUE4Parse                               |  2 +-
 FModel/Settings/UserSettings.cs         |  7 ++++++
 FModel/ViewModels/CUE4ParseViewModel.cs | 32 ++-----------------------
 FModel/Views/SettingsView.xaml          |  5 ++++
 FModel/Views/SettingsView.xaml.cs       |  1 +
 FModel/Views/Snooper/Camera.cs          |  2 +-
 6 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index c88d3697..e45f8547 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit c88d3697d7948d7fcbb3b244acf968ee4594244b
+Subproject commit e45f85472248e38b35fae893fa1bf69851aa90eb
diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs
index f6d31036..d4cb503d 100644
--- a/FModel/Settings/UserSettings.cs
+++ b/FModel/Settings/UserSettings.cs
@@ -256,6 +256,13 @@ namespace FModel.Settings
             set => SetProperty(ref _readScriptData, value);
         }
 
+        private bool _readShaderMaps;
+        public bool ReadShaderMaps
+        {
+            get => _readShaderMaps;
+            set => SetProperty(ref _readShaderMaps, value);
+        }
+
         private IDictionary<string, DirectorySettings> _perDirectory = new Dictionary<string, DirectorySettings>();
         public IDictionary<string, DirectorySettings> PerDirectory
         {
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index e56328fd..edbe2876 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -16,20 +16,7 @@ using CUE4Parse.Compression;
 using CUE4Parse.Encryption.Aes;
 using CUE4Parse.FileProvider;
 using CUE4Parse.FileProvider.Vfs;
-using CUE4Parse.GameTypes.ApexMobile.Encryption.Aes;
-using CUE4Parse.GameTypes.DBD.Encryption.Aes;
-using CUE4Parse.GameTypes.DeltaForce.Encryption.Aes;
-using CUE4Parse.GameTypes.DreamStar.Encryption.Aes;
-using CUE4Parse.GameTypes.FSR.Encryption.Aes;
-using CUE4Parse.GameTypes.FunkoFusion.Encryption.Aes;
 using CUE4Parse.GameTypes.KRD.Assets.Exports;
-using CUE4Parse.GameTypes.MJS.Encryption.Aes;
-using CUE4Parse.GameTypes.NetEase.MAR.Encryption.Aes;
-using CUE4Parse.GameTypes.PAXDEI.Encryption.Aes;
-using CUE4Parse.GameTypes.Rennsport.Encryption.Aes;
-using CUE4Parse.GameTypes.Snowbreak.Encryption.Aes;
-using CUE4Parse.GameTypes.THPS.Encryption.Aes;
-using CUE4Parse.GameTypes.UDWN.Encryption.Aes;
 using CUE4Parse.MappingsProvider;
 using CUE4Parse.UE4.AssetRegistry;
 using CUE4Parse.UE4.Assets.Exports;
@@ -196,24 +183,9 @@ public class CUE4ParseViewModel : ViewModel
                 break;
             }
         }
+
         Provider.ReadScriptData = UserSettings.Default.ReadScriptData;
-        Provider.CustomEncryption = Provider.Versions.Game switch
-        {
-            EGame.GAME_ApexLegendsMobile => ApexLegendsMobileAes.DecryptApexMobile,
-            EGame.GAME_Snowbreak => SnowbreakAes.SnowbreakDecrypt,
-            EGame.GAME_MarvelRivals => MarvelAes.MarvelDecrypt,
-            EGame.GAME_Undawn => ToaaAes.ToaaDecrypt,
-            EGame.GAME_DeadByDaylight => DBDAes.DbDDecrypt,
-            EGame.GAME_PaxDei => PaxDeiAes.PaxDeiDecrypt,
-            EGame.GAME_3on3FreeStyleRebound => FreeStyleReboundAes.FSRDecrypt,
-            EGame.GAME_DreamStar => DreamStarAes.DreamStarDecrypt,
-            EGame.GAME_DeltaForceHawkOps => DeltaForceAes.DeltaForceDecrypt,
-            EGame.GAME_MonsterJamShowdown => MonsterJamShowdownAes.MonsterJamShowdownDecrypt,
-            EGame.GAME_Rennsport => RennsportAes.RennsportDecrypt,
-            EGame.GAME_FunkoFusion => FunkoFusionAes.FunkoFusionDecrypt,
-            EGame.GAME_TonyHawkProSkater12 => THPS12Aes.THPS12Decrypt,
-            _ => Provider.CustomEncryption
-        };
+        Provider.ReadShaderMaps = UserSettings.Default.ReadShaderMaps;
 
         GameDirectory = new GameDirectoryViewModel();
         AssetsFolder = new AssetsFolderViewModel();
diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml
index 650542a5..ec457307 100644
--- a/FModel/Views/SettingsView.xaml
+++ b/FModel/Views/SettingsView.xaml
@@ -42,6 +42,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -221,6 +222,10 @@
                     <TextBlock Grid.Row="16" Grid.Column="0" Text="Serialize Script Bytecode" VerticalAlignment="Center" Margin="0 0 0 5" />
                     <CheckBox Grid.Row="16" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
                               IsChecked="{Binding ReadScriptData, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Margin="0 5 0 10"/>
+
+                    <TextBlock Grid.Row="17" Grid.Column="0" Text="Serialize Inlined Shader Maps" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <CheckBox Grid.Row="17" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
+                              IsChecked="{Binding ReadShaderMaps, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Margin="0 5 0 10"/>
                 </Grid>
             </DataTemplate>
             <DataTemplate x:Key="CreatorTemplate">
diff --git a/FModel/Views/SettingsView.xaml.cs b/FModel/Views/SettingsView.xaml.cs
index eec8a816..9321f41a 100644
--- a/FModel/Views/SettingsView.xaml.cs
+++ b/FModel/Views/SettingsView.xaml.cs
@@ -55,6 +55,7 @@ public partial class SettingsView
         }
 
         _applicationView.CUE4Parse.Provider.ReadScriptData = UserSettings.Default.ReadScriptData;
+        _applicationView.CUE4Parse.Provider.ReadShaderMaps = UserSettings.Default.ReadShaderMaps;
     }
 
     private void OnBrowseOutput(object sender, RoutedEventArgs e)
diff --git a/FModel/Views/Snooper/Camera.cs b/FModel/Views/Snooper/Camera.cs
index 5fcd25d1..9e4312c2 100644
--- a/FModel/Views/Snooper/Camera.cs
+++ b/FModel/Views/Snooper/Camera.cs
@@ -61,8 +61,8 @@ public class Camera
         };
         mouseDelta *= lookSensitivity;
 
+        const float tolerance = 0.001f;
         var rotationX = Matrix4x4.CreateFromAxisAngle(-Up, mouseDelta.X);
-        var tolerance = 0.001f;
         switch (Mode)
         {
             case WorldMode.FlyCam: