Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-21 17:24:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed delta force, strinova, stalker2, gta, guilty gear + read shader maps option
Some checks failed
FModel QA Builder / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Asval 2025-01-27 09:57:39 +01:00
parent a3cbf3555f
commit 32334a079f
6 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit c88d3697d7948d7fcbb3b244acf968ee4594244b
Subproject commit e45f85472248e38b35fae893fa1bf69851aa90eb

7
FModel/Settings/UserSettings.cs
View File

@ -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
{

32
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -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();

5
FModel/Views/SettingsView.xaml
View File

@ -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">

1
FModel/Views/SettingsView.xaml.cs
View File

@ -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)

2
FModel/Views/Snooper/Camera.cs
View File

@ -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: