diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj index 00ffb68f..e454ac1b 100644 --- a/FFXIV_TexTools/FFXIV_TexTools.csproj +++ b/FFXIV_TexTools/FFXIV_TexTools.csproj @@ -23,9 +23,9 @@ FFXIV_TexTools Copyright © 2024 - 3.0.8.5 - 3.0.8.5 - 3.0.8.5 + 3.0.8.6 + 3.0.8.6 + 3.0.8.6 9.0 true diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml index 31ce436d..cf470ac2 100644 --- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml +++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml @@ -229,7 +229,7 @@ - + @@ -243,17 +243,17 @@ - - + + - - + + - - + + - - + + diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs index fd51b686..7bc8030a 100644 --- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs +++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs @@ -226,10 +226,10 @@ public ColorsetFileControl() AnisotropyBlendingBox.TextChanged += ValueChanged; ShaderTemplateBox.TextChanged += ValueChanged; - FresnelAlbedoBox.TextChanged += ValueChanged; - FresnelUnknownBox.TextChanged += ValueChanged; - FresnelYBox.TextChanged += ValueChanged; - FresnelZBox.TextChanged += ValueChanged; + SheenTintRateBox.TextChanged += ValueChanged; + SheenUnknownBox.TextChanged += ValueChanged; + SheenRateBox.TextChanged += ValueChanged; + SheenApertureBox.TextChanged += ValueChanged; DyePreviewIdBox.ItemsSource = PreviewDyeCollection; @@ -469,17 +469,17 @@ private void SetDyeBitLabels() if (Material == null || Material.ShaderPack != ShaderHelpers.EShaderPack.CharacterLegacy) { DyeBit0.Content = "Dye Diffuse"; - DyeBit1.Content = "Dye Specular(?)"; + DyeBit1.Content = "Dye Specular"; DyeBit2.Content = "Dye Emissive"; - DyeBit3.Content = "Dye Emissive Alpha(?)"; + DyeBit3.Content = "Dye Emissive Unknown"; DyeBit4.Content = "Dye Metallic"; DyeBit5.Content = "Dye Roughness"; - DyeBit6.Content = "Dye Fresnel Y"; - DyeBit7.Content = "Dye Fresnel Z"; - DyeBit8.Content = "Dye Fresnel Albedo"; + DyeBit6.Content = "Dye Sheen Rate"; + DyeBit7.Content = "Dye Sheen Aperture"; + DyeBit8.Content = "Dye Sheen Tint Rate"; DyeBit9.Content = "Dye Anisotropy"; - DyeBit10.Content = "Dye Shader Effect"; - DyeBit11.Content = "Dye Effect Opacity"; + DyeBit10.Content = "Dye Sphere Map ID"; + DyeBit11.Content = "Dye Sphere Map Opacity"; DyeBit5.Visibility = Visibility.Visible; DyeBit6.Visibility = Visibility.Visible; DyeBit7.Visibility = Visibility.Visible; @@ -699,10 +699,10 @@ private async Task SetRow(int rowNumber) EmissAlphaBox.Text = RowData[2][3].ToString(); - FresnelYBox.Text = RowData[3][0].ToString(); - FresnelAlbedoBox.Text = RowData[3][1].ToString(); - FresnelZBox.Text = RowData[3][2].ToString(); - FresnelUnknownBox.Text = RowData[3][3].ToString(); + SheenRateBox.Text = RowData[3][0].ToString(); + SheenTintRateBox.Text = RowData[3][1].ToString(); + SheenApertureBox.Text = RowData[3][2].ToString(); + SheenUnknownBox.Text = RowData[3][3].ToString(); RoughnessBox.Text = RowData[4][0].ToString(); @@ -1082,19 +1082,19 @@ private async Task UpdateRow() fl = 0.0f; - float.TryParse(FresnelYBox.Text, out fl); + float.TryParse(SheenRateBox.Text, out fl); RowData[3][0] = new Half(fl); fl = 0.0f; - float.TryParse(FresnelAlbedoBox.Text, out fl); + float.TryParse(SheenTintRateBox.Text, out fl); RowData[3][1] = new Half(fl); fl = 0.0f; - float.TryParse(FresnelZBox.Text, out fl); + float.TryParse(SheenApertureBox.Text, out fl); RowData[3][2] = new Half(fl); fl = 0.0f; - float.TryParse(FresnelUnknownBox.Text, out fl); + float.TryParse(SheenUnknownBox.Text, out fl); RowData[3][3] = new Half(fl); fl = 0.0f; diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs index 2e70a7e0..c9a8608d 100644 --- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs +++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs @@ -332,7 +332,14 @@ private void LoadOrCreateJson() Results = new PenumbraUpgradeStatus(); } + if (!Directory.Exists(PenumbraPath)) + { + this.ShowWarning("Invalid Penumbra Path", "The selected Penumbra Libraray path does not exist."); + return; + } + var di = new DirectoryInfo(PenumbraPath); + var children = di.EnumerateDirectories().ToList(); foreach(var c in children) diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework index 1d886beb..2c10f5b5 160000 --- a/lib/xivModdingFramework +++ b/lib/xivModdingFramework @@ -1 +1 @@ -Subproject commit 1d886bebca17821ea5c85c6abe9ff64e1e02ee69 +Subproject commit 2c10f5b566f79f41073a91bb3a07ebf0cb84f9ae