Changeset 426

Timestamp:

11/19/11 18:50:54 (6 months ago)

Author:

Carsten

Message:

Fixed some issues with animation playback.

Location:

cafu/trunk

Files:

• Games/DeathMatch/Code/HumanPlayer.cpp (modified) (1 diff)
• Games/DeathMatch/Code/cw_357.cpp (modified) (1 diff)
• Games/DeathMatch/Code/cw_9mmAR.cpp (modified) (1 diff)
• Games/DeathMatch/Code/cw_CrossBow.cpp (modified) (1 diff)
• Games/DeathMatch/Code/cw_FaceHugger.cpp (modified) (1 diff)
• Games/DeathMatch/Code/cw_Grenade.cpp (modified) (1 diff)
• Games/DeathMatch/Code/cw_RPG.cpp (modified) (1 diff)
• Libs/Models/AnimPose.cpp (modified) (2 diffs)

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

@@ -467 +467 @@
 
                     const float NewFrameNr=Pose->GetFrameNr();
-                    const bool  AnimSequenceWrap=NewFrameNr<State.ActiveWeaponFrameNr;
+                    const bool  AnimSequenceWrap=NewFrameNr < State.ActiveWeaponFrameNr || NewFrameNr > WeaponModel->GetAnims()[State.ActiveWeaponSequNr].Frames.Size()-1;
 
                     State.ActiveWeaponFrameNr=NewFrameNr;

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

@@ -175 +175 @@
                 else if (RandomNumber<224) State.ActiveWeaponSequNr=7;  // Idle 3
                 else                       State.ActiveWeaponSequNr=1;  // Fidget 1
+
+                State.ActiveWeaponFrameNr=0.0;
             }
             break;

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

@@ -229 +229 @@
                 }
                 else State.ActiveWeaponSequNr=0;     // Don't play the "Idle1" sequence repeatedly.
+
+                State.ActiveWeaponFrameNr=0.0;
             }
             break;

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

@@ -105 +105 @@
                 }
                 else State.ActiveWeaponSequNr=2;    // Idle3 is the "best-looking" sequence.
+
+                State.ActiveWeaponFrameNr=0.0;
             }
             break;

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

@@ -130 +130 @@
                 }
                 else State.ActiveWeaponSequNr=0;    // Always play "Idle1" after "Idle2" or "Idle3"!
+
+                State.ActiveWeaponFrameNr=0.0;
             }
             break;

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

@@ -94 +94 @@
                 }
                 else State.ActiveWeaponSequNr=0;     // Don't play the "Fidget" sequence repeatedly.
+
+                State.ActiveWeaponFrameNr=0.0;
             }
             break;

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

@@ -118 +118 @@
                 }
                 else State.ActiveWeaponSequNr=0;     // Don't play the "Fidget" sequence repeatedly.
+
+                State.ActiveWeaponFrameNr=0.0;
             }
             break;

cafu/trunk/Libs/Models/AnimPose.cpp

@@ -463 +463 @@
     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;
-    if (m_SequNr == -1) m_FrameNr = 0.0f;
+
+    m_FrameNr=std::max(m_FrameNr, 0.0f);
+    m_FrameNr=(m_SequNr==-1) ? 0.0f : fmod(m_FrameNr, float(Anims[m_SequNr].Frames.Size()));
 }
 
@@ -511 +513 @@
 {
     // TODO: Beachte korrekte Wrap-Regeln für mit loopen und ohne.
-    // TODO: Sollte in NormalizeInput() die m_FrameNr gegen das jeweilige Maximum begrenzt werden?
     // TODO: Loops (next vs. ForceLoop) richtig behandeln
     const ArrayT<CafuModelT::AnimT>& Anims=m_Model.GetAnims();