Merge branch 'colorset_editor' into develop

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/SqPack/FileTypes/Dat.cs

@@ -1052,7 +1052,8 @@ await Task.Run(async () =>
                         var headerLength = br.ReadInt32();
                         var fileType = br.ReadInt32();
                         var uncompressedFileSize = br.ReadInt32();
-                        br.ReadBytes(8);
+                        var ikd1 = br.ReadInt32();
+                        var ikd2 = br.ReadInt32();
                         xivTex.MipMapCount = br.ReadInt32();
 
                         var endOfHeader = offset + headerLength;
@@ -1063,6 +1064,9 @@ await Task.Run(async () =>
                         xivTex.TextureFormat = TextureTypeDictionary[br.ReadInt32()];
                         xivTex.Width = br.ReadInt16();
                         xivTex.Height = br.ReadInt16();
+                        var pos = br.BaseStream.Position;
+                        xivTex.Layers = br.ReadInt16();
+                        var imageCount2 = br.ReadInt16();
 
                         for (int i = 0, j = 0; i < xivTex.MipMapCount; i++)
                         {

xivModdingFramework/Textures/DataContainers/XivTex.cs

@@ -38,6 +38,11 @@ public class XivTex
         /// </summary>
         public int Height { get; set; }
 
+        /// <summary>
+        /// Number of layers in the in the texture file.
+        /// </summary>
+        public int Layers { get; set; }
+
         /// <summary>
         /// The amount of mipmaps the texture contains
         /// </summary>

xivModdingFramework/Textures/FileTypes/DDS.cs

@@ -54,13 +54,37 @@ public static void MakeDDS(XivTex xivTex, string savePath)
                 case XivTexType.Icon:
                 default:
                     DDS.AddRange(CreateDDSHeader(xivTex));
-                    DDS.AddRange(xivTex.TexData);
+
+                    var data = xivTex.TexData;
+                    if (xivTex.TextureFormat == XivTexFormat.A8R8G8B8 && xivTex.Layers > 1)
+                    {
+                        data = ShiftLayers(data);
+                    }
+                    DDS.AddRange(data);
                     break;
             }
 
             File.WriteAllBytes(savePath, DDS.ToArray());
         }
 
+        // This is a simple shift of the layers around in order to convert ARGB to RGBA
+        private static byte[] ShiftLayers(byte[] data)
+        {
+            for(int i = 0; i < data.Length; i += 4)
+            {
+                var alpha = data[i];
+                var red = data[i + 1];
+                var green  = data[i + 2];
+                var blue = data[i + 3];
+
+                data[i] = red;
+                data[i + 1] = green;
+                data[i + 2] = blue;
+                data[i + 3] = alpha;
+            }
+            return data;
+        }
+
         /// <summary>
         /// Creates the DDS header for given texture data.
         /// <see cref="https://msdn.microsoft.com/en-us/library/windows/desktop/bb943982(v=vs.85).aspx"/>
@@ -80,7 +104,11 @@ private static byte[] CreateDDSHeader(XivTex xivTex)
             header.AddRange(BitConverter.GetBytes(dwSize));
 
             // Flags to indicate which members contain valid data.
-            const uint dwFlags = 528391;
+            uint dwFlags = 528391;
+            if(xivTex.Layers > 1)
+            {
+                dwFlags = 0x00000004;
+            }
             header.AddRange(BitConverter.GetBytes(dwFlags));
 
             // Surface height (in pixels).
@@ -175,6 +203,13 @@ private static byte[] CreateDDSHeader(XivTex xivTex)
                 default:
                     return null;
             }
+
+            if(xivTex.Layers > 1)
+            {
+                var bytes = System.Text.Encoding.UTF8.GetBytes("DX10");
+                dwFourCC = BitConverter.ToUInt32(bytes, 0);
+            }
+
             header.AddRange(BitConverter.GetBytes(dwFourCC));
 
             switch (xivTex.TextureFormat)
@@ -326,6 +361,35 @@ private static byte[] CreateDDSHeader(XivTex xivTex)
                     }
             }
 
