From b367bcd985c268767c6079161774a1e658b48e79 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Mon, 15 Jul 2024 20:24:23 -0400
Subject: [PATCH 1/6] asdf

---
 FFXIV_TexTools/FFXIV_TexTools.csproj          |  6 +++---
 FFXIV_TexTools/Views/OnboardingWindow.xaml.cs | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index e2674c36..aa056c7c 100644
--- 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.6.4</ApplicationVersion>
-    <AssemblyVersion>3.0.6.4</AssemblyVersion>
-    <FileVersion>3.0.6.4</FileVersion>
+    <ApplicationVersion>3.0.6.5</ApplicationVersion>
+    <AssemblyVersion>3.0.6.5</AssemblyVersion>
+    <FileVersion>3.0.6.5</FileVersion>
     
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>
diff --git a/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs b/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs
index 0c7beec0..4b79b1e9 100644
--- a/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/OnboardingWindow.xaml.cs
@@ -185,7 +185,17 @@ public static void OnboardAndInitialize()
                 return;
             }
 
-            InitializeSettings();
+            try
+            {
+                InitializeSettings();
+            }
+            catch
+            {
+                ViewHelpers.ShowError("Initialization Failure", "TexTools was unable to initialize all startup directories properly.\n\nPlease check your folder paths are valid and accessible.");
+                DoOnboarding();
+                return;
+            }
+
             CheckRerunAdmin();
             ValidateModlist();
         }

From 702c1d1dd0451841b9bd5fd8941831467620f6f3 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Mon, 15 Jul 2024 23:26:30 -0400
Subject: [PATCH 2/6] ver

---
 FFXIV_TexTools/FFXIV_TexTools.csproj | 6 +++---
 lib/xivModdingFramework              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index aa056c7c..056cf820 100644
--- 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.6.5</ApplicationVersion>
-    <AssemblyVersion>3.0.6.5</AssemblyVersion>
-    <FileVersion>3.0.6.5</FileVersion>
+    <ApplicationVersion>3.0.6.7</ApplicationVersion>
+    <AssemblyVersion>3.0.6.7</AssemblyVersion>
+    <FileVersion>3.0.6.7</FileVersion>
     
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 903d33b8..5ee12a4d 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 903d33b8036a90ee04e0fe912eb23a1bcfca94da
+Subproject commit 5ee12a4d61d1365868880521863c4055ed188ac9

From f683917c5f0f09f0d0a30adda78ff257c5dc32d9 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Mon, 15 Jul 2024 23:28:26 -0400
Subject: [PATCH 3/6] Don't let error prompts crash us.

---
 FFXIV_TexTools/Views/ViewHelpers.cs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/FFXIV_TexTools/Views/ViewHelpers.cs b/FFXIV_TexTools/Views/ViewHelpers.cs
