Changeset 459 for cafu/trunk

Timestamp:

01/11/12 11:36:20 (4 months ago)

Author:

Carsten

Message:

Model code:
AnimPoseT now compares AnimExpressionT instances by value in order to determine if it must refresh its mesh caches.

That is, if Pose is an AnimPoseT instance and Model is the related model instance, then in the call sequence

    Pose.SetAnimExpr(new AnimExprStandardT(Model, -1, 0.0f));
    Pose.Draw(0, 0.0f);

    Pose.SetAnimExpr(new AnimExprStandardT(Model, -1, 0.0f));
    Pose.Draw(0, 0.0f);

the second call to SetAnimExpr() will now no longer trigger cache refreshes in Pose (even though the second anim expression is an entirely different instance than the first).

This feature is very important for the worldly use of AnimPoseTs and AnimExpressionTs, where poses may be shared across different users and the above call sequence occurs frequently.

Location:

cafu/trunk/Libs/Models

Files:

• AnimExpr.cpp (modified) (4 diffs)
• AnimExpr.hpp (modified) (6 diffs)
• AnimPose.cpp (modified) (5 diffs)
• AnimPose.hpp (modified) (2 diffs)
• Model_cmdl.cpp (modified) (2 diffs)
• Model_cmdl.hpp (modified) (3 diffs)

cafu/trunk/Libs/Models/AnimExpr.cpp

@@ -153 +153 @@
 
 
+IntrusivePtrT<AnimExpressionT> AnimExprStandardT::Clone() const
+{
+    return GetModel().GetAnimExprPool().GetStandard(m_SequNr, m_FrameNr);
+}
+
+
+bool AnimExprStandardT::IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const
+{
+    AnimExprStandardT* Other=dynamic_cast<AnimExprStandardT*>(AE.get());
+
+    if (!Other) return false;
+    return m_SequNr==Other->m_SequNr && m_FrameNr==Other->m_FrameNr;
+}
+
+
 void AnimExprStandardT::SetSequNr(int SequNr)
 {
@@ -238 +253 @@
 
 
+IntrusivePtrT<AnimExpressionT> AnimExprFilterT::Clone() const
+{
+    return GetModel().GetAnimExprPool().GetFilter(m_SubExpr->Clone(), m_ChannelNr);
+}
+
+
+bool AnimExprFilterT::IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const
+{
+    AnimExprFilterT* Other=dynamic_cast<AnimExprFilterT*>(AE.get());
+
+    if (!Other) return false;
+    return m_ChannelNr==Other->m_ChannelNr && m_SubExpr->IsEqual(Other->m_SubExpr);
+}
+
+
 /************************/
 /*** AnimExprCombineT ***/
@@ -294 +324 @@
     m_A->AdvanceTime(Time, ForceLoop);
     m_B->AdvanceTime(Time, ForceLoop);
+}
+
+
+IntrusivePtrT<AnimExpressionT> AnimExprCombineT::Clone() const
+{
+    return GetModel().GetAnimExprPool().GetCombine(m_A->Clone(), m_B->Clone());
+}
+
+
+bool AnimExprCombineT::IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const
+{
+    AnimExprCombineT* Other=dynamic_cast<AnimExprCombineT*>(AE.get());
+
+    if (!Other) return false;
+    return m_A->IsEqual(Other->m_A) && m_B->IsEqual(Other->m_B);
 }
 
@@ -398 +443 @@
 
 
+IntrusivePtrT<AnimExpressionT> AnimExprBlendT::Clone() const
+{
+    IntrusivePtrT<AnimExprBlendT> Blend=GetModel().GetAnimExprPool().GetBlend(m_A->Clone(), m_B->Clone(), m_Duration);
+
+    Blend->m_Frac=m_Frac;
+    return Blend;
+}
+
+
+bool AnimExprBlendT::IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const
+{
+    AnimExprBlendT* Other=dynamic_cast<AnimExprBlendT*>(AE.get());
+
+    if (!Other) return false;
+    return m_Frac==Other->m_Frac && m_Duration==Other->m_Duration && m_A->IsEqual(Other->m_A) && m_B->IsEqual(Other->m_B);
+}
+
+
 /*********************/
 /*** AnimExprPoolT ***/

cafu/trunk/Libs/Models/AnimExpr.hpp

@@ -28 +28 @@
 
 
+class AnimExpressionT;
 class CafuModelT;
+
+typedef IntrusivePtrT<AnimExpressionT> AnimExpressionPtrT;
 
 
@@ -77 +80 @@
     virtual void AdvanceTime(float Time, bool ForceLoop=false) { }
 
+    /// The virtual copy constructor.
+    /// Creates a new anim expression that is an exact copy of this, even when called
+    /// via the base class pointer (the caller doesn't need to know the exact derived class).
+    virtual IntrusivePtrT<AnimExpressionT> Clone() const=0;
+
+    /// Returns whether this anim expression is equal to \c A.
+    /// Two anim expressions are equal if their GetData() methods return the same data.
+    virtual bool IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const=0;
+
 
     protected:
