Fixes for Specular Material Handling.

Author: Lunaretic

xivModdingFramework/Materials/DataContainers/XivMtrl.cs

@@ -519,44 +519,34 @@ public void SetMapInfo(XivTexType MapType, MapInfo info)
             // Deleting existing info.
             if (info == null)
             {
-                if(paramIdx < 0)
-                {
-                    // Didn't exist to start, nothing to do.
-                    return;
-                }
 
-                // Remove texture from path list if it exists.
-                if (TexturePathList.Count > oldInfo.TextureIndex)
-                {
-                    TexturePathList.RemoveAt((int)oldInfo.TextureIndex);
-                    TexturePathUnknownList.RemoveAt((int)oldInfo.TextureIndex);
-                }
 
-                // Remove Parameter List
-                TextureDescriptorList.RemoveAt(paramIdx);
-
-                // Update other texture offsets
-                for(var i = 0; i < TextureDescriptorList.Count; i++)
+                if (paramIdx >= 0)
                 {
-                    var p = TextureDescriptorList[i];
-                    if(p.TextureIndex > oldInfo.TextureIndex)
+                    // Remove texture from path list if it exists.
+                    if (TexturePathList.Count > oldInfo.TextureIndex)
                     {
-                        p.TextureIndex--;
+                        TexturePathList.RemoveAt((int)oldInfo.TextureIndex);
+                        TexturePathUnknownList.RemoveAt((int)oldInfo.TextureIndex);
                     }
-                    TextureDescriptorList[i] = p;
-                }
 
-                // Remove struct1 entry for the removed map type, if it exists.
-                for(var i = 0; i < TextureUsageList.Count; i++)
-                {
-                    var s = TextureUsageList[i];
-                    if(s.TextureType == Mtrl.TextureUsageValues[MapType].TextureType)
+                    // Remove Parameter List
+                    TextureDescriptorList.RemoveAt(paramIdx);
+
+                    // Update other texture offsets
+                    for (var i = 0; i < TextureDescriptorList.Count; i++)
                     {
-                        TextureUsageList.RemoveAt(i);
-                        break;
+                        var p = TextureDescriptorList[i];
+                        if (p.TextureIndex > oldInfo.TextureIndex)
+                        {
+                            p.TextureIndex--;
+                        }
+                        TextureDescriptorList[i] = p;
                     }
                 }
 
+                RegenerateTextureUsageList();
+
                 return;
 
             }
@@ -608,31 +598,94 @@ public void SetMapInfo(XivTexType MapType, MapInfo info)
                 TexturePathList[(int) raw.TextureIndex] = info.path;
             }
 
-            // Update struct1 entry with the appropriate entry if it's not already there.
-            bool foundEntry = false;
-            for (var i = 0; i < TextureUsageList.Count; i++)
+            RegenerateTextureUsageList();
+        }
+
+        /// <summary>
+        /// Regenerates/Cleans up the texture usage list based on the 
+        /// Texture Maps that are set in the Texture Description Fields.
+        /// </summary>
+        private void RegenerateTextureUsageList()
+        {
+            // Everything (should) have a normal, so this is redundant.
+            // bool hasNormal = GetMapInfo(XivTexType.Normal) != null;
+            bool hasSpec = GetMapInfo(XivTexType.Specular) != null;
+            bool hasDiffuse = GetMapInfo(XivTexType.Diffuse) != null;
+            bool hasMulti = GetMapInfo(XivTexType.Multi) != null; 
+
+            ClearTextureUsage(XivTexType.Normal);
+            ClearTextureUsage(XivTexType.Diffuse);
+            ClearTextureUsage(XivTexType.Specular);
+            ClearTextureUsage(XivTexType.Multi);
+
+            // These need to be set in relatively specific order
+            // in order to use the maps correctly
+
+            SetTextureUsage(XivTexType.Normal);
+
+            if (hasDiffuse)
             {
-                var s = TextureUsageList[i];
-                if (s.TextureType == Mtrl.TextureUsageValues[MapType].TextureType)
-                {
-                    foundEntry = true;
-                    break;
-                }
+                // Diffuse
+                SetTextureUsage(XivTexType.Diffuse);
             }
 
-            if(!foundEntry)
+            if (hasSpec || hasMulti)
             {
-                var s1 = new TextureUsageStruct()
-                {
-                    TextureType = Mtrl.TextureUsageValues[MapType].TextureType,
-                    Unknown = Mtrl.TextureUsageValues[MapType].Unknown
-                };
-
-                TextureUsageList.Add(s1);
+                // Including both of these seems to guarantee best results,
+                // vs including only one or the other.
+                SetTextureUsage(XivTexType.Multi);
+                SetTextureUsage(XivTexType.Specular);
             }
 
         }
 
+        /// <summary>
+        /// Clears a texture usage value.
+        /// </summary>
+        /// <param name="usage"></param>
+        private bool ClearTextureUsage(XivTexType usage)
+        {
+            var oldCount = TextureUsageList.Count;
+            TextureUsageList = TextureUsageList.Where(x => x.TextureType != Mtrl.TextureUsageValues[usage].TextureType).ToList();
+            return oldCount != TextureUsageList.Count;
+        }
+
+        /// <summary>
+        /// Adds or changes a texture usage value.
+        /// </summary>
+        /// <param name="usage"></param>
+        /// <param name="unknownValue"></param>
+        private void SetTextureUsage(XivTexType usage, uint? unknownValue = null)
+        {
+            if(unknownValue == null)
+            {
+                unknownValue = Mtrl.TextureUsageValues[usage].Unknown;
+            }
+            try
+            {
+                var val = TextureUsageList.First(x => x.TextureType == Mtrl.TextureUsageValues[usage].TextureType);
+                if(val != null)
+                {
+                    // Despite being named 'Struct' this is actually a class.
+                    val.Unknown = (uint) unknownValue;
+                } else
+                {
+                    TextureUsageList.Add(new TextureUsageStruct()
+                    {
+                        TextureType = Mtrl.TextureUsageValues[usage].TextureType,
+                        Unknown = (uint) unknownValue
+                    });
+                }
+            } catch(Exception ex)
+            {
+                TextureUsageList.Add(new TextureUsageStruct()
+                {
+                    TextureType = Mtrl.TextureUsageValues[usage].TextureType,
+                    Unknown = (uint) unknownValue
+                });
+            }
+        }
+
         /// <summary>
         /// Retrieve all MapInfo structs for all textures associated with this MTRL,
         /// Including textures with unknown usage.