index ac66676c..5a3b3aa6 100644
--- a/FFXIV_TexTools/Views/ViewHelpers.cs
+++ b/FFXIV_TexTools/Views/ViewHelpers.cs
@@ -205,13 +205,28 @@ public static void ShowWarning(this UserControl control, string title, string me
 
         public static void ShowError(string title, string message)
         {
-            var wind = MainWindow.GetMainWindow();
-            if (!IsWindowOpen(wind))
+            try
             {
-                wind = null;
+                var wind = MainWindow.GetMainWindow();
+                if (!IsWindowOpen(wind))
+                {
+                    wind = null;
+                }
+                if (wind == null)
+                {
+                    FlexibleMessageBox.Show(message, title, MessageBoxButtons.OK, MessageBoxIcon.Error,
+                        MessageBoxDefaultButton.Button1);
+                }
+                else
+                {
+                    FlexibleMessageBox.Show(wind.Win32Window, message, title, MessageBoxButtons.OK, MessageBoxIcon.Error,
+                        MessageBoxDefaultButton.Button1);
+                }
+            }
+            catch(Exception ex)
+            {
+                Trace.WriteLine(ex);
             }
-            FlexibleMessageBox.Show(wind.Win32Window, message, title, MessageBoxButtons.OK, MessageBoxIcon.Error,
-                MessageBoxDefaultButton.Button1);
         }
         public static bool InfoPrompt(this Window wind, string title, string message)
         {

From 5c79fa9fd4880bc603d1acf992f6e1282a176b68 Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 16 Jul 2024 00:19:16 -0400
Subject: [PATCH 4/6] Add channel based dye options.

---
 .../FileControls/ColorsetFileControl.xaml     | 12 +++-
 .../FileControls/ColorsetFileControl.xaml.cs  | 68 +++++++++++++------
 2 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
index 7a612bfb..9a297c0e 100644
--- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
+++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
@@ -323,7 +323,17 @@
             <Label Content="Preview Dye #" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.ColumnSpan="2" Margin="10,0" Grid.Row="0"/>
             <ComboBox x:Name="DyePreviewIdBox" VerticalAlignment="Center" HorizontalAlignment="Left" Width="150" SelectionChanged="DyePreviewIdBox_SelectionChanged" Grid.ColumnSpan="2" Margin="100,0,0,0" Grid.Row="0"/>
             <Button x:Name="CopyDyeValuesButton" Content="Dye Selected Row" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="1" Width="150" Margin="10,0,0,0" Click="CopyDyeValuesButton_Click"></Button>
-            <Button x:Name="CopyAllDyeValuesButton"  Content="Dye All Rows" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="1" Grid.Row="1" Margin="10,0,0,0" Width="150" Click="CopyAllDyeValuesButton_Click"></Button>
+            <Button x:Name="CopyAllDyeValuesButton"  Content="Dye All Rows" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="1" Grid.Row="1" Margin="10,0,0,0" Width="150" Click="CopyAllDyeValuesButton_Click">
+                <Button.ContextMenu>
+                    <ContextMenu x:Name="DyeContextMenu">
+                        <MenuItem Header="Dye Channel 1" Click="DyeChannel1_Click"/>
+                        <MenuItem Header="Dye Channel 2" Click="DyeChannel2_Click"/>
+                        <MenuItem Header="Dye Channel 3" Click="DyeChannel3_Click"/>
+                        <MenuItem Header="Dye Channel 4" Click="DyeChannel4_Click"/>
+                        <MenuItem Header="Dye All Channels" Click="DyeAllChannels_Click"/>
+                    </ContextMenu>
+                </Button.ContextMenu>
+            </Button>
 
             <hx:Viewport3DX
                         x:Name="ColorsetRowViewport"
diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
index c05cdd5e..a307b18a 100644
--- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
@@ -1498,7 +1498,7 @@ private async void CopyDyeValuesButton_Click(object sender, RoutedEventArgs e)
             {
                 var dyeId = (int)DyePreviewIdBox.SelectedValue;
 
-                ApplyDye(RowId, dyeId);
+                ApplyDye(RowId, dyeId, -1);
 
                 // Reload the UI.
                 await SetMaterial(Material, RowId);
@@ -1510,25 +1510,10 @@ private async void CopyDyeValuesButton_Click(object sender, RoutedEventArgs e)
         }
         private async void CopyAllDyeValuesButton_Click(object sender, RoutedEventArgs e)
         {
-            try
-            {
-                var dyeId = (int)DyePreviewIdBox.SelectedValue;
-                
-                for(int i = 0; i < _rowCount; i++)
-                {
-                    ApplyDye(i, dyeId);
-                }
-
-                // Reload the UI.
-                await SetMaterial(Material, RowId);
-            }
-            catch (Exception ex)
-            {
-                this.ShowError("Unknown Error", "An error occurred:\n\n" + ex.Message);
-            }
+            DyeContextMenu.IsOpen = true;
         }
 
-        private void ApplyDye(int rowId, int dyeId)
+        private void ApplyDye(int rowId, int dyeId, int channel)
         {
             ushort dyeTemplateId = STM.GetTemplateKeyFromMaterialData(Material.ColorSetDyeData, rowId);
             var template = DyeTemplateFile.GetTemplate(dyeTemplateId);
@@ -1557,8 +1542,9 @@ private void ApplyDye(int rowId, int dyeId)
             var rowData = GetRowData(rowId);
             for (int i = 0; i < dyeCount; i++)
             {
+                uint dyeChannel = dyeData << 3 >> 30;
                 var shifted = (uint)(0x1 << i);
-                if ((dyeData & shifted) > 0)
+                if ((dyeData & shifted) > 0 && (dyeChannel == channel || channel < 0))
                 {
                     // Apply this template dye value to the row.
                     var data = template.GetData(i, dyeId);
@@ -1607,5 +1593,49 @@ protected override void FreeManaged()
             }
             CopyUpdated -= OnCopyUpdated;
         }
+
+        private async Task DyeAllRows(int channel)
+        {
+            try
+            {
+                var dyeId = (int)DyePreviewIdBox.SelectedValue;
+
+                for (int i = 0; i < _rowCount; i++)
+                {
+                    ApplyDye(i, dyeId, channel);
+                }
+
+                // Reload the UI.
+                await SetMaterial(Material, RowId);
+            }
+            catch (Exception ex)
+            {
+                this.ShowError("Unknown Error", "An error occurred:\n\n" + ex.Message);
+            }
+        }
+        private void DyeChannel1_Click(object sender, RoutedEventArgs e)
+        {
+            _ = DyeAllRows(0);
+        }
+
+        private void DyeChannel2_Click(object sender, RoutedEventArgs e)
+        {
+            _ = DyeAllRows(1);
+        }
+
+        private void DyeChannel3_Click(object sender, RoutedEventArgs e)
+        {
+            _ = DyeAllRows(2);
+        }
+
+        private void DyeChannel4_Click(object sender, RoutedEventArgs e)
+        {
+            _ = DyeAllRows(3);
+        }
+
+        private void DyeAllChannels_Click(object sender, RoutedEventArgs e)
+        {
+            _ = DyeAllRows(-1);
+        }
     }
 }

From 7d98734a0b47e065d866a55431e9de12e8bfd99b Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 16 Jul 2024 02:30:32 -0400
Subject: [PATCH 5/6] Fixing up the colorset square.

---
 FFXIV_TexTools/MainWindow.xaml.cs             |   1 +
 .../ViewModels/ColorsetEditorViewModel.cs     | 251 +++++++++++-------
 .../FileControls/ColorsetFileControl.xaml     |  15 +-
 .../FileControls/ColorsetFileControl.xaml.cs  |   5 +-
 4 files changed, 171 insertions(+), 101 deletions(-)

diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
index f9604238..9478e1d5 100644
--- a/FFXIV_TexTools/MainWindow.xaml.cs
+++ b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -1665,6 +1665,7 @@ private async void MetroWindow_Closing(object sender, System.ComponentModel.Canc
                 {
                     if(!ViewHelpers.ShowConfirmation(this, "Unsaved Transaction Confirmation", "You have an open transaction, are you sure you wish to close TexTools?\n\nAny un-commited changes will be lost."))
                     {
+                        e.Cancel = true;
                         return;
                     }
                 }
diff --git a/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs b/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
index 0acf2f0d..920afd16 100644
--- a/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/ColorsetEditorViewModel.cs
@@ -1,5 +1,6 @@
 using FFXIV_TexTools.Controls;
 using FFXIV_TexTools.Helpers;
+using FFXIV_TexTools.Views.Controls;
 using HelixToolkit.Wpf.SharpDX;
 using MahApps.Metro.Controls;
 using SharpDX;
@@ -18,15 +19,18 @@
 using xivModdingFramework.General;
 using xivModdingFramework.Materials.DataContainers;
 using xivModdingFramework.Materials.FileTypes;
+using xivModdingFramework.Textures;
 using xivModdingFramework.Textures.DataContainers;
 using xivModdingFramework.Textures.FileTypes;
+using Vector3D = System.Windows.Media.Media3D.Vector3D;
+using WinColor = System.Windows.Media.Color;
 
 namespace FFXIV_TexTools.ViewModels
 {
-    public class ColorsetEditorViewModel : INotifyPropertyChanged
+    public class ColorsetEditorViewModel : INotifyPropertyChanged, IDisposable
     {
         private static XivTex TileTextureNormal;
-        private static XivTex TileTextureDiffuse;
+        private static XivTex TileTextureOrb;
 
         // SharpDX 3D Model Viewing Stuff, which is really all this VM is used for.
         private Viewport3DX _viewport;
@@ -111,7 +115,7 @@ public async Task SetMaterial(XivMtrl mtrl, StainingTemplateFile dyeFile) {
                 {
                     TileTextureNormal = await Tex.GetXivTex("chara/common/texture/tile_norm_array.tex");
                     // This is not the correct usage, but works for the moment.
-                    TileTextureDiffuse = await Tex.GetXivTex("chara/common/texture/tile_orb_array.tex");
+                    TileTextureOrb = await Tex.GetXivTex("chara/common/texture/tile_orb_array.tex");
                 }
                 catch
                 {
@@ -127,7 +131,6 @@ public async Task SetColorsetRow(int row, int columnCount, int dyeId = -1)
 
             try
             {
-                Models.Clear();
                 RowId = row;
 
                 var offset = RowId * columnCount * 4;
@@ -145,45 +148,47 @@ public async Task SetColorsetRow(int row, int columnCount, int dyeId = -1)
 
                 var mg3 = MakeCube();
 
+                var lmMaterial = new PhongMaterial()
+                {
+                    AmbientColor = SharpDX.Color.Gray,
+                };
+                float[] diffuseColor = new float[3];
+                float[] specularColor = new float[3];
+
+
                 var dMax = Math.Max(1.0f, Math.Max(RowData[0][0], Math.Max(RowData[0][1], RowData[0][2])));
                 var sMax = Math.Max(1.0f, Math.Max(RowData[0][0], Math.Max(RowData[0][1], RowData[0][2])));
                 var eMax = Math.Max(1.0f, Math.Max(RowData[0][0], Math.Max(RowData[0][1], RowData[0][2])));
 
-                var dColor = new SharpDX.Color(
-                        (byte)Math.Round(Math.Sqrt(RowData[0][0] / dMax) * 255f),
-                        (byte)Math.Round(Math.Sqrt(RowData[0][1] / dMax) * 255f),
-                        (byte)Math.Round(Math.Sqrt(RowData[0][2] / dMax) * 255f));
-                var sColor = new SharpDX.Color(
-                        (byte)Math.Round(Math.Sqrt(RowData[1][0] / sMax) * 255f),
-                        (byte)Math.Round(Math.Sqrt(RowData[1][1] / sMax) * 255f),
-                        (byte)Math.Round(Math.Sqrt(RowData[1][2] / sMax) * 255f));
+                diffuseColor[0] = RowData[0][0] / dMax;
+                diffuseColor[1] = RowData[0][1] / dMax;
+                diffuseColor[2] = RowData[0][2] / dMax;
+
+                specularColor[0] = RowData[1][0] / sMax;
+                specularColor[1] = RowData[1][1] / sMax;
+                specularColor[2] = RowData[1][2] / sMax;
 
-                var lmMaterial = new PhongMaterial()
-                {
-                    AmbientColor = SharpDX.Color.Gray,
-                    DiffuseColor = dColor,
-                    SpecularColor = sColor
-                };
 
                 if (RowData[2][0] != 0 || RowData[2][1] != 0 || RowData[2][2] != 0)
                 {
                     lmMaterial.EmissiveColor = new SharpDX.Color(
-                        (byte)Math.Round(Math.Sqrt(RowData[2][0] / eMax) * 255f),
-                        (byte)Math.Round(Math.Sqrt(RowData[2][1] / eMax) * 255f),
-                        (byte)Math.Round(Math.Sqrt(RowData[2][2] / eMax) * 255f));
+                    ColorsetFileControl.ColorHalfToByte(RowData[2][0] / eMax),
+                    ColorsetFileControl.ColorHalfToByte(RowData[2][1] / eMax),
+                    ColorsetFileControl.ColorHalfToByte(RowData[2][2] / eMax));
                 }
 
-
-                float glossVal = RowData[1][3];
-                float specularPower = RowData[0][3];
-
-                if (DawnTrail)
+                float glossVal = RowData[0][3];
+                float specularPower = RowData[1][3];
+                float metallicVal = 0;
+                if (!LegacyShader)
                 {
-                    // Values flipped in Dawntrail.
-                    glossVal = RowData[0][3];
-                    specularPower = RowData[1][3];
+                    glossVal = 32 * Math.Max(Math.Min(1, (1 - RowData[4][0])), 0);
+                    metallicVal = Math.Max(Math.Min(1, (1 - RowData[4][2])), 0) ;
+                    specularPower = 1.0f;
                 }
 
+
+
                 if (dyeId >= 0 && dyeId < 128 && _mtrl.ColorSetDyeData.Length > 0)
                 {
                     var templateId = STM.GetTemplateKeyFromMaterialData(_mtrl, RowId);
@@ -212,30 +217,28 @@ public async Task SetColorsetRow(int row, int columnCount, int dyeId = -1)
                         bool useSpecPower = (data & 0x08) > 0;
                         bool useGloss = (data & 0x10) > 0;
 
+                        bool useMetallic = (data & 0x10) != 0;
+                        bool useRoughness = (data & 0x20) != 0;
+
                         var diffuse = template.GetDiffuseData(dyeId);
                         var spec = template.GetSpecularData(dyeId);
                         var emissive = template.GetEmissiveData(dyeId);
-                        var gloss = template.GetGlossData(dyeId);
-                        var specPower = template.GetSpecularPowerData(dyeId);
 
                         if (useDiffuse && diffuse != null)
                         {
                             var max = Math.Max(1.0f, Math.Max(diffuse[0], Math.Max(diffuse[1], diffuse[2])));
+                            diffuseColor[0] = diffuse[0] / max;
+                            diffuseColor[1] = diffuse[1] / max;
+                            diffuseColor[2] = diffuse[2] / max;
 
-                            lmMaterial.DiffuseColor = new SharpDX.Color(
-                            (byte)Math.Round((diffuse[0] / max) * 255f),
-                            (byte)Math.Round((diffuse[1] / max) * 255f),
-                            (byte)Math.Round((diffuse[2] / max) * 255f));
                         }
 
                         if (useSpecular && spec != null)
                         {
                             var max = Math.Max(1.0f, Math.Max(spec[0], Math.Max(spec[1], spec[2])));
-
-                            lmMaterial.SpecularColor = new SharpDX.Color(
-                            (byte)Math.Round((spec[0] / max) * 255f),
-                            (byte)Math.Round((spec[1] / max) * 255f),
-                            (byte)Math.Round((spec[2] / max) * 255f));
+                            specularColor[0] = diffuse[0] / max;
+                            specularColor[1] = diffuse[1] / max;
+                            specularColor[2] = diffuse[2] / max;
                         }
 
                         if (useEmissive && emissive != null)
@@ -243,54 +246,108 @@ public async Task SetColorsetRow(int row, int columnCount, int dyeId = -1)
                             var max = Math.Max(1.0f, Math.Max(emissive[0], Math.Max(emissive[1], emissive[2])));
 
                             lmMaterial.EmissiveColor = new SharpDX.Color(
-                            (byte)Math.Round((emissive[0] / max) * 255f),
-                            (byte)Math.Round((emissive[1] / max) * 255f),
-                            (byte)Math.Round((emissive[2] / max) * 255f));
+                            ColorsetFileControl.ColorHalfToByte(emissive[0] / max),
+                            ColorsetFileControl.ColorHalfToByte(emissive[1] / max),
+                            ColorsetFileControl.ColorHalfToByte(emissive[2] / max));
                         }
 
-                        if(useGloss && LegacyShader && gloss != null)
+
+                        if (LegacyShader)
                         {
-                            glossVal = gloss[0];
+                            var gloss = template.GetGlossData(dyeId);
+                            var specPower = template.GetSpecularPowerData(dyeId);
+                            if (useGloss && gloss != null)
+                            {
+                                glossVal = gloss[0];
+                            }
+
+                            if (useSpecPower && specPower != null)
+                            {
+                                specularPower = specPower[0];
+                            }
                         }
-                        
-                        if(useSpecPower && LegacyShader && specPower != null)
+                        else
                         {
-                            specularPower = specPower[0];
+                            var metallicDye = template.GetData(5, dyeId);
+                            var roughDye = template.GetData(6, dyeId);
+                            if (useMetallic && metallicDye != null)
+                            {
+                                metallicVal = metallicDye[0];
+                            } 
+                            if (useRoughness && roughDye != null)
+                            {
+                                glossVal = 32 * Math.Max(Math.Min(1, (1 - roughDye[0])), 0);
+                            }
                         }
                                                 
                     }
                 }
 
-                // This is some arbitrary math to make the gloss more or less reflected in the visual.
-                glossVal = (glossVal * glossVal) * 10;
-                lmMaterial.SpecularShininess = glossVal;
 
                 if (specularPower == 0)
                 {
                     glossVal = 1;
                 }
 
+                // This is some arbitrary math to make the gloss more or less reflected in the visual.
+                lmMaterial.SpecularShininess = (glossVal * glossVal) + 15;
                 lmMaterial.SpecularColor = lmMaterial.SpecularColor * specularPower;
 
 
 
                 if (TileTextureNormal != null)
                 {
-                    var tm = await MakeTextureModel(TileTextureNormal);
-                    if (tm != null)
+                    var layer = (int)Math.Floor(RowData[6][1] * 64);
+                    if (layer > 63 || layer < 0) layer = 0;
+                    var normData = await TileTextureNormal.GetRawPixels(layer);
+                    lmMaterial.NormalMap = MakeTextureModel(normData);
+
+                    var orbData = await TileTextureOrb.GetRawPixels();
+                    var size = TileTextureOrb.Width * TileTextureOrb.Height * 4;
+                    var specularMask = new byte[size];
+                    var diffuseMask = new byte[size];
+                    var roughMask = new byte[size];
+
+                    await TextureHelpers.ModifyPixels((offset) =>
                     {
-                        lmMaterial.NormalMap = tm;
-                    }
-                }
+                        var specPix = ColorsetFileControl.ColorByteToHalf(orbData[offset + 0]);
+                        var roughPix = ColorsetFileControl.ColorByteToHalf(orbData[offset + 1]);
+                        var diffPix = ColorsetFileControl.ColorByteToHalf(orbData[offset + 2]);
+
+                        specPix *= (1 - roughPix);
+
+                        Color4 diff = new Color4(
+                            diffPix * diffuseColor[0],
+                            diffPix * diffuseColor[1],
+                            diffPix * diffuseColor[2],
+                            1.0f);
+
+                        Color4 spec = new Color4(
+                            specPix * specularColor[0],
+                            specPix * specularColor[1],
+                            specPix * specularColor[2],
+                            1.0f); 
+
+                        // As metalness rises, the diffuse/specular colors merge.
+                        diff = Color4.Lerp(diff, diff * spec, metallicVal);
+                        spec = Color4.Lerp(spec, diff * spec, metallicVal);
+
+
+                        diffuseMask[offset + 0] = ColorsetFileControl.ColorHalfToByte(diff[0]);
+                        diffuseMask[offset + 1] = ColorsetFileControl.ColorHalfToByte(diff[1]);
+                        diffuseMask[offset + 2] = ColorsetFileControl.ColorHalfToByte(diff[2]);
+                        diffuseMask[offset + 3] = 255;
+
+                        specularMask[offset + 0] = ColorsetFileControl.ColorHalfToByte(spec[0]);
+                        specularMask[offset + 1] = ColorsetFileControl.ColorHalfToByte(spec[1]);
+                        specularMask[offset + 2] = ColorsetFileControl.ColorHalfToByte(spec[2]);
+                        specularMask[offset + 3] = 255;
+
+                    }, TileTextureOrb.Width, TileTextureOrb.Height);
+
+                    lmMaterial.DiffuseAlphaMap = MakeTextureModel(diffuseMask);
+                    lmMaterial.SpecularColorMap = MakeTextureModel(specularMask);
 
-                // Disabled currently since this is no longer a diffuse map, and now an _orm map.
-                if (TileTextureDiffuse != null && false)
-                {
-                    var tm = await MakeTextureModel(TileTextureDiffuse);
-                    if (tm != null)
-                    {
-                        lmMaterial.DiffuseMap = tm;
-                    }
                 }
 
                 MeshGeometryModel3D mgm3 = new MeshGeometryModel3D()
@@ -299,6 +356,12 @@ public async Task SetColorsetRow(int row, int columnCount, int dyeId = -1)
                     Material = lmMaterial
                 };
 
+
+                foreach (var m in Models)
+                {
+                    m.Dispose();
+                }
+                Models.Clear();
                 Models.Add(mgm3);
             } catch(Exception ex)
             {
@@ -306,24 +369,23 @@ public async Task SetColorsetRow(int row, int columnCount, int dyeId = -1)
             }
         }
 