@@ -105 +117 @@
     virtual void GetData(unsigned int JointNr, float& Weight, Vector3fT& Pos, cf::math::QuaternionfT& Quat, Vector3fT& Scale) const;
     virtual void AdvanceTime(float Time, bool ForceLoop=false);
+    virtual IntrusivePtrT<AnimExpressionT> Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const;
 
     /// Returns the sequence number that is currently set in this expression.
@@ -145 +159 @@
     virtual void GetData(unsigned int JointNr, float& Weight, Vector3fT& Pos, cf::math::QuaternionfT& Quat, Vector3fT& Scale) const;
     virtual void AdvanceTime(float Time, bool ForceLoop=false) { m_SubExpr->AdvanceTime(Time, ForceLoop); }
+    virtual IntrusivePtrT<AnimExpressionT> Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const;
 
 
@@ -167 +183 @@
     virtual void GetData(unsigned int JointNr, float& Weight, Vector3fT& Pos, cf::math::QuaternionfT& Quat, Vector3fT& Scale) const;
     virtual void AdvanceTime(float Time, bool ForceLoop=false);
+    virtual IntrusivePtrT<AnimExpressionT> Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const;
 
 
@@ -200 +218 @@
     virtual void GetData(unsigned int JointNr, float& Weight, Vector3fT& Pos, cf::math::QuaternionfT& Quat, Vector3fT& Scale) const;
     virtual void AdvanceTime(float Time, bool ForceLoop=false);
+    virtual IntrusivePtrT<AnimExpressionT> Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const IntrusivePtrT<AnimExpressionT>& AE) const;
 
 

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -35 +35 @@
       m_SuperPose(NULL),
       m_DlodPose(NULL),
