Changeset 462

Timestamp:

01/11/12 12:40:26 (4 months ago)

Author:

Carsten

Message:

Model code:
Reordered methods in AnimExpressionT class hierarchy.

This is just a cosmetic change for improved consistency.

Location:

cafu/trunk/Libs/Models

Files:

• AnimExpr.cpp (modified) (2 diffs)
• AnimExpr.hpp (modified) (4 diffs)

cafu/trunk/Libs/Models/AnimExpr.cpp

@@ -41 +41 @@
 {
     NormalizeInput();
-}
-
-
-void AnimExprStandardT::NormalizeInput()
-{
-    const ArrayT<CafuModelT::AnimT>& Anims=GetModel().GetAnims();
-
-    // m_SequNr==-1 means "use the bind pose from the model file only (no anim)".
-    if (m_SequNr < -1) m_SequNr = -1;
-    if (m_SequNr >= int(Anims.Size())) m_SequNr = -1;
-    if (m_SequNr != -1 && (Anims[m_SequNr].FPS<0.0 || Anims[m_SequNr].Frames.Size()==0)) m_SequNr = -1;
-
-    m_FrameNr=std::max(m_FrameNr, 0.0f);
-    m_FrameNr=(m_SequNr==-1) ? 0.0f : fmod(m_FrameNr, float(Anims[m_SequNr].Frames.Size()));
 }
 
@@ -176 +162 @@
 
 
+void AnimExprStandardT::NormalizeInput()
+{
+    const ArrayT<CafuModelT::AnimT>& Anims=GetModel().GetAnims();
+
+    // m_SequNr==-1 means "use the bind pose from the model file only (no anim)".
+    if (m_SequNr < -1) m_SequNr = -1;
+    if (m_SequNr >= int(Anims.Size())) m_SequNr = -1;
+    if (m_SequNr != -1 && (Anims[m_SequNr].FPS<0.0 || Anims[m_SequNr].Frames.Size()==0)) m_SequNr = -1;
+
+    m_FrameNr=std::max(m_FrameNr, 0.0f);
+    m_FrameNr=(m_SequNr==-1) ? 0.0f : fmod(m_FrameNr, float(Anims[m_SequNr].Frames.Size()));
+}
+
+
 /***********************/
 /*** AnimExprFilterT ***/

cafu/trunk/Libs/Models/AnimExpr.hpp

@@ -139 +139 @@
     AnimExprFilterT(const CafuModelT& Model, AnimExpressionPtrT SubExpr, const std::string& ChannelName);
 
+    // Implementations and overrides for base class methods.
+    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 AnimExpressionPtrT Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const AnimExpressionPtrT& AE) const;
+
     /// Re-initializes this anim expression, so that it can be re-used with different parameters (on the same model).
     void ReInit(AnimExpressionPtrT SubExpr, unsigned int ChannelNr);
 
-    // Implementations and overrides for base class methods.
-    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 AnimExpressionPtrT Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
-    virtual bool IsEqual(const AnimExpressionPtrT& AE) const;
-
 
     private:
@@ -162 +162 @@
     AnimExprCombineT(const CafuModelT& Model, AnimExpressionPtrT A, AnimExpressionPtrT B);
 
+    // Implementations and overrides for base class methods.
+    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 AnimExpressionPtrT Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const AnimExpressionPtrT& AE) const;
+
     /// Re-initializes this anim expression, so that it can be re-used with different parameters (on the same model).
     void ReInit(AnimExpressionPtrT A, AnimExpressionPtrT B);
 
-    // Implementations and overrides for base class methods.
-    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 AnimExpressionPtrT Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
-    virtual bool IsEqual(const AnimExpressionPtrT& AE) const;
-
 
     private:
@@ -184 +184 @@
 
     AnimExprBlendT(const CafuModelT& Model, AnimExpressionPtrT A, AnimExpressionPtrT B, float Duration);
+
+    // Implementations and overrides for base class methods.
+    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 AnimExpressionPtrT Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
+    virtual bool IsEqual(const AnimExpressionPtrT& AE) const;
 
     /// Re-initializes this anim expression, so that it can be re-used with different parameters (on the same model).
@@ -198 +204 @@
     /// Returns how far the blend has advanced.
     float GetFrac() const { return m_Frac; }
-
-    // Implementations and overrides for base class methods.
-    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 AnimExpressionPtrT Clone() const;   // Unfortunately, the proper covariant return type cannot be used with smart pointers.
-    virtual bool IsEqual(const AnimExpressionPtrT& AE) const;