-        private async Task<TextureModel> MakeTextureModel(XivTex tex)
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static float Lerp(float a, float b, float t)
         {
+            return a + (b - a) * t;
+        }
 
-            var layer = (int)Math.Floor(RowData[2][3] * 64);
-            if (layer > 63 || layer < 0) layer = 0;
-            var tileX = (float)RowData[3][0];
-            var tileY = (float)RowData[3][3];
-            var tileSkewX = (float)RowData[3][1];
-            var tileSkewY = (float)RowData[3][2];
-
-            byte[] data;
-            try
-            {
-                data = await tex.GetRawPixels(layer);
-            } catch
-            {
-                return null;
-            }
+        /// <summary>
+        /// Handles converting the byte array to color
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        private TextureModel MakeTextureModel(byte[] data)
+        {
+            var tileX = (float)RowData[7][0];
+            var tileY = (float)RowData[7][3];
+            var tileSkewX = (float)RowData[7][1];
+            var tileSkewY = (float)RowData[7][2];
 
             var ogW = 32;
             var ogH = 32;
@@ -331,7 +393,6 @@ private async Task<TextureModel> MakeTextureModel(XivTex tex)
             var h = 256;
             Color4[] colors = new Color4[w * h];
 
-
             for (int y = 0; y < h; y++)
             {
                 for (int x = 0; x < w; x++)
@@ -358,6 +419,7 @@ private async Task<TextureModel> MakeTextureModel(XivTex tex)
                     var ogPixel = (yPx * ogW) + xPx;
                     var ogDataOffset = ogPixel * 4;
 
+                    
                     colors[nPixel] = new Color4()
                     {
                         Red = data[ogDataOffset] / 255.0f,
@@ -365,7 +427,6 @@ private async Task<TextureModel> MakeTextureModel(XivTex tex)
                         Blue = data[ogDataOffset + 2] / 255.0f,
                         Alpha = 1.0f,
                     };
-
                 }
             }
 
