Changeset 422 for cafu/trunk

Timestamp:

11/14/11 13:43:11 (6 months ago)

Author:

Carsten

Message:

Model code:
Removed struct AnimPoseT::SuperT again, which greatly simplifies the user code.
The performance impact for searching the joints in AnimPoseT::GetJointMatrix() seems negligible, if present at all.

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ModelDocument.cpp (modified) (2 diffs)
• CaWE/ModelEditor/ModelDocument.hpp (modified) (1 diff)
• CaWE/ModelEditor/SceneView3D.cpp (modified) (2 diffs)
• CaWE/ModelEditor/SubmodelsList.cpp (modified) (1 diff)
• Libs/Models/AnimPose.cpp (modified) (6 diffs)
• Libs/Models/AnimPose.hpp (modified) (4 diffs)
• Libs/Models/Model_cmdl.hpp (modified) (1 diff)

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -41 +41 @@
 
 
-ModelEditor::ModelDocumentT::SubmodelT::SubmodelT(const wxString& fn, CafuModelT* sm, const ArrayT<unsigned int>& jm)
-    : m_Filename(fn),
-      m_Submodel(sm),
-      m_Pose(*sm, -1, 0.0f),
-      m_JointsMap(jm)
+ModelEditor::ModelDocumentT::SubmodelT::SubmodelT(CafuModelT* Submodel)
+    : m_Submodel(Submodel),
+      m_Pose(*Submodel, -1, 0.0f)
 {
 }
@@ -167 +165 @@
     try
     {
-        CafuModelT*          Submodel=LoadModel(FileName);
-        ArrayT<unsigned int> JointsMap;
-
-        for (unsigned int JointNr=0; JointNr<Submodel->GetJoints().Size(); JointNr++)
-        {
-            const std::string& SubName=Submodel->GetJoints()[JointNr].Name;
-
-            unsigned int JNr;
-            for (JNr=0; JNr<m_Model->GetJoints().Size(); JNr++)
-                if (wxStricmp(SubName, m_Model->GetJoints()[JNr].Name)==0)
-                    break;
-
-            // Not found / no correspondence is indicated by a too large and thus invalid JNr.
-            JointsMap.PushBack(JNr);
-        }
-
-        m_Submodels.PushBack(new SubmodelT(FileName, Submodel, JointsMap));
+        m_Submodels.PushBack(new SubmodelT(LoadModel(FileName)));
     }
     catch (const ModelT::LoadError& /*E*/)

cafu/trunk/CaWE/ModelEditor/ModelDocument.hpp

@@ -76 +76 @@
             public:
 
-            SubmodelT(const wxString& fn, CafuModelT* sm, const ArrayT<unsigned int>& jm);
+            SubmodelT(CafuModelT* Submodel);
             ~SubmodelT();
 
-            const wxString&             GetFilename() const { return m_Filename; }
-            const CafuModelT*           GetSubmodel() const { return m_Submodel; }
-            AnimPoseT&                  GetPose() { return m_Pose; }
-            const ArrayT<unsigned int>& GetJointsMap() const { return m_JointsMap; }
+            const CafuModelT* GetSubmodel() const { return m_Submodel; }
+            AnimPoseT&        GetPose() { return m_Pose; }
 
 
             private:
 
-            wxString             m_Filename;    ///< The filename of the submodel.
-            CafuModelT*          m_Submodel;    ///< The submodel that is shown with the main model.
-            AnimPoseT            m_Pose;        ///< The pose of the submodel.
-            ArrayT<unsigned int> m_JointsMap;   ///< Describes how the joints of the m_Submodel map to the joints of the m_Model super model.
-
             SubmodelT(const SubmodelT&);        ///< Use of the Copy    Constructor is not allowed.
             void operator = (const SubmodelT&); ///< Use of the Assignment Operator is not allowed.
+
+            CafuModelT* m_Submodel;   ///< The submodel that is shown with the main model.
+            AnimPoseT   m_Pose;       ///< The pose of the submodel.
         };
 

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -379 +379 @@
             AnimPoseT&                 SmPose=SM->GetPose();
 
-            const AnimPoseT::SuperT Super(
-                Anim.Pose.GetJointMatrices(),
-                SM->GetJointsMap());
-
-            SmPose.SetSuper(&Super);
+            SmPose.SetSuperPose(&Anim.Pose);
             SmPose.Draw(-1 /*SkinNr*/, 0.0f /*LodDist*/);
