Merge pull request #582 from Ka1serM/dev

make HDR export optional

Author: 4sval

CUE4Parse

@@ -123,15 +123,9 @@ private string GetCosmeticSeason(string seasonNumber, bool bShort)
     {
         if (!bShort) return base.GetCosmeticSeason(seasonNumber);
         var s = seasonNumber["Cosmetics.Filter.Season.".Length..];
-        (int chapterIdx, int seasonIdx) = GetInternalSID(int.Parse(s));
-        return s switch
-        {
-            "10" => $"C{chapterIdx} SX",
-            "27" => $"Fortnite: OG",
-            "32" => $"Fortnite: Remix",
-            "35" => $"C{chapterIdx} MS1",
-            _ => $"C{chapterIdx} S{seasonIdx}"
-        };
+        (string chapterIdx, string seasonIdx, bool onlySeason) = GetInternalSID(s);
+        var prefix = int.TryParse(seasonIdx, out _) ? "S" : "";
+        return onlySeason ? $"{prefix}{seasonIdx}" : $"C{chapterIdx} {prefix}{seasonIdx}";
     }
 
     private new void DrawBackground(SKCanvas c)

FModel/Creator/Bases/FN/BaseCommunity.cs

@@ -221,55 +221,32 @@ protected string GetCosmeticSet(string setName)
         return Utils.RemoveHtmlTags(string.Format(format, name));
     }
 
-    protected (int, int) GetInternalSID(int number)
+    protected (string, string, bool) GetInternalSID(string number)
     {
-        static int GetSeasonsInChapter(int chapter) => chapter switch
-        {
-            1 => 10,
-            2 => 8,
-            3 => 4,
-            4 => 5,
-            5 => 5,
-            _ => 10
-        };
-
-        var chapterIdx = 0;
-        var seasonIdx = 0;
-        while (number > 0)
-        {
-            var seasonsInChapter = GetSeasonsInChapter(++chapterIdx);
-            if (number > seasonsInChapter)
-                number -= seasonsInChapter;
-            else
-            {
-                seasonIdx = number;
-                number = 0;
-            }
-        }
-        return (chapterIdx, seasonIdx);
+        if (!Utils.TryLoadObject("FortniteGame/Plugins/GameFeatures/BattlePassBase/Content/DataTables/Athena_SeasonTitles.Athena_SeasonTitles", out UDataTable seasonTitles) ||
+            !seasonTitles.TryGetDataTableRow(number, StringComparison.InvariantCulture, out var row) ||
+            !row.TryGetValue(out FText chapterText, "DisplayChapterText") ||
+            !row.TryGetValue(out FText seasonText, "DisplaySeasonText") ||
+            !row.TryGetValue(out FName displayType, "DisplayType"))
+            return (string.Empty, string.Empty, true);
+
+        var onlySeason = displayType.Text.EndsWith("::OnlySeason") || (chapterText.Text == seasonText.Text && !int.TryParse(seasonText.Text, out _));
+        return (chapterText.Text, seasonText.Text, onlySeason);
     }
 
     protected string GetCosmeticSeason(string seasonNumber)
     {
         var s = seasonNumber["Cosmetics.Filter.Season.".Length..];
-        var initial = int.Parse(s);
-        (int chapterIdx, int seasonIdx) = GetInternalSID(initial);
+        (string chapterIdx, string seasonIdx, bool onlySeason) = GetInternalSID(s);
 
         var season = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "SeasonTextFormat", "Season {0}");
         var introduced = Utils.GetLocalizedResource("Fort.Cosmetics", "CosmeticItemDescription_Season", "\nIntroduced in <SeasonText>{0}</>.");
-        if (s == "10") return Utils.RemoveHtmlTags(string.Format(introduced, string.Format(season, "X")));
-        if (initial <= 10) return Utils.RemoveHtmlTags(string.Format(introduced, string.Format(season, s)));
+        if (onlySeason) return Utils.RemoveHtmlTags(string.Format(introduced, string.Format(season, seasonIdx)));
 
         var chapter = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "ChapterTextFormat", "Chapter {0}");
         var chapterFormat = Utils.GetLocalizedResource("AthenaSeasonItemDefinitionInternal", "ChapterSeasonTextFormat", "{0}, {1}");
         var d = string.Format(chapterFormat, string.Format(chapter, chapterIdx), string.Format(season, seasonIdx));
