Changeset 454 for cafu/trunk

Timestamp:

01/08/12 19:02:41 (5 months ago)

Author:

Carsten

Message:

Model code:

• Small enhancements and fixes to the new AnimExpressionT classes.
• Put the new anim expressions to use in the Model Editor: Changing the selected model animation now blends from the old to the new animation, demonstrating the new code. :-)

Location:

cafu/trunk

Files:

• CaWE/ModelEditor/ChildFrame.cpp (modified) (2 diffs)
• CaWE/ModelEditor/ModelDocument.cpp (modified) (1 diff)
• CaWE/ModelEditor/ModelDocument.hpp (modified) (1 diff)
• CaWE/ModelEditor/ScenePropGrid.cpp (modified) (3 diffs)
• CaWE/ModelEditor/SceneView3D.cpp (modified) (2 diffs)
• Libs/Models/AnimExpr.cpp (modified) (4 diffs)
• Libs/Models/AnimExpr.hpp (modified) (1 diff)
• Libs/Models/AnimPose.cpp (modified) (1 diff)
• Libs/Models/AnimPose.hpp (modified) (1 diff)
• Libs/Templates/Pointer.hpp (modified) (2 diffs)

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -871 +871 @@
             m_ModelDoc->UpdateAllObservers_SelectionChanged(ANIM, OldSel, m_ModelDoc->GetSelection(ANIM));
 
-            m_ModelDoc->GetAnimState().Pose.SetFrameNr(0.0f);
-            m_ModelDoc->UpdateAllObservers_AnimStateChanged();
+            // This is not needed: setting a new ANIM selection also sets the frame number to 0.
+            // m_ModelDoc->GetAnimState().LastStdAE->SetFrameNr(0.0f);
+            // m_ModelDoc->UpdateAllObservers_AnimStateChanged();
             break;
         }
@@ -882 +883 @@
             m_ModelDoc->UpdateAllObservers_SelectionChanged(ANIM, OldSel, m_ModelDoc->GetSelection(ANIM));
 
-            m_ModelDoc->GetAnimState().Pose.SetFrameNr(0.0f);
-            m_ModelDoc->UpdateAllObservers_AnimStateChanged();
+            // This is not needed: setting a new ANIM selection also sets the frame number to 0.
+            // m_ModelDoc->GetAnimState().LastStdAE->SetFrameNr(0.0f);
+            // m_ModelDoc->UpdateAllObservers_AnimStateChanged();
             break;
         }

cafu/trunk/CaWE/ModelEditor/ModelDocument.cpp

@@ -138 +138 @@
     if (Type==ANIM)
     {
-        m_AnimState.Pose.SetSequNr(m_Selection[ANIM].Size()==0 ? -1 : m_Selection[ANIM][0]);
+        IntrusivePtrT<AnimExpressionT> BlendFrom=m_AnimState.Pose.GetAnimExpr();
+
+        // If BlendFrom is a blend anim expression that has not yet begun (Frac is still 0),
+        // this means that we got another call to SetSelection() immediately before this one.
+        // This can happen when the user clicked on a new animation in the animations list,
+        // which (when CTRL is not used) issues two calls, one for the deselection of the previous
+        // anim (causing us to blend to the -1 sequence), and one for the selection of the new.
+        // In this case, just skip the intermediate "-1" blend target.
+        {
+            AnimExprBlendT* Blend=dynamic_cast<AnimExprBlendT*>(&*BlendFrom);
+
+            if (Blend && Blend->GetFrac()==0.0f)
+                BlendFrom=Blend->GetA();
+        }
+
+        m_AnimState.LastStdAE=m_AnimState.Pool.GetStandard(m_Selection[ANIM].Size()==0 ? -1 : m_Selection[ANIM][0], 0.0f);
+        m_AnimState.Pose.SetAnimExpr(m_AnimState.Pool.GetBlend(BlendFrom, m_AnimState.LastStdAE, 3.0f));
 
         if (m_Selection[ANIM].Size()==0)

cafu/trunk/CaWE/ModelEditor/ModelDocument.hpp

@@ -65 +65 @@
 
             AnimStateT(const CafuModelT& Model)
-                : Pose(Model), Speed(1.0f), Loop(true) { }
+                : Pool(Model), LastStdAE(Pool.GetStandard(-1, 0.0f)), Pose(Model, LastStdAE), Speed(1.0f), Loop(true) { }
 
-            AnimPoseT Pose;     ///< The current pose of the model, as defined by sequence and frame number.
-            float     Speed;    ///< The speed (relative to clock time) with which the animation is advanced, usually 0 for stop or 1 for playback.
-            bool      Loop;     ///< When playing the sequence, loop automatically when its end has been reached?
+            AnimExprPoolT                    Pool;
+            IntrusivePtrT<AnimExprStandardT> LastStdAE;
+            AnimPoseT                        Pose;      ///< The current pose of the model, as defined by sequence and frame number.
+            float                            Speed;     ///< The speed (relative to clock time) with which the animation is advanced, usually 0 for stop or 1 for playback.
+            bool                             Loop;      ///< When playing the sequence, loop automatically when its end has been reached?
         };
 

