Ticket #2026: cleanedup.patch

Model.cpp

@@ -178 +178 @@
 
         // extend bounds by vertex positions at the frame
         for (size_t i=0;i<numverts;i++)
-        {
-            result += CModelDef::SkinPoint(verts[i], GetAnimatedBoneMatrices());
-        }
+            CModelDef::SkinPoint(verts[i], GetAnimatedBoneMatrices(), result);
         // advance to next frame
         m_AnimTime += anim->GetFrameTime();
     }
@@ -424 +424 @@
 
     if (m_BoneMatrices)
     {
+        CMatrix3D* inverseBoneMatrices = m_pModelDef->GetInverseBindBoneMatrices();
         for (size_t i = 0; i < m_pModelDef->GetNumBones(); i++)
         {
-            m_BoneMatrices[i] = m_BoneMatrices[i] * m_pModelDef->GetInverseBindBoneMatrices()[i];
+            m_BoneMatrices[i] *= inverseBoneMatrices[i];
         }
 
         // Note: there is a special case of joint influence, in which the vertex

ModelDef.cpp

@@ -30 +30 @@
 # include <xmmintrin.h>
 #endif
 
-CVector3D CModelDef::SkinPoint(const SModelVertex& vtx,
-                               const CMatrix3D newPoseMatrices[])
+void CModelDef::SkinPoint(const SModelVertex& vtx, const CMatrix3D newPoseMatrices[],
+                               CVector3D &result)
 {
-    CVector3D result (0, 0, 0);
-
     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;
+void CModelDef::SkinPoint(const SModelVertex& vtx, const CMatrix3D newPoseMatrices[],
+                          CBoundingBoxAligned &result)
+{
+    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];
+    
 }
 
-CVector3D CModelDef::SkinNormal(const SModelVertex& vtx,
-                                const CMatrix3D newPoseMatrices[])
+void CModelDef::SkinNormal(const SModelVertex& vtx, const CMatrix3D newPoseMatrices[],
+                                CVector3D &result)
 {
     // To be correct, the normal vectors apparently need to be multiplied by the
     // inverse of the transpose. Unfortunately inverses are slow.
@@ -69 +72 @@
     // (This isn't very good as a proof, but it's better than assuming M is
     // orthogonal when it's clearly not.)
 
-    CVector3D result (0, 0, 0);
-
     for (int i = 0; i < SVertexBlend::SIZE && vtx.m_Blend.m_Bone[i] != 0xff; ++i)
-    {
         result += newPoseMatrices[vtx.m_Blend.m_Bone[i]].Rotate(vtx.m_Norm) * vtx.m_Blend.m_Weight[i];
-    }
     
     // If there was more than one influence, the result is probably not going
     // to be of unit length (since it's a weighted sum of several independent
@@ -83 +82 @@
     // optimise that case a bit.)
     if (vtx.m_Blend.m_Bone[1] != 0xff) // if more than one influence
         result.Normalize();
-
-    return result;
 }
 
 void CModelDef::SkinPointsAndNormals(
@@ -400 +397 @@
 
             for (size_t i = 0; i < mdef->m_NumVertices; ++i)
             {
-                mdef->m_pVertices[i].m_Coords = SkinPoint(mdef->m_pVertices[i], &bindPose[0]);
-                mdef->m_pVertices[i].m_Norm = SkinNormal(mdef->m_pVertices[i], &bindPose[0]);
+                SkinPoint(mdef->m_pVertices[i], &bindPose[0], mdef->m_pVertices[i].m_Coords);
+                SkinNormal(mdef->m_pVertices[i], &bindPose[0], mdef->m_pVertices[i].m_Norm);
             }
         }
     }

ModelDef.h

@@ -23 +23 @@
 #define INCLUDED_MODELDEF
 
 #include "ps/CStr.h"
+#include "maths/BoundingBoxAligned.h"
 #include "maths/Vector2D.h"
 #include "maths/Vector3D.h"
 #include "maths/Quaternion.h"
@@ -192 +193 @@
      *
      * @return new world-space vertex coordinates
      */
-    static CVector3D SkinPoint(const SModelVertex& vtx,
-        const CMatrix3D newPoseMatrices[]);
+    static void SkinPoint(const SModelVertex& vtx, const CMatrix3D newPoseMatrices[],
+                          CVector3D &result);
+    static void SkinPoint(const SModelVertex& vtx, const CMatrix3D newPoseMatrices[],
+                          CBoundingBoxAligned &result);
 
     /**
      * Transform the given vertex's normal from the bind pose into the new pose.
      *
      * @return new world-space vertex normal
      */
-    static CVector3D SkinNormal(const SModelVertex& vtx,
-        const CMatrix3D newPoseMatrices[]);
+    static void SkinNormal(const SModelVertex& vtx, const CMatrix3D newPoseMatrices[], CVector3D &result);
 
     /**
      * Transform vertices' positions and normals.