@@ -383,7 +444,6 @@ private void AddQuad(MeshBuilder plane, PlaneAxis axis, float offset)
 
             if (axis == PlaneAxis.X)
             {
-                return;
                 if (offset > 0)
                 {
                     plane.AddQuad(
@@ -405,7 +465,6 @@ private void AddQuad(MeshBuilder plane, PlaneAxis axis, float offset)
             }
             else if (axis == PlaneAxis.Y)
             {
-                return;
                 if (offset > 0)
                 {
                     plane.AddQuad(
@@ -438,7 +497,6 @@ private void AddQuad(MeshBuilder plane, PlaneAxis axis, float offset)
                 }
                 else
                 {
-                    return;
                     plane.AddQuad(
                         new SharpDX.Vector3(-offset, offset, offset),
                         new SharpDX.Vector3(offset, offset, offset),
@@ -464,12 +522,12 @@ private MeshGeometry3D MakeCube()
             var plane = new MeshBuilder();
             plane.CreateTextureCoordinates = true;
 
-            AddQuad(plane, PlaneAxis.X, 0.5f);
-            AddQuad(plane, PlaneAxis.X, -0.5f);
-            AddQuad(plane, PlaneAxis.Y, 0.5f);
-            AddQuad(plane, PlaneAxis.Y, -0.5f);
-            AddQuad(plane, PlaneAxis.Z, 0.5f);
-            AddQuad(plane, PlaneAxis.Z, -0.5f);
+            //AddQuad(plane, PlaneAxis.X, 0.5f);
+            //AddQuad(plane, PlaneAxis.X, -0.5f);
+            //AddQuad(plane, PlaneAxis.Y, 0.5f);
+            //AddQuad(plane, PlaneAxis.Y, -0.5f);
+            AddQuad(plane, PlaneAxis.Z, 100.0f);
+            //AddQuad(plane, PlaneAxis.Z, -0.5f);
 
             plane.ComputeTangents(MeshFaces.Default);
 
@@ -500,6 +558,17 @@ protected bool Set<T>(ref T backingField, T value, [CallerMemberName]string prop
             OnPropertyChanged(propertyName);
             return true;
         }
+
+        public void Dispose()
+        {
+            if(Models != null)
+            {
+                foreach(var m in Models)
+                {
+                    m?.Dispose();
+                }
+            }
+        }
         #endregion
     }
 }
diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
index 9a297c0e..aed50ea9 100644
--- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
+++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml
@@ -21,7 +21,7 @@
     <Grid x:Name="MaterialGrid" Visibility="Visible">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="160"></ColumnDefinition>
-            <ColumnDefinition Width="2*"></ColumnDefinition>
+            <ColumnDefinition Width="700"></ColumnDefinition>
             <ColumnDefinition Width="1*"></ColumnDefinition>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -338,7 +338,7 @@
             <hx:Viewport3DX
                         x:Name="ColorsetRowViewport"
                         Grid.Row="2"
-                    Grid.ColumnSpan="2"
+                        Grid.ColumnSpan="2"
                         EffectsManager="{Binding EffectsManager}"
                         Camera="{Binding Camera}"
                         ZoomExtentsWhenLoaded="True"
@@ -350,12 +350,11 @@
                     <MouseBinding Command="hx:ViewportCommands.Zoom" Gesture="MiddleClick" />
                     <MouseBinding Command="hx:ViewportCommands.Pan" Gesture="LeftClick" />
                 </hx:Viewport3DX.InputBindings>
-                <hx:DirectionalLight3D IsRendering="True" Direction="0, 0, -1" Color="White" />
-                <hx:DirectionalLight3D IsRendering="True" Direction="0, 0, 1" Color="White" />
-                <hx:DirectionalLight3D IsRendering="True" Direction="0, 1, 0" Color="White" />
-                <hx:DirectionalLight3D IsRendering="True" Direction="0, -1, 0" Color="White" />
-                <hx:DirectionalLight3D IsRendering="True" Direction="1, 0, 0" Color="White" />
-                <hx:DirectionalLight3D IsRendering="True" Direction="-1, 0, 0" Color="White" />
+                
+                <hx:DirectionalLight3D
+                     Direction="0,0,-1" 
+                    Color="#AAAAAAAA" IsRendering="True" />
+                
                 <hx:GroupModel3D ItemsSource="{Binding Models}"/>
             </hx:Viewport3DX>
             <Canvas Grid.Row="2" Name="AlternateViewportCanvas" Visibility="Hidden" IsHitTestVisible="False"/>
diff --git a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
index a307b18a..fd51b686 100644
--- a/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/ColorsetFileControl.xaml.cs
@@ -802,14 +802,14 @@ private async Task UpdateViewport()
             await _vm.SetColorsetRow(RowId, _columnCount, dyeId);
         }
 
-        private byte ColorHalfToByte(Half half)
+        public static byte ColorHalfToByte(Half half)
         {
             var b = (byte)Math.Round((Math.Sqrt(half) * 255));
 
             return b;
         }
 
-        private Half ColorByteToHalf(byte b)
+        public static Half ColorByteToHalf(byte b)
         {
             var f = (b / 255.0f);
             var half = f * f;
@@ -1590,6 +1590,7 @@ protected override void FreeManaged()
             if (ColorsetRowViewport != null)
             {
                 ColorsetRowViewport.Dispose();
+                _vm.Dispose();
             }
             CopyUpdated -= OnCopyUpdated;
         }

From b33dcd5cfd162a70ccfe19f2e0f0b15467dafbaa Mon Sep 17 00:00:00 2001
From: Lunaretic <Lunaretic@users.noreply.github.com>
Date: Tue, 16 Jul 2024 02:34:16 -0400
Subject: [PATCH 6/6] ref

---
 lib/xivModdingFramework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 5ee12a4d..4875c1aa 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 5ee12a4d61d1365868880521863c4055ed188ac9
+Subproject commit 4875c1aa1ac452932cbede32285e8bc3d71e1ec3