-        return s switch
-        {
-            "27" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format("Fortnite: OG"))),
-            "32" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format("Fortnite: Remix"))),
-            "35" => Utils.RemoveHtmlTags(string.Format(introduced, string.Format(chapterFormat, string.Format(chapter, chapterIdx), string.Format("MS1")))),
-            _ => Utils.RemoveHtmlTags(string.Format(introduced, d))
-        };
+        return Utils.RemoveHtmlTags(string.Format(introduced, d));
     }
 
     protected void CheckGameplayTags(FInstancedStruct[] dataList)

FModel/Creator/Bases/FN/BaseIcon.cs

@@ -73,7 +73,8 @@ public static bool IsEndpointValid(EEndpointType type, out EndpointSettings endp
             CompressionFormat = Default.CompressionFormat,
             Platform = Default.CurrentDir.TexturePlatform,
             ExportMorphTargets = Default.SaveMorphTargets,
-            ExportMaterials = Default.SaveEmbeddedMaterials
+            ExportMaterials = Default.SaveEmbeddedMaterials,
+            ExportHdrTexturesAsHdr = Default.SaveHdrTexturesAsHdr
         };
 
         private bool _showChangelog = true;
@@ -508,5 +509,12 @@ public bool SaveSkeletonAsMesh
             get => _saveSkeletonAsMesh;
             set => SetProperty(ref _saveSkeletonAsMesh, value);
         }
+
+        private bool _saveHdrTexturesAsHdr = true;
+        public bool SaveHdrTexturesAsHdr
+        {
+            get => _saveHdrTexturesAsHdr;
+            set => SetProperty(ref _saveHdrTexturesAsHdr, value);
+        }
     }
 }

FModel/Settings/UserSettings.cs

@@ -30,7 +30,7 @@
 using CUE4Parse.UE4.Localization;
 using CUE4Parse.UE4.Objects.Core.Serialization;
 using CUE4Parse.UE4.Objects.Engine;
-using CUE4Parse.UE4.Oodle.Objects;
+using CUE4Parse.UE4.Oodle.Objects;
 using CUE4Parse.UE4.Pak;
 using CUE4Parse.UE4.Readers;
 using CUE4Parse.UE4.Shaders;
@@ -39,6 +39,7 @@
 using CUE4Parse_Conversion;
 using CUE4Parse_Conversion.Sounds;
 using CUE4Parse.FileProvider.Objects;
+using CUE4Parse.GameTypes.AshEchoes.FileProvider;
 using CUE4Parse.UE4.Assets;
 using CUE4Parse.UE4.BinaryConfig;
 using CUE4Parse.UE4.Objects.UObject;

FModel/ViewModels/CUE4ParseViewModel.cs

@@ -105,7 +105,7 @@ private void SetImage(CTexture bitmap)
 
         if (PixelFormatUtils.IsHDR(bitmap.PixelFormat) || (UserSettings.Default.TextureExportFormat != ETextureFormat.Jpeg && UserSettings.Default.TextureExportFormat != ETextureFormat.Png))
         {
-            ImageBuffer = bitmap.Encode(UserSettings.Default.TextureExportFormat, out var ext);
+            ImageBuffer = bitmap.Encode(UserSettings.Default.TextureExportFormat, UserSettings.Default.SaveHdrTexturesAsHdr, out var ext);
             ExportName += "." + ext;
         }
         else

FModel/ViewModels/TabControlViewModel.cs

@@ -323,6 +323,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -495,6 +496,11 @@
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
                     </ComboBox>
+
+                    <TextBlock Grid.Row="20" Grid.Column="0" Text="Save HDR Textures as Radiance .hdr" VerticalAlignment="Center" />
+                    <CheckBox Grid.Row="20" Grid.Column="2" Grid.ColumnSpan="3" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
+                              IsChecked="{Binding SaveHdrTexturesAsHdr, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
+                              Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 5"/>
                 </Grid>
             </DataTemplate>
             <DataTemplate x:Key="KeybindingsTemplate">