Merge branch 'animationfix'

apps/openmw/engine.cpp

@@ -147,7 +147,7 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
             mEnvironment.mWorld->advanceTime (
                 mEnvironment.mFrameDuration*mEnvironment.mWorld->getTimeScaleFactor()/3600);
 
-        
+
         if (changed) // keep change flag for another frame, if cell changed happend in local script
             mEnvironment.mWorld->markCellAsUnchanged();
 
@@ -158,6 +158,9 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         if (mEnvironment.mWindowManager->getMode()==MWGui::GM_Game)
             mEnvironment.mWorld->doPhysics (movement, mEnvironment.mFrameDuration);
 
+        // update world
+        mEnvironment.mWorld->update (evt.timeSinceLastFrame);
+
         // report focus object (for debugging)
         if (mReportFocus)
             updateFocusReport (mEnvironment.mFrameDuration);
@@ -343,7 +346,7 @@ void OMW::Engine::go()
     // Set up the GUI system
     mGuiManager = new OEngine::GUI::MyGUIManager(mOgre->getWindow(), mOgre->getScene(), false,
         mCfgMgr.getLogPath().string() + std::string("/"));
-   
+
 
     // Create window manager - this manages all the MW-specific GUI windows
     MWScript::registerExtensions (mExtensions);

apps/openmw/mwrender/actors.cpp

@@ -12,15 +12,11 @@ void Actors::setMwRoot(Ogre::SceneNode* root){
     mMwRoot = root;
 }
 void Actors::insertNPC(const MWWorld::Ptr& ptr){
-		
+
         insertBegin(ptr, true, true);
          NpcAnimation* anim = new MWRender::NpcAnimation(ptr, mEnvironment, mRend);
-   
+
-	//	
+        mAllActors[ptr] = anim;
-		 
-		  mAllActors[ptr] = anim;
-		
-		
 }
 void Actors::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
     Ogre::SceneNode* cellnode;
