Initial working pass on Colorset Editor.

Author: Lunaretic

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -62,7 +62,7 @@ public class XivMtrl
         /// </remarks>
         public ushort ColorSetDataSize { get {
             var size = ColorSetData.Count * 2;
-            size += ColorSetExtraData == null ? 0 : ColorSetExtraData.Length;
+            size += ColorSetDyeData == null ? 0 : ColorSetDyeData.Length;
             return (ushort) size;
         } }
 
@@ -168,7 +168,7 @@ public ushort ColorSetDataSize { get {
         /// <summary>
         /// The byte array containing the extra ColorSet data
         /// </summary>
-        public byte[] ColorSetExtraData { get; set; }
+        public byte[] ColorSetDyeData { get; set; }
 
         /// <summary>
         /// The size of the additional MTRL Data
@@ -534,17 +534,17 @@ public void SetShaderInfo(ShaderInfo info, bool forced = false)
                 // ColorSetCount seems to always be 1, even when the data is empty.
                 ColorSetCount = 1;
                 ColorSetData = new List<Half>();
-                ColorSetExtraData = null;
+                ColorSetDyeData = null;
             } 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)
+                if(ColorSetDyeData == null || ColorSetDyeData.Length != 32)
                 {
-                    ColorSetExtraData = Tex.GetColorsetExtraDataFromDDS(Tex.GetDefaultTexturePath(XivTexType.ColorSet));
+                    ColorSetDyeData = Tex.GetColorsetExtraDataFromDDS(Tex.GetDefaultTexturePath(XivTexType.ColorSet));
                 }
             }
 

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -542,7 +542,7 @@ await Task.Run((Func<Task>)(async () =>
                         xivMtrl.Unknown2 = br.ReadBytes(xivMtrl.UnknownDataSize);
 
                         xivMtrl.ColorSetData = new List<Half>();
-                        xivMtrl.ColorSetExtraData = null;
+                        xivMtrl.ColorSetDyeData = null;
                         if (colorSetDataSize > 0)
                         {
                             // Color Data is always 512 (6 x 14 = 64 x 8bpp = 512)
@@ -556,7 +556,7 @@ await Task.Run((Func<Task>)(async () =>
                             // If the color set is 544 in length, it has an extra 32 bytes at the end
                             if (colorSetDataSize == 544)
                             {
-                                xivMtrl.ColorSetExtraData = br.ReadBytes(32);
+                                xivMtrl.ColorSetDyeData = br.ReadBytes(32);
                             }
                         }
 
@@ -681,7 +681,7 @@ public Task<XivTex> MtrlToXivTex(XivMtrl xivMtrl, TexTypePath ttp)
         /// <param name="race">The selected race for the item</param>
         public void SaveColorSetExtraData(IItem item, XivMtrl xivMtrl, DirectoryInfo saveDirectory, XivRace race)
         {
-            var toWrite = xivMtrl.ColorSetExtraData != null ? xivMtrl.ColorSetExtraData : new byte[32];
+            var toWrite = xivMtrl.ColorSetDyeData != null ? xivMtrl.ColorSetDyeData : new byte[32];
             var path = IOUtil.MakeItemSavePath(item, saveDirectory, race);
 
             Directory.CreateDirectory(path);
@@ -868,7 +868,7 @@ public byte[] CreateMtrlFile(XivMtrl xivMtrl, IItem item)
 
             if (xivMtrl.ColorSetDataSize == 544)
             {
-                mtrlBytes.AddRange(xivMtrl.ColorSetExtraData);
+                mtrlBytes.AddRange(xivMtrl.ColorSetDyeData);
             }
 
 

xivModdingFramework/Materials/FileTypes/STM.cs

@@ -40,6 +40,7 @@ public static async Task<StainingTemplateFile> GetStainingTemplateFile(bool forc
 
         public static async Task SaveStainingTemplateFile(StainingTemplateFile file, string applicationSource, IndexFile index = null, ModList modlist = null)
         {
+            throw new NotImplementedException();
             var data = new byte[0];//file.GetBytes();
 
             var _dat = new Dat(XivCache.GameInfo.GameDirectory);
@@ -64,19 +65,11 @@ public enum StainingTemplateArrayType
 
     public class StainingTemplateEntry
     {
-        public int Size
-        {
-            get
-            {
-                return 0;
-            }
-        }
-
-        List<Half[]> DiffuseEntries = new List<Half[]>();
-        List<Half[]> SpecularEntries = new List<Half[]>();
-        List<Half[]> EmissiveEntries = new List<Half[]>();
-        List<Half> TileMaterialEntries = new List<Half>();
-        List<Half> GlossEntries = new List<Half>();
+        public readonly List<Half[]> DiffuseEntries = new List<Half[]>();
+        public readonly List<Half[]> SpecularEntries = new List<Half[]>();
+        public readonly List<Half[]> EmissiveEntries = new List<Half[]>();
+        public readonly List<Half> TileMaterialEntries = new List<Half>();
+        public readonly List<Half> GlossEntries = new List<Half>();
 
         public StainingTemplateEntry(byte[] data, int offset)
         {
@@ -243,7 +236,11 @@ public void SetTemplate(ushort key, StainingTemplateEntry entry)
         }
         public StainingTemplateEntry GetTemplate(ushort key)
         {
-            return Templates[key];
+            if (Templates.ContainsKey(key))
+            {
+                return Templates[key];
+            }
+            return null;
         }
         public StainingTemplateFile(byte[] data)
         {

xivModdingFramework/Textures/FileTypes/Tex.cs

@@ -882,7 +882,7 @@ public async Task<long> TexColorImporter(XivMtrl xivMtrl, DirectoryInfo ddsFileD
 
             // Replace the color set data with the imported data
             xivMtrl.ColorSetData = colorSetData;
-            xivMtrl.ColorSetExtraData = colorSetExtraData;
+            xivMtrl.ColorSetDyeData = colorSetExtraData;
             if (xivMtrl.Unknown2.Length > 0)
             {
                 // This byte enables the dye set if it's not already enabled.
@@ -994,7 +994,7 @@ public byte[] DDStoMtrlData(XivMtrl xivMtrl, DirectoryInfo ddsFileDirectory, IIt
 
             // Replace the color set data with the imported data
             xivMtrl.ColorSetData = colorSetData;
-            xivMtrl.ColorSetExtraData = colorSetExtraData;
+            xivMtrl.ColorSetDyeData = colorSetExtraData;
 
             if (xivMtrl.Unknown2.Length > 0)
             {