Ticket #2026: skinning0.patch

source/graphics/Model.cpp

@@ -177 +177 @@
         ValidatePosition();
 
         // extend bounds by vertex positions at the frame
-        for (size_t i=0;i<numverts;i++)
-        {
-            result += CModelDef::SkinPoint(verts[i], GetAnimatedBoneMatrices());
-        }
+        result += CModelDef::SkinPoints(numverts, verts, GetAnimatedBoneMatrices());
         // advance to next frame
         m_AnimTime += anim->GetFrameTime();
     }

source/graphics/ModelDef.cpp

@@ -43 +43 @@
     return result;
 }
 
+CVector3D CModelDef::SkinPoints(
+        size_t numVertices,
+        const SModelVertex* vertices,
+        const CMatrix3D newPoseMatrices[])
+{
+    CVector3D result (0, 0, 0);
+
+    for (size_t j = 0; j < numVertices; ++j)
+    {
+        const SModelVertex& vtx = vertices[j];
+
+        for (int i = 0; i < SVertexBlend::SIZE && vtx.m_Blend.m_Bone[i] != 0xff; ++i)
+            result += newPoseMatrices[vtx.m_Blend.m_Bone[i]].Transform(vtx.m_Coords) * vtx.m_Blend.m_Weight[i];
+    }
+    return result;
+}
+
 CVector3D CModelDef::SkinNormal(const SModelVertex& vtx,
                                 const CMatrix3D newPoseMatrices[])
 {

source/graphics/ModelDef.h

@@ -194 +194 @@
      */
     static CVector3D SkinPoint(const SModelVertex& vtx,
         const CMatrix3D newPoseMatrices[]);
-
+    /**
+     * Add up all results of SkinPoint over vertices.
+     */
+    static CVector3D SkinPoints(
+        size_t numVertices,
+        const SModelVertex* vertices,
+        const CMatrix3D newPoseMatrices[]);
     /**
      * Transform the given vertex's normal from the bind pose into the new pose.
      *