- Added Colorset Highlight for Model Viewing.

- Bugfixes for Enable/Disable button not being turned on when using Colorset Editor.

Author: Lunaretic

xivModdingFramework/Models/ModelTextures/ModelTexture.cs

@@ -116,17 +116,17 @@ public static CustomModelColors GetCustomColors()
         /// <param name="mtrl"></param>
         /// <param name="colors"></param>
         /// <returns></returns>
-        public static async Task<ModelTextureData> GetModelMaps(DirectoryInfo gameDirectory, XivMtrl mtrl, CustomModelColors colors = null)
+        public static async Task<ModelTextureData> GetModelMaps(DirectoryInfo gameDirectory, XivMtrl mtrl, CustomModelColors colors = null, int highlightedRow = -1)
         {
             var tex = new Tex(gameDirectory);
-            return await GetModelMaps(tex, mtrl);
+            return await GetModelMaps(tex, mtrl, colors, highlightedRow);
         }
 
         /// <summary>
         /// Gets the texture maps for the model
         /// </summary>
         /// <returns>The texture maps in byte arrays inside a ModelTextureData class</returns>
-        public static async Task<ModelTextureData> GetModelMaps(Tex tex, XivMtrl mtrl, CustomModelColors colors = null)
+        public static async Task<ModelTextureData> GetModelMaps(Tex tex, XivMtrl mtrl, CustomModelColors colors = null, int highlightedRow = -1)
         {
 
             // Use static values as needed.
@@ -233,7 +233,7 @@ await Task.Run(() =>
                     {
                         var cs = texMapData.ColorSet.Data;
                         Color finalDiffuseColor, finalSpecularColor;
-                        ComputeColorsetBlending(mtrl, colorsetValue, cs, diffuseColor, specularColor, out finalDiffuseColor, out finalSpecularColor, out emissiveColor);
+                        ComputeColorsetBlending(mtrl, colorsetValue, cs, diffuseColor, specularColor, out finalDiffuseColor, out finalSpecularColor, out emissiveColor, highlightedRow);
                         diffuseColor = finalDiffuseColor;
                         specularColor = finalSpecularColor;
                     }
@@ -644,7 +644,7 @@ private static void ComputeShaderColors(CustomModelColors colors,  ShaderInfo in
             }
         }
 
-        private static void ComputeColorsetBlending(XivMtrl mtrl, byte colorsetByte, byte[] colorSetData, Color baseDiffuse, Color baseSpecular, out Color newDiffuse, out Color newSpecular, out Color emissiveColor)
+        private static void ComputeColorsetBlending(XivMtrl mtrl, byte colorsetByte, byte[] colorSetData, Color baseDiffuse, Color baseSpecular, out Color newDiffuse, out Color newSpecular, out Color emissiveColor, int highlightRow = -1)
         {
             int rowNumber = colorsetByte / 17;
             int nextRow = rowNumber >= 15 ? 15 : rowNumber + 1;
@@ -659,14 +659,52 @@ private static void ComputeColorsetBlending(XivMtrl mtrl, byte colorsetByte, byt
             var row1Offset = Clamp(rowNumber * 16);
             var row2Offset = Clamp(nextRow * 16);
 
-            diffuse1 = new Color(colorSetData[row1Offset + 0], colorSetData[row1Offset + 1], colorSetData[row1Offset + 2], (byte)255);
-            diffuse2 = new Color(colorSetData[row2Offset + 0], colorSetData[row2Offset + 1], colorSetData[row2Offset + 2], (byte)255);
+            if (highlightRow >= 0)
+            {
+                if (rowNumber == highlightRow)
+                {
+                    diffuse1 = new Color((byte)255, (byte)255, (byte)255, (byte)255);
+                    diffuse2 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+
+                    spec1 = new Color((byte)255, (byte)255, (byte)255, (byte)255);
+                    spec2 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
 
-            spec1 = new Color(colorSetData[row1Offset + 4], colorSetData[row1Offset + 5], colorSetData[row1Offset + 6], (byte)255);
-            spec2 = new Color(colorSetData[row2Offset + 4], colorSetData[row2Offset + 5], colorSetData[row2Offset + 6], (byte)255);
+                    emiss1 = new Color((byte)255, (byte)255, (byte)255, (byte)255);
+                    emiss2 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                }
+                else if (nextRow == highlightRow)
+                {
+                    diffuse1 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                    diffuse2 = new Color((byte)255, (byte)255, (byte)255, (byte)255);
+
+                    spec1 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                    spec2 = new Color((byte)255, (byte)255, (byte)255, (byte)255);
+
+                    emiss1 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                    emiss2 = new Color((byte)255, (byte)255, (byte)255, (byte)255);
+                } else
+                {
+                    diffuse1 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                    diffuse2 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
 
-            emiss1 = new Color(colorSetData[row1Offset + 8], colorSetData[row1Offset + 9], colorSetData[row1Offset + 10], (byte)255);
-            emiss2 = new Color(colorSetData[row2Offset + 8], colorSetData[row2Offset + 9], colorSetData[row2Offset + 10], (byte)255);
+                    spec1 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                    spec2 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+
+                    emiss1 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                    emiss2 = new Color((byte)0, (byte)0, (byte)0, (byte)255);
+                }
+            }
+            else
+            {
+                diffuse1 = new Color(colorSetData[row1Offset + 0], colorSetData[row1Offset + 1], colorSetData[row1Offset + 2], (byte)255);
+                diffuse2 = new Color(colorSetData[row2Offset + 0], colorSetData[row2Offset + 1], colorSetData[row2Offset + 2], (byte)255);
+
+                spec1 = new Color(colorSetData[row1Offset + 4], colorSetData[row1Offset + 5], colorSetData[row1Offset + 6], (byte)255);
+                spec2 = new Color(colorSetData[row2Offset + 4], colorSetData[row2Offset + 5], colorSetData[row2Offset + 6], (byte)255);
+
+                emiss1 = new Color(colorSetData[row1Offset + 8], colorSetData[row1Offset + 9], colorSetData[row1Offset + 10], (byte)255);
+                emiss2 = new Color(colorSetData[row2Offset + 8], colorSetData[row2Offset + 9], colorSetData[row2Offset + 10], (byte)255);
+            }
 
 
             // These are now our base values to multiply the base values by.