From a74aa35f24809685981317ef4c9894d3478e89b9 Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Sun, 7 Jul 2024 23:33:01 -0400 Subject: [PATCH 1/5] Tooltips. --- FFXIV_TexTools/Views/CustomizeSettingsView.xaml | 8 +++++++- lib/xivModdingFramework | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/FFXIV_TexTools/Views/CustomizeSettingsView.xaml b/FFXIV_TexTools/Views/CustomizeSettingsView.xaml index e738d826..a9b40ebf 100644 --- a/FFXIV_TexTools/Views/CustomizeSettingsView.xaml +++ b/FFXIV_TexTools/Views/CustomizeSettingsView.xaml @@ -25,7 +25,13 @@ Affects the behavior of FBX file export. Include all available bones when exporting models, even if they are not currently used. - Shift exported Model UVs by V+1. + + + Shift exported Model UVs by V+1 after flipping. + This helps account for conversions in UV addressing space on XIV models. + Which helps bring them into normal UV [1/1] space when exporting FBX or other 0-is-bottom-left formats. + + Automatically fix Bibo+/Gen3 body materials when they are on the wrong material ID. diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index 9b3d171c..d3308f9e 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit 9b3d171cf9af54403126255fc903eca174dd4bd1 +Subproject commit d3308f9ec52e0ca8c7f36435f06e0b5e66aadf36 From 4602ee74c206d6cdf24815c9faa53a310212bbea Mon Sep 17 00:00:00 2001 From: Lunaretic Date: Mon, 8 Jul 2024 01:03:45 -0400 Subject: [PATCH 2/5] Add external tangent settings. --- FFXIV_TexTools/App.config | 3 +++ FFXIV_TexTools/Properties/Settings.Designer.cs | 12 ++++++++++++ FFXIV_TexTools/Properties/Settings.settings | 3 +++ .../ViewModels/ImportModelViewModel.cs | 16 ++++++++++++---- FFXIV_TexTools/Views/Models/ImportModelView.xaml | 8 ++++++-- .../Views/Models/ImportModelView.xaml.cs | 1 + 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/FFXIV_TexTools/App.config b/FFXIV_TexTools/App.config index 0e3b6695..8b0fec19 100644 --- a/FFXIV_TexTools/App.config +++ b/FFXIV_TexTools/App.config @@ -150,6 +150,9 @@ True + + False + diff --git a/FFXIV_TexTools/Properties/Settings.Designer.cs b/FFXIV_TexTools/Properties/Settings.Designer.cs index 45818486..7d21b4e6 100644 --- a/FFXIV_TexTools/Properties/Settings.Designer.cs +++ b/FFXIV_TexTools/Properties/Settings.Designer.cs @@ -574,5 +574,17 @@ public bool CompressEndwalkerUpgradeTextures { this["CompressEndwalkerUpgradeTextures"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool UseImportedTangents { + get { + return ((bool)(this["UseImportedTangents"])); + } + set { + this["UseImportedTangents"] = value; + } + } } } diff --git a/FFXIV_TexTools/Properties/Settings.settings b/FFXIV_TexTools/Properties/Settings.settings index 9dc210d2..ef8be206 100644 --- a/FFXIV_TexTools/Properties/Settings.settings +++ b/FFXIV_TexTools/Properties/Settings.settings @@ -140,5 +140,8 @@ True + + False + \ No newline at end of file diff --git a/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs b/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs index 91a10d41..7742d274 100644 --- a/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs +++ b/FFXIV_TexTools/ViewModels/ImportModelViewModel.cs @@ -206,6 +206,7 @@ public ImportModelViewModel(ImportModelView view, string internalPath, IItem ref _view.OverrideRaceButton.Unchecked += OverrideRaceButton_Unchecked; _view.ShiftUVsButton.IsChecked = Settings.Default.ShiftImportUV; + _view.UseImportedTangentButton.IsChecked = Settings.Default.UseImportedTangents; // Default Settings for specific categories, event handlers are added to allow users to opt out of these defaults if (referenceItem != null) @@ -218,11 +219,12 @@ public ImportModelViewModel(ImportModelView view, string internalPath, IItem ref { _view.CloneUV1Button.IsChecked = Settings.Default.CloneUV1toUV2ForHair; } - - _view.UseOriginalShapeDataButton.Click += UseOriginalShapeDataButton_Clicked; - _view.CloneUV1Button.Click += CloneUV1Button_Clicked; - _view.ShiftUVsButton.Click += ForceUVsButton_Clicked; } + + _view.UseOriginalShapeDataButton.Click += UseOriginalShapeDataButton_Clicked; + _view.CloneUV1Button.Click += CloneUV1Button_Clicked; + _view.ShiftUVsButton.Click += ForceUVsButton_Clicked; + _view.UseImportedTangentButton.Click += UseExternalTangents_Clicked; } private void UseOriginalShapeDataButton_Clicked(object sender, RoutedEventArgs e) @@ -243,6 +245,11 @@ private void ForceUVsButton_Clicked(object sender, RoutedEventArgs e) Settings.Default.Save(); } + private void UseExternalTangents_Clicked(object sender, RoutedEventArgs e) + { + Settings.Default.UseImportedTangents = _view.UseImportedTangentButton.IsChecked == true; + Settings.Default.Save(); + } private void OverrideRaceButton_Checked(object sender, RoutedEventArgs e) { @@ -337,6 +344,7 @@ private async Task DoImport(bool showEditor) options.ClearVAlpha = _view.ClearVAlphaButton.IsChecked == true ? true : false; options.ClearVColor = _view.ClearVColorButton.IsChecked == true ? true : false; options.AutoScale = _view.AutoScaleButton.IsChecked == true ? true : false; + options.UseImportedTangents = _view.UseImportedTangentButton.IsChecked == true ? true : false; options.SourceApplication = XivStrings.TexTools; diff --git a/FFXIV_TexTools/Views/Models/ImportModelView.xaml b/FFXIV_TexTools/Views/Models/ImportModelView.xaml index ac98a34e..8e28098d 100644 --- a/FFXIV_TexTools/Views/Models/ImportModelView.xaml +++ b/FFXIV_TexTools/Views/Models/ImportModelView.xaml @@ -7,11 +7,11 @@ xmlns:resx="clr-namespace:FFXIV_TexTools.Resources" resx:Localization.Enabled="True" mc:Ignorable="d" - Title="Model Importer" Height="250" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" WindowStartupLocation="CenterOwner" FontSize="14" Width="640" ResizeMode="NoResize"> + Title="Model Importer" Height="290" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" WindowStartupLocation="CenterOwner" FontSize="14" Width="640" ResizeMode="NoResize"> - + @@ -36,6 +36,7 @@ + @@ -47,6 +48,9 @@ + + +