Changeset 460 for cafu/trunk

Timestamp:

01/11/12 12:10:00 (4 months ago)

Author:

Carsten

Message:

Model code:

• Removed the now (see r459) obsolete "ChangeNum" stuff from the AnimExpressionT class hierarchy.
• Fixed a bug in AnimExprBlendT::IsEqual().

Location:

cafu/trunk/Libs/Models

Files:

• AnimExpr.cpp (modified) (8 diffs)
• AnimExpr.hpp (modified) (6 diffs)

cafu/trunk/Libs/Models/AnimExpr.cpp

@@ -26 +26 @@
 AnimExpressionT::AnimExpressionT(const CafuModelT& Model)
     : m_Model(Model),
-      m_RefCount(0),
-      m_ChangeNum(0)
-{
-    UpdateChangeNum();
-}
-
-
-void AnimExpressionT::UpdateChangeNum()
-{
-    static unsigned int s_ChangeCount=0;
-
-    m_ChangeNum = ++s_ChangeCount;
+      m_RefCount(0)
+{
 }
 
@@ -174 +164 @@
     m_SequNr=SequNr;
     NormalizeInput();
-
-    UpdateChangeNum();
 }
 
@@ -185 +173 @@
     m_FrameNr=FrameNr;
     NormalizeInput();
-
-    UpdateChangeNum();
 }
 
@@ -231 +217 @@
     m_SubExpr  =SubExpr;
     m_ChannelNr=ChannelNr;
-
-    UpdateChangeNum();
-}
-
-
-unsigned int AnimExprFilterT::GetChangeNum() const
-{
-    return std::max(AnimExpressionT::GetChangeNum(), m_SubExpr->GetChangeNum());
 }
 
@@ -286 +264 @@
     m_A=A;
     m_B=B;
-
-    UpdateChangeNum();
-}
-
-
-unsigned int AnimExprCombineT::GetChangeNum() const
-{
-    return std::max(AnimExpressionT::GetChangeNum(),
-                    std::max(m_A->GetChangeNum(), m_B->GetChangeNum()));
 }
 
@@ -362 +331 @@
     m_Duration=Duration;
     m_Frac=0.0f;
-
-    UpdateChangeNum();
-}
-
-
-unsigned int AnimExprBlendT::GetChangeNum() const
-{
-    if (m_Frac >= 1.0f)
-    {
-        return std::max(AnimExpressionT::GetChangeNum(), m_B->GetChangeNum());
-    }
-
-    return std::max(AnimExpressionT::GetChangeNum(),
-                    std::max(m_A->GetChangeNum(), m_B->GetChangeNum()));
 }
 
@@ -437 +392 @@
 
     m_B->AdvanceTime(Time, ForceLoop);
-
-
-    UpdateChangeNum();
 }
 
@@ -457 +409 @@
 
     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);
+    return m_Frac==Other->m_Frac && m_Duration==Other->m_Duration &&
+           m_B->IsEqual(Other->m_B) &&
+           (m_A==NULL ? Other->m_A==NULL : m_A->IsEqual(Other->m_A));
 }
 

cafu/trunk/Libs/Models/AnimExpr.hpp

@@ -65 +65 @@
     unsigned int GetRefCount() const { return m_RefCount; }
 
-    /// Returns a number that changes whenever this expression changes,
-    /// or more precisely, that changes whenever the data returned by GetData() changes.
-    /// This is the case for example after every call to AdvanceTime() with a nonzero Time,
-    /// or when a sub-expression has been modified (e.g. got a new sequence number assigned).
-    /// The caller can use this number in order to control updates of its mesh caches.
-    virtual unsigned int GetChangeNum() const { return m_ChangeNum; }
-
     /// For the joint with the given JointNr, this function returns
     ///   - the joint weight,
@@ -90 +83 @@
 
 
-    protected:
-
-    void UpdateChangeNum();
-
-
     private:
 
@@ -104 +92 @@
     const CafuModelT& m_Model;      ///< The related model that this is an anim expression for.
     unsigned int      m_RefCount;   ///< How many IntrusivePtrT<>'s currently refer to this anim expression?
-    unsigned int      m_ChangeNum;  ///< Changes whenever the data returned by GetData() changes.
 };
 
@@ -156 +143 @@
 
     // Implementations and overrides for base class methods.
-    virtual unsigned int GetChangeNum() const;
     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); }
@@ -180 +166 @@
 
     // Implementations and overrides for base class methods.
-    virtual unsigned int GetChangeNum() const;
     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);
@@ -215 +200 @@
 
     // Implementations and overrides for base class methods.
-    virtual unsigned int GetChangeNum() const;
     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);