Changeset 452 for cafu/trunk

Timestamp:

12/31/11 17:57:20 (5 months ago)

Author:

Carsten

Message:

Model code:
Added the basics of "anim expressions".
Anim expressions define "arithmetic on animation sequences", and are the basis for implementing animation blending and animation channels as described at <http://www.cafu.de/forum/viewtopic.php?f=14&t=925>.

This change adds the expression base class AnimExpressionT and the first concrete class AnimExprStandardT that implements the existing functionality of plain normal animation sequence playback.
The AnimPoseT has been updated to use the new AnimExprStandardT class instead of the previous hard-coded functionality.

The next revisions will provide additional implementations for AnimExpressionT that implement blending and channel filtering.

Location:

cafu/trunk/Libs

Files:

• Models/AnimExpr.cpp (added)
• Models/AnimExpr.hpp (added)
• Models/AnimPose.cpp (modified) (11 diffs)
• Models/AnimPose.hpp (modified) (5 diffs)
• Models/Classes.dia (modified) (previous)
• SConscript (modified) (1 diff)

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -21 +21 @@
 
 #include "AnimPose.hpp"
+#include "AnimExpr.hpp"
 #include "Model_cmdl.hpp"
 
@@ -31 +32 @@
 AnimPoseT::AnimPoseT(const CafuModelT& Model, int SequNr, float FrameNr)
     : m_Model(Model),
-      m_SequNr(SequNr),
-      m_FrameNr(FrameNr),
+      m_AnimExpr(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),
+      m_RecacheCount(0),
       m_BoundingBox()
 {
-    NormalizeInput();
+    m_AnimExpr=new AnimExprStandardT(m_Model, SequNr, FrameNr);
 }
 
@@ -45 +45 @@
 {
     delete m_DlodPose;
+    delete m_AnimExpr;
 }
 
@@ -120 +121 @@
     typedef CafuModelT::JointT JointT;
     typedef CafuModelT::MeshT  MeshT;
-    typedef CafuModelT::AnimT  AnimT;
 
     const ArrayT<JointT>& Joints=m_Model.GetJoints();
     const ArrayT<MeshT>&  Meshes=m_Model.GetMeshes();
-    const ArrayT<AnimT>&  Anims =m_Model.GetAnims();
 
 
@@ -132 +131 @@
     // **************************************************************************************************************
 