@@ -61,7 +57,7 @@ void Actors::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
 
 }
 void Actors::insertCreature (const MWWorld::Ptr& ptr){
-	
+
     insertBegin(ptr, true, true);
    CreatureAnimation* anim = new MWRender::CreatureAnimation(ptr, mEnvironment, mRend);
     //mAllActors.insert(std::pair<MWWorld::Ptr, Animation*>(ptr,anim));
@@ -75,7 +71,7 @@ bool Actors::deleteObject (const MWWorld::Ptr& ptr)
 	mAllActors.erase(ptr);
     if (Ogre::SceneNode *base = ptr.getRefData().getBaseNode())
     {
-		
+
         Ogre::SceneNode *parent = base->getParentSceneNode();
 
         for (std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *>::const_iterator iter (
@@ -110,7 +106,7 @@ void Actors::removeCell(MWWorld::Ptr::CellStore* store){
 			mAllActors.erase(iter);
 		}
 	}
-    
+
 }
 
 void Actors::playAnimationGroup (const MWWorld::Ptr& ptr, const std::string& groupName, int mode, int number){
@@ -121,10 +117,9 @@ void Actors::skipAnimation (const MWWorld::Ptr& ptr){
     if(mAllActors.find(ptr) != mAllActors.end())
         mAllActors[ptr]->stopScript();
 }
-void Actors::addTime(){
+void Actors::update (float duration){
-    //std::cout << "Adding time in actors\n";
     for(std::map<MWWorld::Ptr, Animation*>::iterator iter = mAllActors.begin(); iter != mAllActors.end(); iter++)
 	{
-		(iter->second)->runAnimation(mEnvironment.mFrameDuration);
+		(iter->second)->runAnimation(duration);
 	}
 }

apps/openmw/mwrender/actors.hpp

@@ -26,7 +26,7 @@ namespace MWRender{
         MWWorld::Environment& mEnvironment;
 		std::map<MWWorld::Ptr, Animation*> mAllActors;
 
-        
+
 
         public:
         Actors(OEngine::Render::OgreRenderer& _rend, MWWorld::Environment& _env): mRend(_rend), mEnvironment(_env){}
@@ -52,8 +52,8 @@ namespace MWRender{
         ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
         /// references that are currently not in the rendered scene should be ignored.
 
-	    void addTime();
+        void update (float duration);
-        
+
     };
 }
-#endif
+#endif

apps/openmw/mwrender/npcanimation.cpp

@@ -269,22 +269,6 @@ void NpcAnimation::runAnimation(float timepassed){
         handleAnimationTransforms();
         Ogre::Vector3 current = insert->_getWorldAABB().getCenter();
 
-        //This is the attempt at npc physics
-        //mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), current);
-
-
-
-        /*if(base->hasSkeleton())
-        {
-
-            Ogre::Quaternion boneQuat = rotate;
-            Ogre::Vector3 boneTrans = trans;
-            mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), boneTrans + insert->getPosition());
-            //mEnvironment.mWorld->setObjectPhysicsRotation(insert->getName(), boneQuat * insert->getOrientation());
-
-        }*/
-
-
         std::vector<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin();
         std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin();
         while(shapepartsiter != shapeparts.end())
@@ -301,7 +285,7 @@ void NpcAnimation::runAnimation(float timepassed){
             handleShapes(shapes, theentity, theentity->getSkeleton());
             shapepartsiter++;
             entitypartsiter++;
-	    }
+        }
     }
 
 }

apps/openmw/mwrender/renderingmanager.cpp

@@ -121,7 +121,7 @@ void RenderingManager::moveObjectToCell (const MWWorld::Ptr& ptr, const Ogre::Ve
 
 void RenderingManager::update (float duration){
 
-
+    mActors.update (duration);
 }
 
 void RenderingManager::skyEnable ()
@@ -240,9 +240,5 @@ void RenderingManager::skipAnimation (const MWWorld::Ptr& ptr)
 {
     mActors.skipAnimation(ptr);
 }
-void RenderingManager::addTime(){
-    mActors.addTime();
-	//Notify each animation that time has passed
-}
 
 }

apps/openmw/mwrender/renderingmanager.hpp

@@ -105,14 +105,12 @@ class RenderingManager: private RenderingInterface {
     ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
     /// references that are currently not in the rendered scene should be ignored.
 
-	void addTime();
-
   private:
 
     void setAmbientMode();
     SkyManager* mSkyManager;
     OEngine::Render::OgreRenderer &mRendering;
-   
+
     MWRender::Objects mObjects;
     MWRender::Actors mActors;
 

apps/openmw/mwworld/scene.cpp

@@ -52,8 +52,8 @@ void insertCellRefList(MWRender::RenderingManager& rendering, MWWorld::Environme
 
 namespace MWWorld
 {
-    void Scene::advanceTime(){
+    void Scene::update (float duration){
-        mRendering.addTime();
+        mRendering.update (duration);
     }
     void Scene::unloadCell (CellStoreCollection::iterator iter)
     {
@@ -61,9 +61,9 @@ namespace MWWorld
         ListHandles functor;
 
         MWWorld::Ptr::CellStore* active = *iter;
-        
+
-		
+
-		
+
 
         active->forEach<ListHandles>(functor);
 
@@ -83,7 +83,7 @@ namespace MWWorld
         mEnvironment.mMechanicsManager->dropActors (active);
         mEnvironment.mSoundManager->stopSound (active);
 		mActiveCells.erase(active);
-        
+
     }
 
     void Scene::loadCell (Ptr::CellStore *cell)

apps/openmw/mwworld/scene.hpp

@@ -101,7 +101,8 @@ namespace MWWorld
             void markCellAsUnchanged();
 
             void insertCell(ESMS::CellStore<MWWorld::RefData> &cell, MWWorld::Environment& environment);
-            void advanceTime();
+
+            void update (float duration);
     };
 }
 

apps/openmw/mwworld/world.cpp

@@ -348,14 +348,13 @@ namespace MWWorld
     void World::advanceTime (double hours)
     {
         hours += mGlobalVariables->getFloat ("gamehour");
-        
+
         setHour (hours);
 
         int days = hours / 24;
 
         if (days>0)
             mGlobalVariables->setInt ("dayspassed", days + mGlobalVariables->getInt ("dayspassed"));
-        mWorldScene->advanceTime();
     }
 
     void World::setHour (double hour)
@@ -685,10 +684,9 @@ namespace MWWorld
     {
         mRendering.skipAnimation (ptr);
     }
-    void World::setObjectPhysicsRotation(const std::string& handle, Ogre::Quaternion quat){
+
-        mPhysics->rotateObject(handle, quat);
+    void World::update (float duration)
-    }
+    {
-    void World::setObjectPhysicsPosition(const std::string& handle, Ogre::Vector3 vec){
+        mWorldScene->update (duration);
-        mPhysics->moveObject(handle, vec);
     }
 }

apps/openmw/mwworld/world.hpp

@@ -140,12 +140,16 @@ namespace MWWorld
             void disable (Ptr reference);
 
             void advanceTime (double hours);
+            ///< Advance in-game time.
 
             void setHour (double hour);
+            ///< Set in-game time hour.
 
             void setMonth (int month);
+            ///< Set in-game time month.
 
             void setDay (int day);
+            ///< Set in-game time day.
 
             bool toggleSky();
             ///< \return Resulting mode
@@ -218,8 +222,8 @@ namespace MWWorld
             void skipAnimation (const MWWorld::Ptr& ptr);
             ///< Skip the animation for the given MW-reference for one frame. Calls to this function for
             /// references that are currently not in the rendered scene should be ignored.
-            void setObjectPhysicsRotation(const std::string& handle,Ogre::Quaternion quat);
+
-            void setObjectPhysicsPosition(const std::string& handle,Ogre::Vector3 vector);
+            void update (float duration);
     };
 }