Update v3.0.6.7

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -1642,6 +1642,8 @@ public static TTModel LoadFromFile(string filePath, Action<bool, string> logging
             // Convert the model to FFXIV's internal weirdness.
             ModelModifiers.MakeImportReady(model, loggingFunction);
 
+            ModelModifiers.CleanWeights(model, loggingFunction);
+
             return model;
         }
 
@@ -2907,17 +2909,39 @@ public static void CheckCommonUserErrors(TTModel model, Action<bool, string> log
 
                     bool anyAlpha = false;
                     bool anyColor = false;
-                    bool anyColor2 = false;
+                    bool fullWhiteColor2 = true;
                     bool anyWeirdUV1s = false;
                     bool anyWeirdUV2s = false;
+                    bool anyWeirdUV3s = false;
+
+                    var firstUv2 = p.Vertices[0].UV2;
+                    var firstUv3 = p.Vertices[0].UV3;
 
                     foreach (var v in p.Vertices)
                     {
                         anyAlpha = anyAlpha || (v.VertexColor[3] > 0);
                         anyColor = anyColor || (v.VertexColor[0] > 0 || v.VertexColor[1] > 0 || v.VertexColor[2] > 0);
-                        anyColor2 = anyColor2 || (v.VertexColor2[0] > 0 || v.VertexColor2[1] > 0 || v.VertexColor2[2] > 0 || v.VertexColor2[3] > 0);
+
+                        if(fullWhiteColor2 == true && 
+                            (v.VertexColor2[0] < 255
+                            || v.VertexColor2[1] < 255
+                            || v.VertexColor2[2] < 255))
+                        {
+                            fullWhiteColor2 = false;
+                        }
+
                         anyWeirdUV1s = anyWeirdUV1s || (v.UV1.X > 2 || v.UV1.X < -2 || v.UV1.Y > 2 || v.UV1.Y < -2);
-                        anyWeirdUV2s = anyWeirdUV2s || (v.UV2.X > 2 || v.UV2.X < -2 || v.UV2.Y > 2 || v.UV2.Y < -2);
+                        anyWeirdUV2s = anyWeirdUV2s || ((v.UV2.X > 2 || v.UV2.X < -2 || v.UV2.Y > 2 || v.UV2.Y < -2) && v.UV2 != firstUv2);
+                        anyWeirdUV3s = anyWeirdUV3s || ((v.UV3.X > 2 || v.UV3.X < -2 || v.UV3.Y > 2 || v.UV3.Y < -2) && v.UV3 != firstUv3);
+
+                        if((v.UV2.X > 2 || v.UV2.X < -2 || v.UV2.Y > 2 || v.UV2.Y < -2))
+                        {
+                            Trace.WriteLine(v.UV2);
+                        }
+                        if ((v.UV2.X > 2 || v.UV2.X < -2 || v.UV2.Y > 2 || v.UV2.Y < -2))
+                        {
+                            Trace.WriteLine(v.UV2);
+                        }
                     }
 
                     if (!anyAlpha)
@@ -2929,9 +2953,10 @@ public static void CheckCommonUserErrors(TTModel model, Action<bool, string> log
                     {
                         loggingFunction(true, "Mesh: " + mIdx + " Part: " + pIdx + " has a fully black Vertex Color channel.  This can have unexpected results on in-game rendering.  Was this intended?");
                     }
-                    if (!anyColor)
+
+                    if (fullWhiteColor2)
                     {
-                        // TODO: Do we care about this? Who knows.
+                        loggingFunction(true, "Mesh: " + mIdx + " Part: " + pIdx + " has a fully white Vertex Color 2 channel.  This may turn the model into wiggly jiggly jello in game.");
                     }
 
                     if (anyWeirdUV1s)
@@ -2944,6 +2969,11 @@ public static void CheckCommonUserErrors(TTModel model, Action<bool, string> log
                         loggingFunction(true, "Mesh: " + mIdx + " Part: " + pIdx + " has unusual UV2 data.  This can have unexpected results on decal placement or opacity.  Was this intended?");
                     }
 
+                    if (anyWeirdUV3s)
+                    {
+                        loggingFunction(true, "Mesh: " + mIdx + " Part: " + pIdx + " has unusual UV3 data.  This can have unexpected results on some shaders.  Was this intended?");
+                    }
+
                     pIdx++;
                 }
                 mIdx++;

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -3972,7 +3972,6 @@ private static int WriteVertex(VertexByteData importData, Dictionary<VertexUsage
             {
                 if (vertexInfoList[VertexUsageType.BoneIndex][0] == VertexDataType.UByte8)
                 {
-                    ModelModifiers.CleanWeight(v, 8, loggingFunction);
 
                     // 8 Byte stye...
                     importData.VertexData0.Add(v.Weights[0]);
@@ -3994,7 +3993,6 @@ private static int WriteVertex(VertexByteData importData, Dictionary<VertexUsage
                     importData.VertexData0.Add(v.BoneIds[7]);
                 } else
                 {
-                    ModelModifiers.CleanWeight(v, 4, loggingFunction);
                     // 4 byte style ...
                     importData.VertexData0.Add(v.Weights[0]);
                     importData.VertexData0.Add(v.Weights[1]);

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -1338,6 +1338,8 @@ public static async Task ApplyRacialDeform(TTModel model, XivRace targetRace, bo
 
                 // Now we're ready to animate...
 
+                var usageInfo = model.GetUsageInfo();
+
                 // For each mesh
                 foreach (var m in model.MeshGroups)
                 {
@@ -1576,6 +1578,9 @@ public static void CleanWeights(TTModel model, Action<bool, string> loggingFunct
             {
                 return;
             }
+
+            var usage = model.GetUsageInfo();
+
             var mIdx = 0;
             foreach (var m in model.MeshGroups)
             {
@@ -1587,7 +1592,14 @@ public static void CleanWeights(TTModel model, Action<bool, string> loggingFunct
                     var vIdx = 0;
                     foreach (var v in p.Vertices)
                     {
-                        var majorCorrection = CleanWeight(v, model.MdlVersion == 5 ? 4 : 8, loggingFunction);
+                        bool majorCorrection = false;
+                        if(usage.NeedsEightWeights)
+                        {
+                            majorCorrection = CleanWeight(v, 8, loggingFunction);
+                        } else
+                        {
+                            majorCorrection = CleanWeight(v, 4, loggingFunction);
+                        }
                         if (majorCorrection)
                         {
                             perPartMajorCorrections++;

xivModdingFramework/Textures/DataContainers/XivTex.cs

@@ -125,7 +125,8 @@ public static XivTex FromUncompressedTex(BinaryReader br, int dataSize, long off
             tex.Height = header.Height;
 
 
-            tex.Layers = header.Depth;
+            // I HAVE NO IDEA WHAT I'M DOING WITH MULTILAYER DDS
+            tex.Layers = header.ArraySize * header.Depth;
             tex.MipMapCount = header.MipCount;
 
             // We can technically calculate this size based on the texture format and size information.