cafu/trunk/CaWE/ModelEditor/ScenePropGrid.cpp

@@ -143 +143 @@
 
     wxPGProperty* AnimControlCat=Append(new wxPropertyCategory("Animation Control"));
-    m_AnimFrameNrProp=AppendIn(AnimControlCat, new wxFloatProperty("Frame No.", wxPG_LABEL, Anim.Pose.GetFrameNr()));
+    m_AnimFrameNrProp=AppendIn(AnimControlCat, new wxFloatProperty("Frame No.", wxPG_LABEL, Anim.LastStdAE->GetFrameNr()));
     m_AnimSpeedProp  =AppendIn(AnimControlCat, new wxFloatProperty("Speed", wxPG_LABEL, Anim.Speed));
     m_AnimLoopProp   =AppendIn(AnimControlCat, new wxBoolProperty("Loop", wxPG_LABEL, Anim.Loop));
@@ -229 +229 @@
     else if (PropName=="Model.Show tangent-space")    m_Model_ShowTangentSpace   =Prop->GetValue().GetBool();
     else if (PropName=="Model.Debug material")        m_Model_DebugMaterial      =Prop->GetValue().GetInteger();
-    else if (PropName=="Frame No.") { AnimState.Pose.SetFrameNr(PropValueF); m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }
+    else if (PropName=="Frame No.") { AnimState.LastStdAE->SetFrameNr(PropValueF); m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }
     else if (PropName=="Speed")     { AnimState.Speed=PropValueF; m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }
     else if (PropName=="Loop")      { AnimState.Loop =Prop->GetValue().GetBool(); m_IsRecursiveSelfNotify=true; m_Parent->GetModelDoc()->UpdateAllObservers_AnimStateChanged(); m_IsRecursiveSelfNotify=false; }
@@ -286 +286 @@
     const ModelDocumentT::AnimStateT& AnimState=m_Parent->GetModelDoc()->GetAnimState();
 
-    if (m_AnimFrameNrProp->GetValue().GetDouble()!=AnimState.Pose.GetFrameNr())
-        m_AnimFrameNrProp->SetValue(AnimState.Pose.GetFrameNr());
+    if (m_AnimFrameNrProp->GetValue().GetDouble()!=AnimState.LastStdAE->GetFrameNr())
+        m_AnimFrameNrProp->SetValue(AnimState.LastStdAE->GetFrameNr());
 
     if (m_AnimSpeedProp->GetValue().GetDouble()!=AnimState.Speed)

cafu/trunk/CaWE/ModelEditor/SceneView3D.cpp

@@ -162 +162 @@
             ModelDoc->UpdateAllObservers_SelectionChanged(ANIM, OldSel, ModelDoc->GetSelection(ANIM));
 
-            ModelDoc->GetAnimState().Pose.SetFrameNr(0.0f);
-            ModelDoc->UpdateAllObservers_AnimStateChanged();
+            // This is not needed: setting a new ANIM selection also sets the frame number to 0.
+            // ModelDoc->GetAnimState().LastStdAE->SetFrameNr(0.0f);
+            // ModelDoc->UpdateAllObservers_AnimStateChanged();
             break;
         }
