From 9dee2a72cd732bc302074f9ecf7e317704da3704 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 22 Feb 2013 09:22:06 -0800
Subject: [PATCH] Use a separate method to calculate animation velocity

---
 apps/openmw/mwrender/animation.cpp | 85 ++++++++++++++++--------------
 apps/openmw/mwrender/animation.hpp |  2 +
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index f4b618866..707aedcd9 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -175,6 +175,49 @@ void Animation::setLooping(bool loop)
 }
 
 
+void Animation::calcAnimVelocity()
+{
+    const Ogre::NodeAnimationTrack *track = 0;
+
+    Ogre::Animation::NodeTrackIterator trackiter = mCurrentAnim->getNodeTrackIterator();
+    while(!track && trackiter.hasMoreElements())
+    {
+        const Ogre::NodeAnimationTrack *cur = trackiter.getNext();
+        if(cur->getAssociatedNode()->getName() == mNonAccumRoot->getName())
+            track = cur;
+    }
+
+    if(track && track->getNumKeyFrames() > 1)
+    {
+        float loopstarttime = 0.0f;
+        float loopstoptime = mCurrentAnim->getLength();
+        NifOgre::TextKeyMap::const_iterator keyiter = mCurrentKeys->begin();
+        while(keyiter != mCurrentKeys->end())
+        {
+            if(keyiter->second == "loop start")
+                loopstarttime = keyiter->first;
+            else if(keyiter->second == "loop stop")
+            {
+                loopstoptime = keyiter->first;
+                break;
+            }
+            keyiter++;
+        }
+
+        if(loopstoptime > loopstarttime)
+        {
+            Ogre::TransformKeyFrame startkf(0, loopstarttime);
+            Ogre::TransformKeyFrame endkf(0, loopstoptime);
+
+            track->getInterpolatedKeyFrame(mCurrentAnim->_getTimeIndex(loopstarttime), &startkf);
+            track->getInterpolatedKeyFrame(mCurrentAnim->_getTimeIndex(loopstoptime), &endkf);
+
+            mAnimVelocity = startkf.getTranslate().distance(endkf.getTranslate()) /
+                            (loopstoptime-loopstarttime);
+        }
+    }
+}
+
 void Animation::applyAnimation(const Ogre::Animation *anim, float time, Ogre::SkeletonInstance *skel)
 {
     Ogre::TimeIndex timeindex = anim->_getTimeIndex(time);
@@ -305,47 +348,7 @@ void Animation::play(const std::string &groupname, const std::string &start, boo
                 mAnimVelocity = 0.0f;
 
                 if(mNonAccumRoot)
-                {
-                    const Ogre::NodeAnimationTrack *track = 0;
-
-                    Ogre::Animation::NodeTrackIterator trackiter = mCurrentAnim->getNodeTrackIterator();
-                    while(!track && trackiter.hasMoreElements())
-                    {
-                        const Ogre::NodeAnimationTrack *cur = trackiter.getNext();
-                        if(cur->getAssociatedNode()->getName() == mNonAccumRoot->getName())
-                            track = cur;
-                    }
-
-                    if(track && track->getNumKeyFrames() > 1)
-                    {
-                        float loopstarttime = 0.0f;
-                        float loopstoptime = mCurrentAnim->getLength();
-                        NifOgre::TextKeyMap::const_iterator keyiter = mCurrentKeys->begin();
-                        while(keyiter != mCurrentKeys->end())
-                        {
-                            if(keyiter->second == "loop start")
-                                loopstarttime = keyiter->first;
-                            else if(keyiter->second == "loop stop")
-                            {
-                                loopstoptime = keyiter->first;
-                                break;
-                            }
-                            keyiter++;
-                        }
-
-                        if(loopstoptime > loopstarttime)
-                        {
-                            Ogre::TransformKeyFrame startkf(0, loopstarttime);
-                            Ogre::TransformKeyFrame endkf(0, loopstoptime);
-
-                            track->getInterpolatedKeyFrame(mCurrentAnim->_getTimeIndex(loopstarttime), &startkf);
-                            track->getInterpolatedKeyFrame(mCurrentAnim->_getTimeIndex(loopstoptime), &endkf);
-
-                            mAnimVelocity = startkf.getTranslate().distance(endkf.getTranslate()) /
-                                            (loopstoptime-loopstarttime);
-                        }
-                    }
-                }
+                    calcAnimVelocity();
 
                 found = true;
                 break;
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 2f930e9ad..c6e230670 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -39,6 +39,8 @@ protected:
     float mAnimVelocity;
     float mAnimSpeedMult;
 
+    void calcAnimVelocity();
+
     /* Applies the given animation to the given skeleton instance, using the specified time. */
     void applyAnimation(const Ogre::Animation *anim, float time, Ogre::SkeletonInstance *skel);