From 333354fe62a37df8275d635f1119380c4d58f9ff Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 24 Apr 2013 07:10:41 -0700
Subject: [PATCH] Remove the character controller from the Animation class

---
 apps/openmw/mwmechanics/character.cpp | 13 -------------
 apps/openmw/mwmechanics/character.hpp |  1 -
 apps/openmw/mwrender/animation.cpp    |  9 +--------
 apps/openmw/mwrender/animation.hpp    | 12 +++---------
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index bbf679cdae..2a7ab8b09b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -108,8 +108,6 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     if(!mAnimation)
         return;
 
-    mAnimation->setController(this);
-
     getStateInfo(mState, &mCurrentGroup);
     if(MWWorld::Class::get(mPtr).isActor())
     {
@@ -126,17 +124,6 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
         mAnimation->play(mCurrentGroup, "start", "stop", loop ? (~(size_t)0) : 0);
 }
 
-CharacterController::CharacterController(const CharacterController &rhs)
-  : mPtr(rhs.mPtr), mAnimation(rhs.mAnimation), mAnimQueue(rhs.mAnimQueue)
-  , mCurrentGroup(rhs.mCurrentGroup), mState(rhs.mState)
-  , mSkipAnim(rhs.mSkipAnim)
-{
-    if(!mAnimation)
-        return;
-    /* We've been copied. Update the animation with the new controller. */
-    mAnimation->setController(this);
-}
-
 CharacterController::~CharacterController()
 {
 }
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 4bbea15519..ffd220ff2f 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -81,7 +81,6 @@ class CharacterController
 
 public:
     CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim, CharacterState state, bool loop);
-    CharacterController(const CharacterController &rhs);
     virtual ~CharacterController();
 
     void updatePtr(const MWWorld::Ptr &ptr);
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index c0fee0d3b6..c2f4535164 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -59,14 +59,13 @@ void Animation::destroyObjectList(Ogre::SceneManager *sceneMgr, NifOgre::ObjectL
 
 Animation::Animation(const MWWorld::Ptr &ptr)
     : mPtr(ptr)
-    , mController(NULL)
     , mInsert(NULL)
     , mSkelBase(NULL)
     , mAccumRoot(NULL)
     , mNonAccumRoot(NULL)
+    , mNonAccumCtrl(NULL)
     , mAccumulate(0.0f)
     , mLastPosition(0.0f)
-    , mNonAccumCtrl(NULL)
     , mAnimVelocity(0.0f)
     , mAnimSpeedMult(1.0f)
 {
@@ -299,12 +298,6 @@ bool Animation::hasAnimation(const std::string &anim)
 }
 
 
-void Animation::setController(MWMechanics::CharacterController *controller)
-{
-    mController = controller;
-}
-
-
 void Animation::setAccumulation(const Ogre::Vector3 &accum)
 {
     mAccumulate = accum;
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 87c57ebf7b..526bca69a8 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -8,10 +8,6 @@
 
 #include "../mwworld/ptr.hpp"
 
-namespace MWMechanics
-{
-    class CharacterController;
-}
 
 namespace MWRender
 {
@@ -61,20 +57,20 @@ protected:
     };
 
     MWWorld::Ptr mPtr;
-    MWMechanics::CharacterController *mController;
 
     Ogre::SceneNode *mInsert;
     Ogre::Entity *mSkelBase;
     std::vector<ObjectInfo> mObjects;
     Ogre::Node *mAccumRoot;
     Ogre::Bone *mNonAccumRoot;
+    NifOgre::NodeTargetValue<Ogre::Real> *mNonAccumCtrl;
     Ogre::Vector3 mAccumulate;
     Ogre::Vector3 mLastPosition;
 
-    NifOgre::NodeTargetValue<Ogre::Real> *mNonAccumCtrl;
+    std::vector<Ogre::Controller<Ogre::Real> > mActiveCtrls;
+
     float mAnimVelocity;
     float mAnimSpeedMult;
-    std::vector<Ogre::Controller<Ogre::Real> > mActiveCtrls;
 
     static const size_t sMaxLayers = 1;
     AnimLayer mLayer[sMaxLayers];
@@ -116,8 +112,6 @@ public:
     Animation(const MWWorld::Ptr &ptr);
     virtual ~Animation();
 
-    void setController(MWMechanics::CharacterController *controller);
-
     void updatePtr(const MWWorld::Ptr &ptr);
 
     bool hasAnimation(const std::string &anim);