@@ -174 +175 @@
             ModelDoc->UpdateAllObservers_SelectionChanged(ANIM, OldSel, ModelDoc->GetSelection(ANIM));
 
-            ModelDoc->GetAnimState().Pose.SetFrameNr(0.0f);
-            ModelDoc->UpdateAllObservers_AnimStateChanged();
+            // This is not needed: setting a new ANIM selection also sets the frame number to 0.
+            // ModelDoc->GetAnimState().LastStdAE->SetFrameNr(0.0f);
+            // ModelDoc->UpdateAllObservers_AnimStateChanged();
             break;
         }

cafu/trunk/Libs/Models/AnimExpr.cpp

@@ -223 +223 @@
 unsigned int AnimExprFilterT::GetChangeNum() const
 {
-    return std::max(GetChangeNum(), m_SubExpr->GetChangeNum());
+    return std::max(AnimExpressionT::GetChangeNum(), m_SubExpr->GetChangeNum());
 }
 
@@ -263 +263 @@
 unsigned int AnimExprCombineT::GetChangeNum() const
 {
-    return std::max(GetChangeNum(),
+    return std::max(AnimExpressionT::GetChangeNum(),
                     std::max(m_A->GetChangeNum(), m_B->GetChangeNum()));
 }
@@ -324 +324 @@
 unsigned int AnimExprBlendT::GetChangeNum() const
 {
-    return std::max(GetChangeNum(),
+    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()));
 }
@@ -356 +361 @@
     Weight = w[0]*f0 + w[1]*f1;
     Pos    = p[0]*f0 + p[1]*f1;
-    Quat   = slerp(q[0], q[1], f0);   // slerp() is why we cannot have generic "add" and "mul" AnimExpressionT's.
+    Quat   = slerp(q[0], q[1], f1);   // slerp() is why we cannot have generic "add" and "mul" AnimExpressionT's.
     Scale  = s[0]*f0 + s[1]*f1;
 }

cafu/trunk/Libs/Models/AnimExpr.hpp

@@ -187 +187 @@
     void ReInit(IntrusivePtrT<AnimExpressionT> A, IntrusivePtrT<AnimExpressionT> B, float Duration);
 
+    /// Returns the "blend from" sub-expression.
+    IntrusivePtrT<AnimExpressionT> GetA() const { return m_A; }
+
+    /// Returns the "blend to" sub-expression.
+    IntrusivePtrT<AnimExpressionT> GetB() const { return m_B; }
+
+    /// Returns how far the blend has advanced.
+    float GetFrac() const { return m_Frac; }
+
     // Implementations and overrides for base class methods.
     virtual unsigned int GetChangeNum() const;

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -488 +488 @@
     m_AnimExpr->AdvanceTime(Time, ForceLoop);
 
-    // Recursively update the chain of dlod poses.
-    if (m_DlodPose) m_DlodPose->Advance(Time, ForceLoop);
+    // Don't do this -- the dlod models share the same anim expression as the main model.
+    // In fact, this method should be removed. Have the caller call Pose->GetAnimExpr()->AdvanceTime() instead.
+    //
+    // // Recursively update the chain of dlod poses.
+    // if (m_DlodPose) m_DlodPose->Advance(Time, ForceLoop);
 }
 

cafu/trunk/Libs/Models/AnimPose.hpp

@@ -94 +94 @@
     /// The destructor.
     ~AnimPoseT();
+
+    /// Returns the current anim expression of this pose.
+    IntrusivePtrT<AnimExpressionT> GetAnimExpr() const { return m_AnimExpr; }
 
     /// Sets a new anim expression to use for this pose.

cafu/trunk/Libs/Templates/Pointer.hpp

@@ -49 +49 @@
     }
 
+    /// The copy constructor (for Y classes that are derived from T).
+    template<class Y> IntrusivePtrT(const IntrusivePtrT<Y>& IP)
+        : m_Ptr(IP.get())
+    {
+        if (m_Ptr) m_Ptr->m_RefCount++;
+    }
+
     /// The destructor.
     ~IntrusivePtrT()
@@ -79 +86 @@
     }
 
+    /// Returns the stored pointer.
+    T* get() const { return m_Ptr; }
+
     /// The structure dereference operator.
     T* operator -> () { return m_Ptr; }