-            SmPose.SetSuper(NULL);
+            SmPose.SetSuperPose(NULL);
         }
     }
@@ -400 +396 @@
             AnimPoseT&                 SmPose=SM->GetPose();
 
-            const AnimPoseT::SuperT Super(
-                Anim.Pose.GetJointMatrices(),
-                SM->GetJointsMap());
-
-            SmPose.SetSuper(&Super);
+            SmPose.SetSuperPose(&Anim.Pose);
             RenderSkeleton(SM->GetSubmodel()->GetJoints(), SmPose.GetJointMatrices(), true);
-            SmPose.SetSuper(NULL);
+            SmPose.SetSuperPose(NULL);
         }
     }

cafu/trunk/CaWE/ModelEditor/SubmodelsList.cpp

@@ -94 +94 @@
     for (unsigned long ElemNr=0; ElemNr<m_ModelDoc->GetSubmodels().Size(); ElemNr++)
     {
-        wxFileName fn(m_ModelDoc->GetSubmodels()[ElemNr]->GetFilename());
+        wxFileName fn(m_ModelDoc->GetSubmodels()[ElemNr]->GetSubmodel()->GetFileName());
 
         fn.MakeRelativeTo(m_ModelDoc->GetGameConfig()->ModDir);

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -33 +33 @@
       m_SequNr(SequNr),
       m_FrameNr(FrameNr),
-      m_Super(NULL),
+      m_SuperPose(NULL),
       m_DlodPose(m_Model.GetDlodModel() ? new AnimPoseT(*m_Model.GetDlodModel(), SequNr, FrameNr) : NULL),  // Recursively create the chain of dlod poses matching the chain of dlod models.
       m_NeedsRecache(true),
@@ -76 +76 @@
 
 
-void AnimPoseT::SetSuper(const SuperT* Super)
-{
-    if (m_Super==Super) return;
-
-    m_Super=Super;
+void AnimPoseT::SetSuperPose(const AnimPoseT* SuperPose)
+{
+    if (m_SuperPose==SuperPose) return;
+
+    m_SuperPose=SuperPose;
 
     m_NeedsRecache=true;
 
     // Recursively update the chain of dlod poses.
-    if (m_DlodPose) m_DlodPose->SetSuper(Super);
+    if (m_DlodPose) m_DlodPose->SetSuperPose(SuperPose);
 }
 
@@ -406 +406 @@
 
 
+const MatrixT* AnimPoseT::GetJointMatrix(const std::string& JointName) const
+{
+    Recache();
+
+    for (unsigned int JointNr=0; JointNr<m_Model.GetJoints().Size(); JointNr++)
+        if (m_Model.GetJoints()[JointNr].Name == JointName)
+            return &m_JointMatrices[JointNr];
+
+    return NULL;
+}
+
+
 const ArrayT<AnimPoseT::MeshInfoT>& AnimPoseT::GetMeshInfos() const
 {
@@ -526 +538 @@
         for (unsigned long JointNr=0; JointNr<Joints.Size(); JointNr++)
         {
-            if (m_Super && m_Super->HasMatrix(JointNr))
-            {
-                m_JointMatrices[JointNr]=m_Super->GetMatrix(JointNr);
-                continue;
+            if (m_SuperPose)
+            {
+                const MatrixT* SuperMat=m_SuperPose->GetJointMatrix(Joints[JointNr].Name);
+
+                if (SuperMat)
+                {
+                    m_JointMatrices[JointNr]=*SuperMat;
+                    continue;
+                }
             }
 
@@ -548 +565 @@
         for (unsigned long JointNr=0; JointNr<Joints.Size(); JointNr++)
         {
-            if (m_Super && m_Super->HasMatrix(JointNr))
-            {
-                m_JointMatrices[JointNr]=m_Super->GetMatrix(JointNr);
-                continue;
+            if (m_SuperPose)
+            {
+                const MatrixT* SuperMat=m_SuperPose->GetJointMatrix(Joints[JointNr].Name);
+
+                if (SuperMat)
+                {
+                    m_JointMatrices[JointNr]=*SuperMat;
+                    continue;
+                }
             }
 
@@ -820 +842 @@
 void AnimPoseT::Recache() const
 {
-    if (!m_NeedsRecache && !m_Super) return;
+    if (!m_NeedsRecache && !m_SuperPose) return;
 
     SyncDimensions();

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -75 +75 @@
 
 
-    /// This struct describes information about a parent or "super" model whose skeleton pose
-    /// should be used when rendering this model. For example, a player model can act as the
-    /// super model for a weapon, so that the skeleton of the weapon is copied from the
-    /// player model in order to align the weapon with the hands of the player.
-    struct SuperT
-    {
-        /// The constructor.
-        /// @param Matrices_   The draw matrices of the super model.
-        /// @param Map_        Describes how our joints map to the joints of the super model.
-        ///                    If <tt>Map_[i]</tt> is not a valid index into \c Matrices_, then our joint \c i has no match in the skeleton of the super model.
-        SuperT(const ArrayT<MatrixT>& Matrices_, const ArrayT<unsigned int>& Map_) : Matrices(Matrices_), Map(Map_) { }
-
-        /// Has our joint \c JointNr a correspondence in the super model?
-        bool HasMatrix(unsigned long JointNr) const { return Map[JointNr] < Matrices.Size(); }
-
-        /// For our joint \c JointNr, return the corresponding matrix from the super model.
-        /// Only call this if HasMatrix(JointNr) returns \c true.
-        const MatrixT& GetMatrix(unsigned long JointNr) const { return Matrices[Map[JointNr]]; }
-
-        const ArrayT<MatrixT>&      Matrices;   ///< The draw matrices of the super model.
-        const ArrayT<unsigned int>& Map;        ///< Describes how our joints map to the joints of the super model. If <tt>Map[i]</tt> is not a valid index into \c Matrices, then our joint \c i has no match in the skeleton of the super model.
-    };
-
-
     /// The constructor.
     AnimPoseT(const CafuModelT& Model, int SequNr=-1, float FrameNr=0.0f);
@@ -112 +88 @@
     float GetFrameNr() const { return m_FrameNr; }
 
-    /// @param FrameNr      The frame number in the animation sequence to render to model at.
+    /// @param FrameNr      The frame number in the animation sequence to render the model at.
     void SetFrameNr(float FrameNr);
 
-    /// @param Super        Information about a parent or "super" model whose skeleton pose should be used when rendering this model.
-    void SetSuper(const SuperT* Super);
+    /// This method assigns a pose of a parent or "super" model that should be used when rendering this model.
+    ///
+    /// For example, a player model can act as the super model for a weapon,
+    /// so that the skeleton of the weapon is copied from the player model
+    /// in order to align the weapon with the hands of the player.
+    ///
+    /// @param SuperPose   The super model pose that should be used when rendering this model.
+    void SetSuperPose(const AnimPoseT* SuperPose);
 
     /// Advances the pose in time.
@@ -147 +129 @@
     const ArrayT<MatrixT>& GetJointMatrices() const;
 
+    /// Returns the transformation matrix for the joint with the given name, or \c NULL if there is no such joint.
+    const MatrixT* GetJointMatrix(const std::string& JointName) const;
+
     /// Returns the mesh infos with additional data for each mesh in this pose.
     const ArrayT<MeshInfoT>& GetMeshInfos() const;
@@ -170 +155 @@
     int                           m_SequNr;         ///< The animation sequence number at which we have computed the cache data.
     float                         m_FrameNr;        ///< The animation frame    number at which we have computed the cache data.
-    const SuperT*                 m_Super;
+    const AnimPoseT*              m_SuperPose;
     AnimPoseT*                    m_DlodPose;       ///< The next pose in the chain of dlod poses matching the chain of dlod models.
  // ArrayT<...>                   m_Def;            ///< Array of { channel, sequence, framenr, (forceloop), blendweight } tuples.

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -279 +279 @@
 
     // The ModelT interface.
-    const std::string& GetFileName() const;     // TODO: Remove!?!
+    const std::string& GetFileName() const;
     void               Draw(int SequenceNr, float FrameNr, float LodDist, const ModelT* SubModel=NULL) const;
     bool               GetGuiPlane(int SequenceNr, float FrameNr, float LodDist, Vector3fT& GuiOrigin, Vector3fT& GuiAxisX, Vector3fT& GuiAxisY) const;