+            // Need to write DX10 header here.
+            if(xivTex.Layers > 1)
+            {
+                // DXGI_FORMAT dxgiFormat
+                uint dxgiFormat = 0;
+                if (xivTex.TextureFormat == XivTexFormat.DXT1) {
+                    dxgiFormat = (uint)DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM;
+                } else if (xivTex.TextureFormat == XivTexFormat.DXT5)
+                {
+                    dxgiFormat = (uint)DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM;
+                } else {
+                    dxgiFormat = (uint)DXGI_FORMAT.DXGI_FORMAT_R8G8B8A8_UNORM;
+                }
+                header.AddRange(BitConverter.GetBytes(dxgiFormat));
+
+                // D3D10_RESOURCE_DIMENSION resourceDimension
+                header.AddRange(BitConverter.GetBytes((int)3));
+
+
+                // UINT miscFlag
+                header.AddRange(BitConverter.GetBytes((int)0));
+
+                // UINT arraySize
+                header.AddRange(BitConverter.GetBytes(xivTex.Layers));
+
+                // UINT miscFlags2
+                header.AddRange(BitConverter.GetBytes((int)0));
+            }
+
             return header.ToArray();
         }
 
@@ -542,5 +606,131 @@ private static byte[] CreateColorDDSHeader()
 
             return (compressedDDS, mipPartOffsets, mipPartCount);
         }