-      m_RecacheCount(0),
+      m_CachedAE(NULL),
       m_BoundingBox()
 {
@@ -52 +52 @@
       m_SuperPose(NULL),
       m_DlodPose(m_Model.GetDlodModel() ? new AnimPoseT(*m_Model.GetDlodModel(), m_AnimExpr) : NULL),  // Recursively create the chain of dlod poses matching the chain of dlod models.
-      m_RecacheCount(0),
+      m_CachedAE(NULL),
       m_BoundingBox()
 {
@@ -423 +423 @@
 void AnimPoseT::Recache() const
 {
-    if (!m_SuperPose && m_RecacheCount==m_AnimExpr->GetChangeNum()) return;
+    if (!m_SuperPose && m_AnimExpr->IsEqual(m_CachedAE)) return;
 
     SyncDimensions();
@@ -438 +438 @@
     //     y();
 
-    m_RecacheCount=m_AnimExpr->GetChangeNum();
+    if (m_SuperPose)
+    {
+        assert(m_CachedAE==NULL);
+    }
+    else
+    {
+        m_CachedAE=m_AnimExpr->Clone();
+    }
 }
 
@@ -477 +484 @@
 
     m_SuperPose=SuperPose;
-    m_RecacheCount=0;
+    m_CachedAE=NULL;
 
     // Recursively update the chain of dlod poses.

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -127 +127 @@
 
     /// Call this if something in the related model has changed.
-    void SetNeedsRecache() { m_RecacheCount=0; }    // 0 is different from any value that m_AnimExpr->GetChangedCount() returns.
+    void SetNeedsRecache() { m_CachedAE=NULL; }
 
     /// This method renders the model in this pose.
@@ -181 +181 @@
     void Recache() const;
 
-    const CafuModelT&              m_Model;         ///< The related model that this is a pose for.
-    IntrusivePtrT<AnimExpressionT> m_AnimExpr;      ///< The expression that describes the skeleton pose for which we have computed the cache data.
-    const AnimPoseT*               m_SuperPose;
-    AnimPoseT*                     m_DlodPose;      ///< The next pose in the chain of dlod poses matching the chain of dlod models.
+    const CafuModelT&             m_Model;          ///< The related model that this is a pose for.
+    AnimExpressionPtrT            m_AnimExpr;       ///< The expression that describes the skeleton pose for which we have computed the cache data.
+    const AnimPoseT*              m_SuperPose;
+    AnimPoseT*                    m_DlodPose;       ///< The next pose in the chain of dlod poses matching the chain of dlod models.
 
-    mutable unsigned int           m_RecacheCount;  ///< Used to detect if the m_AnimExpr has changed, so that our matrices, meshes etc. can be recached.
-    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<MeshInfoT>      m_MeshInfos;     ///< Additional data for each mesh in m_Model.
-    mutable ArrayT<MatSys::MeshT>  m_Draw_Meshes;   ///< The draw meshes resulting from the m_JointMatrices.
-    mutable BoundingBox3fT         m_BoundingBox;   ///< The bounding-box for the model in this pose.
+    mutable AnimExpressionPtrT    m_CachedAE;       ///< Used to detect if the m_AnimExpr has changed, so that our matrices, meshes etc. can be recached.
+    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<MeshInfoT>     m_MeshInfos;      ///< Additional data for each mesh in m_Model.
+    mutable ArrayT<MatSys::MeshT> m_Draw_Meshes;    ///< The draw meshes resulting from the m_JointMatrices.
+    mutable BoundingBox3fT        m_BoundingBox;    ///< The bounding-box for the model in this pose.
 };
 

cafu/trunk/Libs/Models/Model_cmdl.cpp

@@ -30 +30 @@
 #include <iostream>
 
+#if defined(_WIN32) && defined(_MSC_VER)
+    // Turn off warning C4355: 'this' : used in base member initializer list.
+    #pragma warning(disable:4355)
+#endif
+
 
 /*static*/ const unsigned int CafuModelT::CMDL_FILE_VERSION=1;
@@ -249 +254 @@
       m_UseGivenTangentSpace(Loader.UseGivenTS()),  // Should we use the fixed, given tangent space, or recompute it ourselves here?
       m_DlodModel(NULL),
-      m_DlodDist(0.0f)
-      , m_TEMP_Pose(NULL)
+      m_DlodDist(0.0f),
+      m_AnimExprPool(*this),
+      m_TEMP_Pose(NULL)
 {
     // No matter the actual model file format (that is, even if the file format is not "cmdl"),

cafu/trunk/Libs/Models/Model_cmdl.hpp

@@ -228 +228 @@
     /// so that multiple animations can play on different parts of the model at the same time.
     /// For example, you can play a walking animation on the legs, an animation for swinging
-    /// the arms on the upper body, and an animation for moving the eyes on the head. 
+    /// the arms on the upper body, and an animation for moving the eyes on the head.
     ///
     /// Technically, a channel defines a group of joints. It is used to limit or "filter"
@@ -281 +281 @@
     bool IsVertexNrOK(const GuiFixtureT& GF, unsigned int PointNr) const;
 
+    /// This method returns the pool of anim expressions for this model.
+    AnimExprPoolT& GetAnimExprPool() const { return m_AnimExprPool; }
+
     /// This method is strictly for backwards-compatibility only, do not use in new code!
     AnimPoseT* GetSharedPose(int SequNr, float FrameNr) const;
@@ -314 +317 @@
     void InitMeshes();                              ///< An auxiliary method for the constructors.
 
-    const std::string    m_FileName;                ///< File name of this model.   TODO: Remove!?!
-    MaterialManagerImplT m_MaterialMan;             ///< The material manager for the materials that are used with the meshes of this model.
-    ArrayT<JointT>       m_Joints;                  ///< Array of joints of this model.
-    ArrayT<MeshT>        m_Meshes;                  ///< Array of (sub)meshes of this model.
-    ArrayT<SkinT>        m_Skins;                   ///< Array of additional/alternative skins for this model.
-    ArrayT<GuiFixtureT>  m_GuiFixtures;             ///< Array of GUI fixtures in the model.
-    ArrayT<GuiLocT>      m_GuiLocs;                 ///< Array of locations where GUIs can be attached to this model.
-    ArrayT<AnimT>        m_Anims;                   ///< Array of animations of this model.
-    ArrayT<ChannelT>     m_Channels;                ///< Array of channels in this model.
-
-    const bool           m_UseGivenTangentSpace;    ///< Whether this model should use the fixed, given tangent space that was loaded from the model file, or it the tangent space is dynamically recomputed (useful for animated models).
- // const bool           m_CastShadows;             ///< Should this model cast shadows?
-
-    CafuModelT*          m_DlodModel;               ///< Use the m_DlodModel instead of this when the camera is more than m_DlodDist away.
-    float                m_DlodDist;                ///< The distance beyond which the m_DlodModel is used instead of this.
-
-    mutable AnimPoseT*   m_TEMP_Pose;               ///< TEMPORARY!
+    const std::string     m_FileName;               ///< File name of this model.   TODO: Remove!?!
+    MaterialManagerImplT  m_MaterialMan;            ///< The material manager for the materials that are used with the meshes of this model.
+    ArrayT<JointT>        m_Joints;                 ///< Array of joints of this model.
+    ArrayT<MeshT>         m_Meshes;                 ///< Array of (sub)meshes of this model.
+    ArrayT<SkinT>         m_Skins;                  ///< Array of additional/alternative skins for this model.
+    ArrayT<GuiFixtureT>   m_GuiFixtures;            ///< Array of GUI fixtures in the model.
+    ArrayT<GuiLocT>       m_GuiLocs;                ///< Array of locations where GUIs can be attached to this model.
+    ArrayT<AnimT>         m_Anims;                  ///< Array of animations of this model.
+    ArrayT<ChannelT>      m_Channels;               ///< Array of channels in this model.
+
+    const bool            m_UseGivenTangentSpace;   ///< Whether this model should use the fixed, given tangent space that was loaded from the model file, or it the tangent space is dynamically recomputed (useful for animated models).
+ // const bool            m_CastShadows;            ///< Should this model cast shadows?
+
+    CafuModelT*           m_DlodModel;              ///< Use the m_DlodModel instead of this when the camera is more than m_DlodDist away.
+    float                 m_DlodDist;               ///< The distance beyond which the m_DlodModel is used instead of this.
+
+    mutable AnimExprPoolT m_AnimExprPool;           ///< The pool of anim expressions for this model.
+    mutable AnimPoseT*    m_TEMP_Pose;              ///< TEMPORARY!
 };