Fixed normals so that those with only one bone influencing them are

transformed into bone space.

Author: Sage-of-Mirrors

SuperBMDLib/source/BMD/SHP1.cs

@@ -130,7 +130,7 @@ private SHP1(EndianBinaryReader reader, int offset)
             reader.BaseStream.Seek(offset + shp1Size, System.IO.SeekOrigin.Begin);
         }
 
-        private SHP1(Assimp.Scene scene, VertexData vertData, Dictionary<string, int> boneNames, EVP1 envelopes, DRW1 partialWeight)
+        private SHP1(Assimp.Scene scene, VertexData vertData, Dictionary<string, int> boneNames, EVP1 envelopes, DRW1 partialWeight, List<Rigging.Bone> skeleton)
         {
             Shapes = new List<Shape>();
             RemapTable = new List<int>();
@@ -141,7 +141,7 @@ private SHP1(Assimp.Scene scene, VertexData vertData, Dictionary<string, int> bo
                 meshShape.SetDescriptorAttributes(mesh, boneNames.Count);
 
                 if (boneNames.Count > 1)
-                    meshShape.ProcessVerticesWithWeights(mesh, vertData, boneNames, envelopes, partialWeight);
+                    meshShape.ProcessVerticesWithWeights(mesh, vertData, boneNames, envelopes, partialWeight, skeleton);
                 else
                 {
                     meshShape.ProcessVerticesWithoutWeights(mesh, vertData);
@@ -158,9 +158,9 @@ public static SHP1 Create(EndianBinaryReader reader, int offset)
             return new SHP1(reader, offset);
         }
 
-        public static SHP1 Create(Scene scene, Dictionary<string, int> boneNames, VertexData vertData, EVP1 evp1, DRW1 drw1)
+        public static SHP1 Create(Scene scene, Dictionary<string, int> boneNames, VertexData vertData, EVP1 evp1, DRW1 drw1, JNT1 jnt1)
         {
-            SHP1 shp1 = new SHP1(scene, vertData, boneNames, evp1, drw1);
+            SHP1 shp1 = new SHP1(scene, vertData, boneNames, evp1, drw1, jnt1.FlatSkeleton);
 
             return shp1;
         }

SuperBMDLib/source/Geometry/Shape.cs

@@ -177,7 +177,7 @@ public void ProcessVerticesWithoutWeights(Mesh mesh, VertexData vertData)
             Bounds.GetBoundsValues(AttributeData.Positions);
         }
 
-        public void ProcessVerticesWithWeights(Mesh mesh, VertexData vertData, Dictionary<string, int> boneNames, EVP1 envelopes, DRW1 partialWeight)
+        public void ProcessVerticesWithWeights(Mesh mesh, VertexData vertData, Dictionary<string, int> boneNames, EVP1 envelopes, DRW1 partialWeight, List<SuperBMDLib.Rigging.Bone> skeleton)
         {
             Packet pack = new Packet();
 
@@ -322,11 +322,15 @@ public void ProcessVerticesWithWeights(Mesh mesh, VertexData vertData, Dictionar
                                 }
                                 else
                                 {
-                                    for(int v = 0; v < curWeight.WeightCount; v++)
+                                    /*Matrix4 mat = Matrix4.Identity;
+
+                                    for (int v = 0; v < curWeight.WeightCount; v++)
                                     {
-                                        Matrix4 ibm = envelopes.InverseBindMatrices[curWeight.BoneIndices[v]];
-                                        vertNrm = Vector3.TransformNormal(vertNrm, ibm * curWeight.Weights[v]);
+                                        int boneIndex = curWeight.BoneIndices[v];
+                                        mat += Matrix4.Mult(envelopes.InverseBindMatrices[boneIndex], curWeight.Weights[v]);
                                     }
+
+                                    vertNrm = Vector3.TransformNormal(vertNrm, mat);*/
                                 }
 
                                 AttributeData.Normals.Add(vertNrm);

SuperBMDLib/source/Model.cs

@@ -107,7 +107,7 @@ public Model(Scene scene, Arguments args)
 
             PartialWeightData = new DRW1(scene, Joints.BoneNameIndices);
 
-            Shapes = SHP1.Create(scene, Joints.BoneNameIndices, VertexData.Attributes, SkinningEnvelopes, PartialWeightData);
+            Shapes = SHP1.Create(scene, Joints.BoneNameIndices, VertexData.Attributes, SkinningEnvelopes, PartialWeightData, Joints);
 
             Materials = new MAT3(scene, Textures, Shapes, args);
             Scenegraph = new INF1(scene, Joints);