-    if (m_SequNr==-1)
-    {
-        // Don't animate, just use the bind pose defined in the model file.
-        for (unsigned long JointNr=0; JointNr<Joints.Size(); JointNr++)
-        {
-            if (m_SuperPose)
-            {
-                const MatrixT* SuperMat=m_SuperPose->GetJointMatrix(Joints[JointNr].Name);
-
-                if (SuperMat)
-                {
-                    m_JointMatrices[JointNr]=*SuperMat;
-                    continue;
-                }
-            }
-
-            const JointT& J=Joints[JointNr];
-            const MatrixT RelMatrix(J.Pos, cf::math::QuaternionfT::FromXYZ(J.Qtr), J.Scale);
-
-            m_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_JointMatrices[J.Parent]*RelMatrix;
-        }
-    }
-    else
-    {
-        // m_SequNr is a valid index into Anims, so use that.
-        const AnimT& Anim=Anims[m_SequNr];
-        const int    Frame_0=int(m_FrameNr);                                        // If m_FrameNr == 17.83, then Frame_0 == 17
-        const float  Frame_f=m_FrameNr-Frame_0;                                     //                             Frame_f ==  0.83
-        const int    Frame_1=(Frame_0+1>=int(Anim.Frames.Size())) ? 0 : Frame_0+1;  //                             Frame_1 == 18
-
-        for (unsigned long JointNr=0; JointNr<Joints.Size(); JointNr++)
-        {
-            if (m_SuperPose)
-            {
-                const MatrixT* SuperMat=m_SuperPose->GetJointMatrix(Joints[JointNr].Name);
-
-                if (SuperMat)
-                {
-                    m_JointMatrices[JointNr]=*SuperMat;
-                    continue;
-                }
-            }
-
-            const AnimT::AnimJointT& AJ=Anim.AnimJoints[JointNr];
-
-            Vector3fT Data_0[3]={ AJ.DefaultPos, AJ.DefaultQtr, AJ.DefaultScale };
-            Vector3fT Data_1[3]={ AJ.DefaultPos, AJ.DefaultQtr, AJ.DefaultScale };
-
-            // Determine the position, quaternion and scale for Frame_0 and Frame_1.
-            unsigned int FlagCount=0;
-
-            for (int i=0; i<9; i++)
-            {
-                if ((AJ.Flags >> i) & 1)
-                {
-                    Data_0[i/3][i % 3]=Anim.Frames[Frame_0].AnimData[AJ.FirstDataIdx+FlagCount];
-                    Data_1[i/3][i % 3]=Anim.Frames[Frame_1].AnimData[AJ.FirstDataIdx+FlagCount];
-
-                    FlagCount++;
-                }
-            }
-
-            // Interpolate the position and quaternion according to the fraction Frame_f.
-            const Vector3fT              Pos  =Data_0[0]*(1.0f-Frame_f) + Data_1[0]*Frame_f;
-            const cf::math::QuaternionfT Quat =slerp(cf::math::QuaternionfT::FromXYZ(Data_0[1]), cf::math::QuaternionfT::FromXYZ(Data_1[1]), Frame_f);
-            const Vector3fT              Scale=Data_0[2]*(1.0f-Frame_f) + Data_1[2]*Frame_f;
-
-            // Compute the matrix that is relative to the parent bone, and finally obtain the absolute matrix for that bone!
-            const MatrixT RelMatrix(Pos, Quat, Scale);
-            const JointT& J=Joints[JointNr];
-
-            m_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_JointMatrices[J.Parent]*RelMatrix;
-        }
+    for (unsigned long JointNr=0; JointNr<Joints.Size(); JointNr++)
+    {
+        if (m_SuperPose)
+        {
+            const MatrixT* SuperMat=m_SuperPose->GetJointMatrix(Joints[JointNr].Name);
+
+            if (SuperMat)
+            {
+                m_JointMatrices[JointNr]=*SuperMat;
+                continue;
+            }
+        }
+
+        float                  Weight;
+        Vector3fT              Pos;
+        cf::math::QuaternionfT Quat;
+        Vector3fT              Scale;
+
+        m_AnimExpr->GetData(JointNr, Weight, Pos, Quat, Scale);
+
+        // Compute the matrix that is relative to the parent bone, and finally obtain the absolute matrix for that bone!
+        const MatrixT RelMatrix(Pos, Quat, Scale);
+        const JointT& J=Joints[JointNr];
+
+        // assert(Weight==1.0f);
+        m_JointMatrices[JointNr]=(J.Parent==-1) ? RelMatrix : m_JointMatrices[J.Parent]*RelMatrix;
     }
 
@@ -261 +213 @@
     if (m_Model.GetUseGivenTS())
     {
-        assert(Anims.Size()==0);  // It doesn't make sense to have statically given tangent-space axes with *animated* geometry...
+        assert(m_Model.GetAnims().Size()==0);  // It doesn't make sense to have statically given tangent-space axes with *animated* geometry...
 
         // Copy the given tangent space details into the pose.
@@ -447 +399 @@
 void AnimPoseT::Recache() const
 {
-    if (!m_NeedsRecache && !m_SuperPose) return;
+    if (!m_SuperPose && m_RecacheCount==m_AnimExpr->GetChangeCount()) return;
 
     SyncDimensions();
@@ -462 +414 @@
     //     y();
 
-    m_NeedsRecache=false;
-}
-
-
-void AnimPoseT::NormalizeInput()
-{
-    const ArrayT<CafuModelT::AnimT>& Anims=m_Model.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()));
-}
+    m_RecacheCount=m_AnimExpr->GetChangeCount();
+}
+
+
+int   AnimPoseT::GetSequNr() const { return dynamic_cast<AnimExprStandardT*>(m_AnimExpr)->GetSequNr(); }
+float AnimPoseT::GetFrameNr() const { return dynamic_cast<AnimExprStandardT*>(m_AnimExpr)->GetFrameNr(); }
 
 
 void AnimPoseT::SetSequNr(int SequNr)
 {
-    if (m_SequNr==SequNr) return;
-
-    m_SequNr=SequNr;
-    NormalizeInput();
-
-    m_NeedsRecache=true;
+    dynamic_cast<AnimExprStandardT*>(m_AnimExpr)->SetSequNr(SequNr);
 
     // Recursively update the chain of dlod poses.
@@ -496 +433 @@
 void AnimPoseT::SetFrameNr(float FrameNr)
 {
-    if (m_FrameNr==FrameNr) return;
-
-    m_FrameNr=FrameNr;
-    NormalizeInput();
-
-    m_NeedsRecache=true;
+    dynamic_cast<AnimExprStandardT*>(m_AnimExpr)->SetFrameNr(FrameNr);
 
     // Recursively update the chain of dlod poses.
@@ -513 +445 @@
 
     m_SuperPose=SuperPose;
-
-    m_NeedsRecache=true;
+    m_RecacheCount=0;
 
     // Recursively update the chain of dlod poses.
@@ -523 +454 @@
 void AnimPoseT::Advance(float Time, bool ForceLoop)
 {
-    // TODO: Beachte korrekte Wrap-Regeln für mit loopen und ohne.
-    // TODO: Loops (next vs. ForceLoop) richtig behandeln
-    const ArrayT<CafuModelT::AnimT>& Anims=m_Model.GetAnims();
-
-    if (m_SequNr<0 || m_SequNr>=int(Anims.Size())) { SetFrameNr(0.0f); return; }
-    if (Anims[m_SequNr].Frames.Size()<=1) { SetFrameNr(0.0f); return; }
-
-    const float NumFrames=float(Anims[m_SequNr].Frames.Size());
-
-    float FrameNr=m_FrameNr + Time*Anims[m_SequNr].FPS;
-
-    if (ForceLoop)
-    {
-        // Wrap the sequence (it's a looping (repeating) sequence, like idle, walk, ...).
-        FrameNr=fmod(FrameNr, NumFrames);
-        if (FrameNr<0.0f) FrameNr+=NumFrames;
-    }
-    else
-    {
-        // Clamp the sequence (it's a play-once (non-repeating) sequence, like dying).
-        // On clamping, stop the sequence 1/100th sec before the end of the last frame.
-        if (FrameNr>=NumFrames-1.0f) FrameNr=NumFrames-1.0f-0.01f;
-        if (FrameNr<0.0f) FrameNr=0.0f;
-    }
-
-    SetFrameNr(FrameNr);
+    m_AnimExpr->AdvanceTime(Time, ForceLoop);
 
     // Recursively update the chain of dlod poses.

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -29 +29 @@
 
 
+class AnimExpressionT;
 class CafuModelT;
 class MaterialT;
@@ -93 +94 @@
     ~AnimPoseT();
 
-    int GetSequNr() const { return m_SequNr; }
+    int GetSequNr() const;
 
     /// @param SequNr   The number of the animation sequence to use, -1 for the bind pose.
     void SetSequNr(int SequNr);
 
-    float GetFrameNr() const { return m_FrameNr; }
+    float GetFrameNr() const;
 
     /// @param FrameNr      The frame number in the animation sequence to render the model at.
@@ -117 +118 @@
 
     /// Call this if something in the related model has changed.
-    void SetNeedsRecache() { m_NeedsRecache=true; }
+    void SetNeedsRecache() { m_RecacheCount=0; }    // 0 is different from any value that m_AnimExpr->GetChangedCount() returns.
 
     /// This method renders the model in this pose.
@@ -170 +171 @@
     void UpdateData() const;
     void Recache() const;
-    void NormalizeInput();
 
     const CafuModelT&             m_Model;          ///< The related model that this is a pose for.
-    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.
+    AnimExpressionT*              m_AnimExpr;       ///< The expression that describes the animation state of the joints 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.
@@ -180 +179 @@
  // bool                          m_DoCache;        ///< Cache the computed data? (Set to true by the user if he want to re-use this instance.)
 
-    mutable bool                  m_NeedsRecache;   ///< wird auf 'true' gesetzt wann immer SetSequ(), SetFrameNr() oder AdvanceAll() o.ä. aufgerufen wird, übernimmt m_Draw_CachedDataAt*Nr Funktionalität.
+    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.

cafu/trunk/Libs/SConscript

@@ -14 +14 @@
                     MapFile.cpp
                     Models/Loader.cpp Models/Loader_ase.cpp Models/Loader_cmdl.cpp Models/Loader_dlod.cpp Models/Loader_dummy.cpp Models/Loader_lwo.cpp Models/Loader_md5.cpp
-                    Models/Loader_mdl.cpp Models/AnimPose.cpp
+                    Models/Loader_mdl.cpp Models/AnimExpr.cpp Models/AnimPose.cpp
                     Models/Model_cmdl.cpp Models/ModelManager.cpp
                     Network/Network.cpp ParticleEngine/ParticleEngineMS.cpp PlatformAux.cpp Terrain/Terrain.cpp