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

FModel v4.4.3.3

Browse Source
This commit is contained in:
Asval 2023-08-27 19:03:46 +02:00
parent 53bfbedefa
commit a1494bf2e1
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 03adf9bfeddeda725cbbdfa7951e51ff61f0801d
Subproject commit 86d95053f04184fe7fb36ab57bf0c967221ef7d3

6
FModel/FModel.csproj
View File

@ -5,9 +5,9 @@
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>FModel.ico</ApplicationIcon>
<Version>4.4.3.2</Version>
<AssemblyVersion>4.4.3.2</AssemblyVersion>
<FileVersion>4.4.3.2</FileVersion>
<Version>4.4.3.3</Version>
<AssemblyVersion>4.4.3.3</AssemblyVersion>
<FileVersion>4.4.3.3</FileVersion>
<IsPackable>false</IsPackable>
<IsPublishable>true</IsPublishable>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

1
FModel/Settings/UserSettings.cs
View File

@ -31,6 +31,7 @@ namespace FModel.Settings
public static void Save()
{
if (Default == null) return;
Default.PerDirectory[Default.CurrentDir.GameDirectory] = Default.CurrentDir;
File.WriteAllText(FilePath, JsonConvert.SerializeObject(Default, Formatting.Indented));
}

2
FModel/ViewModels/ApplicationViewModel.cs
View File

@ -56,7 +56,6 @@ public class ApplicationViewModel : ViewModel
public SettingsViewModel SettingsView { get; }
public AesManagerViewModel AesManager { get; }
public AudioPlayerViewModel AudioPlayer { get; }
public MapViewerViewModel MapViewer { get; }
private OodleCompressor _oodle;
public ApplicationViewModel()
@ -83,7 +82,6 @@ public class ApplicationViewModel : ViewModel
CustomDirectories = new CustomDirectoriesViewModel();
SettingsView = new SettingsViewModel();
AesManager = new AesManagerViewModel(CUE4Parse);
MapViewer = new MapViewerViewModel(CUE4Parse);
AudioPlayer = new AudioPlayerViewModel();
Status.SetStatus(EStatusKind.Ready);

2
FModel/Views/DirectorySelector.xaml
View File

@ -36,7 +36,7 @@
<GroupBox Grid.Row="1" adonisExtensions:LayerExtension.Layer="2" Margin="10 10 10 18"
Padding="{adonisUi:Space 0}" Background="Transparent">
<StackPanel>
<Grid Margin="0 5">
<Grid x:Name="Hello" Margin="0 5">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />

5
FModel/Views/Snooper/Shading/Material.cs
View File

@ -98,7 +98,7 @@ public class Material : IDisposable
}
{ // ambient occlusion + color boost
if (Parameters.TryGetTexture2d(out var original, "M", "AEM", "AO") &&
if (Parameters.TryGetTexture2d(out var original, "M", "AEM", "AO", "Mask") &&
!original.Name.Equals("T_BlackMask") && options.TryGetTexture(original, false, out var transformed))
{
HasAo = true;
@ -133,7 +133,8 @@ public class Material : IDisposable
"EmissiveUVPositioning (RG)UpperLeft (BA)LowerRight"))
EmissiveRegion = new Vector4(EmissiveUVs.R, EmissiveUVs.G, EmissiveUVs.B, EmissiveUVs.A);
if (Parameters.TryGetSwitch(out var swizzleRoughnessToGreen, "SwizzleRoughnessToGreen") && swizzleRoughnessToGreen)
if ((Parameters.TryGetSwitch(out var swizzleRoughnessToGreen, "SwizzleRoughnessToGreen") && swizzleRoughnessToGreen) ||
Parameters.Textures.ContainsKey("SRM"))
{
foreach (var specMask in SpecularMasks)
{