Update v3.0.3.4

TexTools · Jul 8, 2024 · de01be4 · de01be4
2 parents 0c472c6 + 5ca8ba6
commit de01be4
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 11 deletions.
diff --git a/FFXIV_TexTools/App.config b/FFXIV_TexTools/App.config
@@ -150,6 +150,9 @@
           <setting name="CompressEndwalkerUpgradeTextures" serializeAs="String">
               <value>True</value>
           </setting>
+          <setting name="UseImportedTangents" serializeAs="String">
+              <value>False</value>
+          </setting>
       </FFXIV_TexTools.Properties.Settings>
   </userSettings>
   <runtime>

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
 
-    <ApplicationVersion>3.0.3.3</ApplicationVersion>
-    <AssemblyVersion>3.0.3.3</AssemblyVersion>
-    <FileVersion>3.0.3.3</FileVersion>
+    <ApplicationVersion>3.0.3.4</ApplicationVersion>
+    <AssemblyVersion>3.0.3.4</AssemblyVersion>
+    <FileVersion>3.0.3.4</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/Properties/Settings.Designer.cs b/FFXIV_TexTools/Properties/Settings.Designer.cs
diff --git a/FFXIV_TexTools/Properties/Settings.settings b/FFXIV_TexTools/Properties/Settings.settings
@@ -140,5 +140,8 @@
     <Setting Name="CompressEndwalkerUpgradeTextures" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="UseImportedTangents" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git 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/CustomizeSettingsView.xaml b/FFXIV_TexTools/Views/CustomizeSettingsView.xaml
@@ -25,7 +25,13 @@
         <ToolTip x:Key="ModelingToolTooltip">Affects the behavior of FBX file export.</ToolTip>
         <ToolTip x:Key="CompleteSkeletonsTooltip">Include all available bones when exporting models, even if they are not currently used.</ToolTip>
 
-        <ToolTip x:Key="ShiftModelUvsTooltip">Shift exported Model UVs by V+1.</ToolTip>
+        <ToolTip x:Key="ShiftModelUvsTooltip">
+            <TextBlock>
+                Shift exported Model UVs by V+1 after flipping.
+                <LineBreak/>This helps account for conversions in UV addressing space on XIV models.
+                <LineBreak/>Which helps bring them into normal UV [1/1] space when exporting FBX or other 0-is-bottom-left formats.
+            </TextBlock>
+        </ToolTip>
         <ToolTip x:Key="AutoAssignBodyTooltip">Automatically fix Bibo+/Gen3 body materials when they are on the wrong material ID.</ToolTip>
 
 

diff --git a/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs b/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs
@@ -129,6 +129,7 @@ public FileListExporter(IEnumerable<string> files)
             FileList.SetFiles(files);
 
             ModpackAuthor = Properties.Settings.Default.Default_Author;
+            ModpackUrl = Properties.Settings.Default.Default_Modpack_Url;
             ModpackVersion = "1.0";
 
             FileList.SelectionChanged += FileList_SelectionChanged;

diff --git 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">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="60"></RowDefinition>
-            <RowDefinition Height="120"></RowDefinition>
+            <RowDefinition Height="160"></RowDefinition>
             <RowDefinition Height="40"></RowDefinition>
             <RowDefinition Height="1*"></RowDefinition>
         </Grid.RowDefinitions>
@@ -36,6 +36,7 @@
                 <RowDefinition Height ="1*"></RowDefinition>
                 <RowDefinition Height ="1*"></RowDefinition>
                 <RowDefinition Height ="1*"></RowDefinition>
+                <RowDefinition Height ="1*"></RowDefinition>
             </Grid.RowDefinitions>
             <CheckBox x:Name="UseOriginalShapeDataButton" Content="Use Original Shape Data" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="0" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Enable the model's original shape data. (Should be ON for Faces)"  IsEnabled="{Binding Path=ComplexOptionsEnabled}"/>
             <CheckBox x:Name="ClearUV2Button" Content="Clear UV2" Style="{DynamicResource SimpleCheckBox}" Grid.Row="0" Grid.Column="1"  VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Reset the second UV layer to [0,0]" />
@@ -47,6 +48,9 @@
 
             <CheckBox x:Name="OverrideRaceButton" Content="Override Incoming Race:" Style="{DynamicResource SimpleCheckBox}" Grid.Row="2" Grid.Column="1" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Make TexTools convert your model from a different race to appropriate one for this item." />
             <ComboBox Grid.Row="2" Grid.Column="2" x:Name="RaceComboBox" Width="200" VerticalAlignment="Center"></ComboBox>
+
+            <CheckBox x:Name="UseImportedTangentButton" Content="Use Imported Tangents" Style="{DynamicResource SimpleCheckBox}" Grid.Row="3" Grid.Column="0" VerticalContentAlignment="Center" VerticalAlignment="Center" ToolTipService.ShowOnDisabled="True" ToolTip="Use Tangent/Binormal Data from the imported file, rather than recalculating it."  />
+
         </Grid>
         <UniformGrid Margin="10,5,10,5" Columns="3" Grid.Row="2">
             <Button x:Name="CancelButton" Content="Cancel" Margin="0,0,10,0" Click="CancelButton_Click"  />

diff --git a/FFXIV_TexTools/Views/Models/ImportModelView.xaml.cs b/FFXIV_TexTools/Views/Models/ImportModelView.xaml.cs
@@ -155,6 +155,7 @@ public void EnableAll(bool enabled)
             CloneUV1Button.IsEnabled = enabled;
             ClearVColorButton.IsEnabled = enabled;
             ClearVAlphaButton.IsEnabled = enabled;
+            UseImportedTangentButton.IsEnabled = enabled;
             UseOriginalShapeDataButton.IsEnabled = enabled;
             ShiftUVsButton.IsEnabled = enabled;
             FileNameTextBox.IsEnabled = enabled;

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
+33 −4		xivModdingFramework/Models/DataContainers/TTModel.cs
+2 −0		xivModdingFramework/Models/Helpers/ModelModifiers.cs
+7 −6		xivModdingFramework/Models/ModelTextures/ModelTexture.cs
+10 −0		xivModdingFramework/Resources/SQL/CreateImportDB.sql