Update v3.0.8.6

TexTools · Aug 14, 2024 · 36ad411 · 36ad411
2 parents decdf96 + 34dea9b
commit 36ad411
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 32 deletions.
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.8.5</ApplicationVersion>
-    <AssemblyVersion>3.0.8.5</AssemblyVersion>
-    <FileVersion>3.0.8.5</FileVersion>
+    <ApplicationVersion>3.0.8.6</ApplicationVersion>
+    <AssemblyVersion>3.0.8.6</AssemblyVersion>
+    <FileVersion>3.0.8.6</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
@@ -229,7 +229,7 @@
 
                             </Grid>
                         </GroupBox>
-                        <GroupBox Grid.Row="5" Header="Fresnel Settings" x:Name="FresnelGroup">
+                        <GroupBox Grid.Row="5" Header="Sheen/Fresnel Settings" x:Name="FresnelGroup">
                             <Grid>
 
                                 <Grid.ColumnDefinitions>
@@ -243,17 +243,17 @@
                                     <RowDefinition Height="35"></RowDefinition>
                                 </Grid.RowDefinitions>
 
-                                <Label Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" VerticalAlignment="Center">Fresnel Y Term:</Label>
-                                <TextBox x:Name="FresnelYBox" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
+                                <Label Grid.Column="0" Grid.Row="0" HorizontalContentAlignment="Right" VerticalAlignment="Center">Sheen Rate:</Label>
+                                <TextBox x:Name="SheenRateBox" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
 
-                                <Label Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" VerticalAlignment="Center">Fresnel Albedo:</Label>
-                                <TextBox x:Name="FresnelAlbedoBox" Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
+                                <Label Grid.Column="2" Grid.Row="0" HorizontalContentAlignment="Right" VerticalAlignment="Center">Sheen Tint Rate:</Label>
+                                <TextBox x:Name="SheenTintRateBox" Grid.Column="3" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
 
-                                <Label Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" VerticalAlignment="Center">Fresnel Z Ramp:</Label>
-                                <TextBox x:Name="FresnelZBox" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
+                                <Label Grid.Column="0" Grid.Row="1" HorizontalContentAlignment="Right" VerticalAlignment="Center">Sheen Aperture:</Label>
+                                <TextBox x:Name="SheenApertureBox" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
 
-                                <Label Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" VerticalAlignment="Center">Fresnel Unknown?:</Label>
-                                <TextBox x:Name="FresnelUnknownBox" Grid.Column="3" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
+                                <Label Grid.Column="2" Grid.Row="1" HorizontalContentAlignment="Right" VerticalAlignment="Center">Sheen Unknown?:</Label>
+                                <TextBox x:Name="SheenUnknownBox" Grid.Column="3" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"></TextBox>
 
                             </Grid>
                         </GroupBox>

diff --git 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
@@ -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
+0 −8		xivModdingFramework/Materials/DataContainers/XivMtrl.cs
+13 −0		xivModdingFramework/Models/DataContainers/TTModel.cs
+2 −1		xivModdingFramework/Mods/FileTypes/PMP.cs
+5 −1		xivModdingFramework/Mods/Modding.cs