Merge pull request #82 from cortex-command-community/CF77-pingpoing-anim-mode

Cf77 pingpoing anim mode

Author: garethyr

Entities/MOSRotating.cpp

@@ -1614,43 +1614,6 @@ void MOSRotating::Update()
 
     MOSprite::Update();
 
-    ////////////////////////////////////////
-    // Animate the sprite, if applicable
-
-    if (m_FrameCount > 1)
-    {
-        if (m_SpriteAnimMode == ALWAYSLOOP)
-        {
-            float cycleTime = ((long)m_SpriteAnimTimer.GetElapsedSimTimeMS()) % m_SpriteAnimDuration;
-            m_Frame = floorf((cycleTime / (float)m_SpriteAnimDuration) * (float)m_FrameCount);
-        }
-        else if (m_SpriteAnimMode == ALWAYSRANDOM)
-        {
-            if (m_SpriteAnimTimer.GetElapsedSimTimeMS() > (m_SpriteAnimDuration / m_FrameCount))
-            {
-                //  Quick switch to other frame if only two
-                if (m_FrameCount == 2)
-                    m_Frame = m_Frame == 0 ? 1 : 0;
-                else
-                {
-                    int prevFrame = m_Frame;
-                    // Keep trying ot find a new frame
-                    do
-                    {
-                        m_Frame = floorf((float)m_FrameCount * PosRand());
-                    }
-                    while (m_Frame == prevFrame);
-                }
-
-                m_SpriteAnimTimer.Reset();
-            }
-        }
-        else if (m_SpriteAnimMode == ALWAYSPINGPONG)
-        {
-
-        }
-    }
-
 	if (m_InheritEffectRotAngle)
 		m_EffectRotAngle = m_Rotation.GetRadAngle();
 

Entities/MOSprite.cpp

@@ -37,6 +37,7 @@ void MOSprite::Clear()
     m_SpriteAnimMode = NOANIM;
     m_SpriteAnimDuration = 500;
     m_SpriteAnimTimer.Reset();
+    m_SpriteAnimIsReversingFrames = false;
     m_HFlipped = false;
     m_MaxRadius = 1;
     m_MaxDiameter = 2;
@@ -451,17 +452,54 @@ Vector MOSprite::UnRotateOffset(const Vector &offset) const
     return rotOff;
 }
 
-/*
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Pure v. method:  Update
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Updates this MOSprite. Supposed to be done every frame.
 
-void MOSprite::Update()
-{
-    MovableObject::Update();
+void MOSprite::Update() {
+	MovableObject::Update();
+
+	// First, check that the sprite has enough frames to even have an animation and override the setting if not
+	if (m_FrameCount > 1) {
+		// If animation mode is set to something other than ALWAYSLOOP but only has 2 frames, override it because it's pointless
+		if ((m_SpriteAnimMode == ALWAYSRANDOM || m_SpriteAnimMode == ALWAYSPINGPONG) && m_FrameCount == 2) {
+			m_SpriteAnimMode = ALWAYSLOOP;
+		}
+	} else {
+		m_SpriteAnimMode = NOANIM;
+	}
+
+	// Animate the sprite, if applicable
+	unsigned int frameTime = m_SpriteAnimDuration / m_FrameCount;
+	unsigned int prevFrame = m_Frame;
+
+	if (m_SpriteAnimTimer.GetElapsedSimTimeMS() > frameTime) {
+		switch (m_SpriteAnimMode) {
+		case ALWAYSLOOP:
+			m_Frame = ((m_Frame + 1) % m_FrameCount);
+			break;
+		case ALWAYSRANDOM:
+			while (m_Frame == prevFrame) {
+				m_Frame = floorf(static_cast<float>(m_FrameCount) * PosRand());
+			}
+			break;
+		case ALWAYSPINGPONG:
+			if (m_Frame == m_FrameCount - 1) {
+				m_SpriteAnimIsReversingFrames = true;
+			} else if (m_Frame == 0) {
+				m_SpriteAnimIsReversingFrames = false;
+			}
+			m_SpriteAnimIsReversingFrames ? m_Frame-- : m_Frame++;
+			break;
+		default:
+			break;
+		}
+		m_SpriteAnimTimer.Reset();
+	}
 }
-*/
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Draw

Entities/MOSprite.h

@@ -586,16 +586,16 @@ ENTITYALLOCATION(MOSprite)
 
 	virtual void SetSpriteAnimDuration(int newDuration) { m_SpriteAnimDuration = newDuration; }
 
-/*
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Update
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Updates this MovableObject. Supposed to be done every frame.
 // Arguments:       None.
 // Return value:    None.
 
-    virtual void Update() = 0;
-*/
+    virtual void Update();
+
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Draw
@@ -651,6 +651,8 @@ ENTITYALLOCATION(MOSprite)
     int m_SpriteAnimDuration;
     // The timer to keep track of the body animation
     Timer m_SpriteAnimTimer;
+    // Keep track of animation direction (mainly for ALWAYSPINGPONG), true is decreasing frame, false is increasing frame
+    bool m_SpriteAnimIsReversingFrames;
     // Whether flipped horizontally or not.
     bool m_HFlipped;
     // The precalculated maximum possible radius and diameter of this, in pixels