+
+        public enum DXGI_FORMAT : uint
+        {
+            DXGI_FORMAT_UNKNOWN,
+            DXGI_FORMAT_R32G32B32A32_TYPELESS,
+            DXGI_FORMAT_R32G32B32A32_FLOAT,
+            DXGI_FORMAT_R32G32B32A32_UINT,
+            DXGI_FORMAT_R32G32B32A32_SINT,
+            DXGI_FORMAT_R32G32B32_TYPELESS,
+            DXGI_FORMAT_R32G32B32_FLOAT,
+            DXGI_FORMAT_R32G32B32_UINT,
+            DXGI_FORMAT_R32G32B32_SINT,
+            DXGI_FORMAT_R16G16B16A16_TYPELESS,
+            DXGI_FORMAT_R16G16B16A16_FLOAT,
+            DXGI_FORMAT_R16G16B16A16_UNORM,
+            DXGI_FORMAT_R16G16B16A16_UINT,
+            DXGI_FORMAT_R16G16B16A16_SNORM,
+            DXGI_FORMAT_R16G16B16A16_SINT,
+            DXGI_FORMAT_R32G32_TYPELESS,
+            DXGI_FORMAT_R32G32_FLOAT,
+            DXGI_FORMAT_R32G32_UINT,
+            DXGI_FORMAT_R32G32_SINT,
+            DXGI_FORMAT_R32G8X24_TYPELESS,
+            DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
+            DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
+            DXGI_FORMAT_X32_TYPELESS_G8X24_UINT,
+            DXGI_FORMAT_R10G10B10A2_TYPELESS,
+            DXGI_FORMAT_R10G10B10A2_UNORM,
+            DXGI_FORMAT_R10G10B10A2_UINT,
+            DXGI_FORMAT_R11G11B10_FLOAT,
+            DXGI_FORMAT_R8G8B8A8_TYPELESS,
+            DXGI_FORMAT_R8G8B8A8_UNORM,
+            DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
+            DXGI_FORMAT_R8G8B8A8_UINT,
+            DXGI_FORMAT_R8G8B8A8_SNORM,
+            DXGI_FORMAT_R8G8B8A8_SINT,
+            DXGI_FORMAT_R16G16_TYPELESS,
+            DXGI_FORMAT_R16G16_FLOAT,
+            DXGI_FORMAT_R16G16_UNORM,
+            DXGI_FORMAT_R16G16_UINT,
+            DXGI_FORMAT_R16G16_SNORM,
+            DXGI_FORMAT_R16G16_SINT,
+            DXGI_FORMAT_R32_TYPELESS,
+            DXGI_FORMAT_D32_FLOAT,
+            DXGI_FORMAT_R32_FLOAT,
+            DXGI_FORMAT_R32_UINT,
+            DXGI_FORMAT_R32_SINT,
+            DXGI_FORMAT_R24G8_TYPELESS,
+            DXGI_FORMAT_D24_UNORM_S8_UINT,
+            DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
+            DXGI_FORMAT_X24_TYPELESS_G8_UINT,
+            DXGI_FORMAT_R8G8_TYPELESS,
+            DXGI_FORMAT_R8G8_UNORM,
+            DXGI_FORMAT_R8G8_UINT,
+            DXGI_FORMAT_R8G8_SNORM,
+            DXGI_FORMAT_R8G8_SINT,
+            DXGI_FORMAT_R16_TYPELESS,
+            DXGI_FORMAT_R16_FLOAT,
+            DXGI_FORMAT_D16_UNORM,
+            DXGI_FORMAT_R16_UNORM,
+            DXGI_FORMAT_R16_UINT,
+            DXGI_FORMAT_R16_SNORM,
+            DXGI_FORMAT_R16_SINT,
+            DXGI_FORMAT_R8_TYPELESS,
+            DXGI_FORMAT_R8_UNORM,
+            DXGI_FORMAT_R8_UINT,
+            DXGI_FORMAT_R8_SNORM,
+            DXGI_FORMAT_R8_SINT,
+            DXGI_FORMAT_A8_UNORM,
+            DXGI_FORMAT_R1_UNORM,
+            DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
+            DXGI_FORMAT_R8G8_B8G8_UNORM,
+            DXGI_FORMAT_G8R8_G8B8_UNORM,
+            DXGI_FORMAT_BC1_TYPELESS,
+            DXGI_FORMAT_BC1_UNORM,
+            DXGI_FORMAT_BC1_UNORM_SRGB,
+            DXGI_FORMAT_BC2_TYPELESS,
+            DXGI_FORMAT_BC2_UNORM,
+            DXGI_FORMAT_BC2_UNORM_SRGB,
+            DXGI_FORMAT_BC3_TYPELESS,
+            DXGI_FORMAT_BC3_UNORM,
+            DXGI_FORMAT_BC3_UNORM_SRGB,
+            DXGI_FORMAT_BC4_TYPELESS,
+            DXGI_FORMAT_BC4_UNORM,
+            DXGI_FORMAT_BC4_SNORM,
+            DXGI_FORMAT_BC5_TYPELESS,
+            DXGI_FORMAT_BC5_UNORM,
+            DXGI_FORMAT_BC5_SNORM,
+            DXGI_FORMAT_B5G6R5_UNORM,
+            DXGI_FORMAT_B5G5R5A1_UNORM,
+            DXGI_FORMAT_B8G8R8A8_UNORM,
+            DXGI_FORMAT_B8G8R8X8_UNORM,
+            DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM,
+            DXGI_FORMAT_B8G8R8A8_TYPELESS,
+            DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
+            DXGI_FORMAT_B8G8R8X8_TYPELESS,
+            DXGI_FORMAT_B8G8R8X8_UNORM_SRGB,
+            DXGI_FORMAT_BC6H_TYPELESS,
+            DXGI_FORMAT_BC6H_UF16,
+            DXGI_FORMAT_BC6H_SF16,
+            DXGI_FORMAT_BC7_TYPELESS,
+            DXGI_FORMAT_BC7_UNORM,
+            DXGI_FORMAT_BC7_UNORM_SRGB,
+            DXGI_FORMAT_AYUV,
+            DXGI_FORMAT_Y410,
+            DXGI_FORMAT_Y416,
+            DXGI_FORMAT_NV12,
+            DXGI_FORMAT_P010,
+            DXGI_FORMAT_P016,
+            DXGI_FORMAT_420_OPAQUE,
+            DXGI_FORMAT_YUY2,
+            DXGI_FORMAT_Y210,
+            DXGI_FORMAT_Y216,
+            DXGI_FORMAT_NV11,
+            DXGI_FORMAT_AI44,
+            DXGI_FORMAT_IA44,
+            DXGI_FORMAT_P8,
+            DXGI_FORMAT_A8P8,
+            DXGI_FORMAT_B4G4R4A4_UNORM,
+            DXGI_FORMAT_P208,
+            DXGI_FORMAT_V208,
+            DXGI_FORMAT_V408,
+            DXGI_FORMAT_SAMPLER_FEEDBACK_MIN_MIP_OPAQUE,
+            DXGI_FORMAT_SAMPLER_FEEDBACK_MIP_REGION_USED_OPAQUE,
+            DXGI_FORMAT_FORCE_UINT
+        };
     }
 }