- Colorsets now properly added/removed when switching between shader/preset types.

Author: Lunaretic

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -25,6 +25,7 @@
 using xivModdingFramework.Materials.FileTypes;
 using xivModdingFramework.Textures.DataContainers;
 using xivModdingFramework.Textures.Enums;
+using xivModdingFramework.Textures.FileTypes;
 
 namespace xivModdingFramework.Materials.DataContainers
 {
@@ -434,6 +435,30 @@ public void SetShaderInfo(ShaderInfo info, bool forced = false)
                 SetMapInfo(XivTexType.Reflection, null);
             }
 
+            // Clear or set the Colorset if needed.
+            if(!info.HasColorset)
+            {
+                // ColorSetCount seems to always be 1, even when the data is empty.
+                ColorSetCount = 1;
+                ColorSetData = new List<Half>();
+                ColorSetExtraData = null;
+                ColorSetDataSize = 0;
+            } else
+            {
+                if(ColorSetCount == 0 || ColorSetData == null || ColorSetData.Count != 256)
+                {
+                    // Get default Colorset Data.
+                    ColorSetData = Tex.GetColorsetDataFromDDS(Tex.GetDefaultTexturePath(XivTexType.ColorSet));
+                }
+                if(ColorSetExtraData == null || ColorSetExtraData.Length != 32)
+                {
+                    ColorSetExtraData = Tex.GetColorsetExtraDataFromDDS(Tex.GetDefaultTexturePath(XivTexType.ColorSet));
+                }
+
+                // Standard Colorset Size. -- This could really be generated automatically later.
+                ColorSetDataSize = 544;
+            }
+
 
         }
 

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -1014,7 +1014,7 @@ public async Task<int> TexColorImporter(XivMtrl xivMtrl, DirectoryInfo ddsFileDi
         /// </summary>
         /// <param name="ddsFileDirectory"></param>
         /// <returns></returns>
-        public List<Half> GetColorsetDataFromDDS(DirectoryInfo ddsFileDirectory)
+        public static List<Half> GetColorsetDataFromDDS(DirectoryInfo ddsFileDirectory)
         {
             using (var br = new BinaryReader(File.OpenRead(ddsFileDirectory.FullName)))
             {
@@ -1059,7 +1059,7 @@ public List<Half> GetColorsetDataFromDDS(DirectoryInfo ddsFileDirectory)
         /// </summary>
         /// <param name="file"></param>
         /// <returns></returns>
-        public byte[] GetColorsetExtraDataFromDDS(DirectoryInfo file)
+        public static byte[] GetColorsetExtraDataFromDDS(DirectoryInfo file)
         {
             var flagsPath = Path.Combine(Path.GetDirectoryName(file.FullName), (Path.GetFileNameWithoutExtension(file.FullName) + ".dat"));
 
@@ -1195,7 +1195,7 @@ private static List<byte> MakeTextureInfoHeader(XivTex xivTex, int newWidth, int
         /// <summary>
         /// A dictionary containing the int represntations of known file types for DDS
         /// </summary>
-        private readonly Dictionary<int, XivTexFormat> DDSType = new Dictionary<int, XivTexFormat>
+        private static readonly Dictionary<int, XivTexFormat> DDSType = new Dictionary<int, XivTexFormat>
         {
             //DXT1
             {827611204, XivTexFormat.DXT1 },