FModel v4.4.3.3

4sval · Aug 27, 2023 · a1494bf · a1494bf
1 parent 53bfbed
commit a1494bf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -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>

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

diff --git a/FModel/ViewModels/ApplicationViewModel.cs b/FModel/ViewModels/ApplicationViewModel.cs
@@ -56,7 +56,6 @@ public FStatus Status
     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 ApplicationViewModel()
         CustomDirectories = new CustomDirectoriesViewModel();
         SettingsView = new SettingsViewModel();
         AesManager = new AesManagerViewModel(CUE4Parse);
-        MapViewer = new MapViewerViewModel(CUE4Parse);
         AudioPlayer = new AudioPlayerViewModel();
 
         Status.SetStatus(EStatusKind.Ready);

diff --git a/FModel/Views/DirectorySelector.xaml b/FModel/Views/DirectorySelector.xaml
@@ -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" />

diff --git a/FModel/Views/Snooper/Shading/Material.cs b/FModel/Views/Snooper/Shading/Material.cs
@@ -98,7 +98,7 @@ public void Setup(Options options, int uvCount)
             }
 
             {   // 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 void Setup(Options options, int uvCount)
                         "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)
                     {