Changeset 470

Timestamp:

01/21/12 09:33:03 (4 months ago)

Author:

Carsten

Message:

Game code: Improvements to the animation blending in the EntCompanyBotT code.

Files:

• cafu/trunk/Games/DeathMatch/Code/CompanyBot.cpp (modified) (2 diffs)

cafu/trunk/Games/DeathMatch/Code/CompanyBot.cpp

@@ -393 +393 @@
 
 
+#undef min    // See http://stackoverflow.com/questions/5004858/stdmin-gives-error
+#undef max
+
+
 void EntCompanyBotT::AdvanceModelTime(float Time, bool Loop)
 {
@@ -401 +405 @@
     else
     {
+        const bool IsAlive=(State.ModelSequNr<18 || State.ModelSequNr>24);
+        float      BlendTime=0.3f;
+
+        if (!IsAlive)
+        {
+            BlendTime=0.2f;
+
+            if (State.ModelSequNr>=0 && State.ModelSequNr<int(m_CompanyBotModel->GetAnims().Size()))
+            {
+                const CafuModelT::AnimT& Anim=m_CompanyBotModel->GetAnims()[State.ModelSequNr];
+
+                if (Anim.Frames.Size() > 0)
+                    BlendTime=std::min(BlendTime, (Anim.Frames.Size()-1) * Anim.FPS * 0.5f);
+            }
+        }
+
         m_LastStdAE=m_CompanyBotModel->GetAnimExprPool().GetStandard(State.ModelSequNr, State.ModelFrameNr);
-        m_AnimExpr =m_CompanyBotModel->GetAnimExprPool().GetBlend(m_AnimExpr, m_LastStdAE, 3.0f);
+        m_AnimExpr =m_CompanyBotModel->GetAnimExprPool().GetBlend(m_AnimExpr, m_LastStdAE, BlendTime);
     }