Some fixes, including an out of bounds error in ProcessVerticesWithoutWeights() and DAE skinning with only fully-weighted meshes.

Author: Sage-of-Mirrors

SuperBMDLib/source/BMD/MAT3.cs

@@ -439,7 +439,12 @@ private void LoadInitData(EndianBinaryReader reader)
                 if ((tevSwapModeTableIndex < 0) || (tevSwapModeTableIndex > m_SwapTableBlock.Count))
                     continue;
                 else
+                {
+                    if (tevSwapModeTableIndex >= m_SwapTableBlock.Count)
+                        continue;
+
                     mat.SwapTables[i] = m_SwapTableBlock[tevSwapModeTableIndex];
+                }
             }
 
             mat.FogInfo = m_FogBlock[reader.ReadInt16()];

SuperBMDLib/source/BMD/TEX1.cs

@@ -44,10 +44,12 @@ public TEX1(EndianBinaryReader reader, int offset)
         public TEX1(Assimp.Scene scene, Arguments args)
         {
             Textures = new List<BinaryTextureImage>();
-            string dir_path = Path.GetDirectoryName(args.texheaders_path);
 
             if (args.texheaders_path != "")
+            {
+                string dir_path = Path.GetDirectoryName(args.texheaders_path);
                 LoadTexturesFromJson(args.texheaders_path, dir_path);
+            }
             else
                 LoadTexturesFromScene(scene, Path.GetDirectoryName(args.input_path));
         }

SuperBMDLib/source/Geometry/Shape.cs

@@ -79,7 +79,7 @@ public void ProcessVerticesWithoutWeights(Mesh mesh, VertexData vertData)
 
             foreach (Face face in mesh.Faces)
             {
-                for (int i = 3; i > 0; i--)
+                for (int i = 2; i > 0; i--)
                 {
                     Vertex vert = new Vertex();
 
@@ -268,7 +268,7 @@ public void ProcessVerticesWithWeights(Mesh mesh, VertexData vertData, Dictionar
                         switch (attrib)
                         {
                             case Enums.GXVertexAttribute.PositionMatrixIdx:
-                                int newMatrixIndex = -1;
+                                int newMatrixIndex = 0;
 
                                 if (curWeight.WeightCount == 1)
                                 {
@@ -281,6 +281,8 @@ public void ProcessVerticesWithWeights(Mesh mesh, VertexData vertData, Dictionar
 
                                     int envIndex = envelopes.Weights.IndexOf(curWeight);
                                     int drwIndex = partialWeight.MeshWeights.IndexOf(curWeight);
+                                    if (drwIndex == -1)
+                                        drwIndex = 0;
 
                                     newMatrixIndex = drwIndex;
                                     partialWeight.Indices[drwIndex] = envIndex;

SuperBMDLib/source/Model.cs

@@ -184,8 +184,8 @@ public void ExportAssImp(string fileName, string modelType, ExportSettings setti
             AssimpContext cont = new AssimpContext();
             cont.ExportFile(outScene, fileName, "collada", PostProcessSteps.ValidateDataStructure);
 
-            if (SkinningEnvelopes.Weights.Count == 0)
-                return; // There's no skinning information, so we can stop here
+            //if (SkinningEnvelopes.Weights.Count == 0)
+                //return; // There's no skinning information, so we can stop here
 
             // Now we need to add some skinning info, since AssImp doesn't do it for some bizarre reason