Changeset 398 for cafu/trunk

Timestamp:

09/29/11 21:19:07 (8 months ago)

Author:

Carsten

Message:

Model code:
In order to prepare some upcoming and more exhaustive changes, rename a private member in CafuModelT.

Location:

cafu/trunk/Libs/Models

Files:

• Model_cmdl.cpp (modified) (8 diffs)
• Model_cmdl.hpp (modified) (2 diffs)

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -308 +308 @@
 
     // Allocate the cache space that is needed for drawing.
-    m_Draw_JointMatrices.PushBackEmpty(m_Joints.Size());
+    m_JointMatrices.PushBackEmpty(m_Joints.Size());
     m_Draw_Meshes.PushBackEmpty(m_Meshes.Size());
 
@@ -953 +953 @@
             if (Super && Super->HasMatrix(JointNr))
             {
-                m_Draw_JointMatrices[JointNr]=Super->GetMatrix(JointNr);
+                m_JointMatrices[JointNr]=Super->GetMatrix(JointNr);
                 continue;
             }
@@ -960 +960 @@
             const MatrixT RelMatrix(J.Pos, cf::math::QuaternionfT::FromXYZ(J.Qtr), J.Scale);
 
-            m_Draw_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_Draw_JointMatrices[J.Parent]*RelMatrix;
+            m_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_JointMatrices[J.Parent]*RelMatrix;
         }
     }
@@ -975 +975 @@
             if (Super && Super->HasMatrix(JointNr))
             {
-                m_Draw_JointMatrices[JointNr]=Super->GetMatrix(JointNr);
+                m_JointMatrices[JointNr]=Super->GetMatrix(JointNr);
                 continue;
             }
@@ -1006 +1006 @@
             const JointT& J=m_Joints[JointNr];
 
-            m_Draw_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_Draw_JointMatrices[J.Parent]*RelMatrix;
+            m_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_JointMatrices[J.Parent]*RelMatrix;
         }
     }
@@ -1036 +1036 @@
                 const MeshT::WeightT& Weight=Mesh.Weights[Vertex.FirstWeightIdx];
 
-                Vertex.Draw_Pos=m_Draw_JointMatrices[Weight.JointIdx].Mul_xyz1(Weight.Pos);
+                Vertex.Draw_Pos=m_JointMatrices[Weight.JointIdx].Mul_xyz1(Weight.Pos);
             }
             else
@@ -1046 +1046 @@
                     const MeshT::WeightT& Weight=Mesh.Weights[Vertex.FirstWeightIdx+WeightNr];
 
-                    Vertex.Draw_Pos+=m_Draw_JointMatrices[Weight.JointIdx].Mul_xyz1(Weight.Pos) * Weight.Weight;
+                    Vertex.Draw_Pos+=m_JointMatrices[Weight.JointIdx].Mul_xyz1(Weight.Pos) * Weight.Weight;
                 }
             }
@@ -1209 +1209 @@
     }
 
-    return m_Draw_JointMatrices;
+    return m_JointMatrices;
 }
 

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -68 +68 @@
 
 
-    /// A mesh consisting of a material and a list of vertices.
+    /// This struct defines a triangle mesh in the model.
+    /// A mesh essentially consists of a list of triangles whose vertices are composed
+    /// of weighted positions that are attached to the joints of the model.
     struct MeshT
     {
@@ -352 +354 @@
     mutable float                 m_Draw_CachedDataAtFrameNr;   ///< The animation frame    number at which we have computed the cache data.
 
-    mutable ArrayT<MatrixT>       m_Draw_JointMatrices;         ///< The transformation matrices that represent the pose of the skeleton at the given animation sequence and frame number.
-    mutable ArrayT<MatSys::MeshT> m_Draw_Meshes;                ///< The draw meshes resulting from m_Draw_JointMatrices.
+    mutable ArrayT<MatrixT>       m_JointMatrices;              ///< The transformation matrices that represent the pose of the skeleton at the given animation sequence and frame number.
+    mutable ArrayT<MatSys::MeshT> m_Draw_Meshes;                ///< The draw meshes resulting from m_JointMatrices.
 };