From ca289a317c579c44b83132cf2bb5b471a8d5b979 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sat, 6 Apr 2013 12:26:58 -0700
Subject: [PATCH] Separate the UVController function out and make it generic

Also fix a timing bug in it.
---
 components/nifogre/ogrenifloader.cpp | 60 ++++++++++++++--------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index 6a7c3c6dbf..dfdec0bfa6 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -66,6 +66,36 @@ namespace NifOgre
 {
 
 // FIXME: Should not be here.
+class DefaultFunction : public Ogre::ControllerFunction<Ogre::Real>
+{
+private:
+    float mFrequency;
+    float mPhase;
+    float mStartTime;
+    float mStopTime;
+
+public:
+    DefaultFunction(const Nif::Controller *ctrl)
+        : Ogre::ControllerFunction<Ogre::Real>(false)
+        , mFrequency(ctrl->frequency)
+        , mPhase(ctrl->phase)
+        , mStartTime(ctrl->timeStart)
+        , mStopTime(ctrl->timeStop)
+    {
+        mDeltaCount = mPhase;
+        while(mDeltaCount < mStartTime)
+            mDeltaCount += (mStopTime-mStartTime);
+    }
+
+    virtual Ogre::Real calculate(Ogre::Real value)
+    {
+        mDeltaCount += value*mFrequency;
+        mDeltaCount = std::fmod(mDeltaCount - mStartTime,
+                                mStopTime - mStartTime) + mStartTime;
+        return mDeltaCount;
+    }
+};
+
 class VisController
 {
 public:
@@ -208,35 +238,7 @@ public:
         }
     };
 
-    class Function : public Ogre::ControllerFunction<Ogre::Real>
-    {
-    private:
-        float mFrequency;
-        float mPhase;
-        float mStartTime;
-        float mStopTime;
-
-    public:
-        Function(const Nif::NiUVController *ctrl)
-          : Ogre::ControllerFunction<Ogre::Real>(false)
-          , mFrequency(ctrl->frequency)
-          , mPhase(ctrl->phase)
-          , mStartTime(ctrl->timeStart)
-          , mStopTime(ctrl->timeStop)
-        {
-            mDeltaCount = mPhase;
-            while(mDeltaCount < mStartTime)
-                mDeltaCount += (mStopTime-mStartTime);
-        }
-
-        virtual Ogre::Real calculate(Ogre::Real value)
-        {
-            mDeltaCount += value;
-            mDeltaCount = std::fmod(mDeltaCount+(value*mFrequency) - mStartTime,
-                                    mStopTime - mStartTime) + mStartTime;
-            return mDeltaCount;
-        }
-    };
+    typedef DefaultFunction Function;
 };