Merge remote-tracking branch 'scrawl/master'

apps/openmw/engine.cpp

@@ -66,6 +66,7 @@ bool OMW::Engine::frameStarted (const Ogre::FrameEvent& evt)
 {
     if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
         MWBase::Environment::get().getWorld()->frameStarted(evt.timeSinceLastFrame);
+    MWBase::Environment::get().getWindowManager ()->frameStarted(evt.timeSinceLastFrame);
     return true;
 }
 
@@ -153,28 +154,42 @@ OMW::Engine::~Engine()
 
 void OMW::Engine::loadBSA()
 {
+    // We use separate resource groups to handle location priority.
+    const Files::PathContainer& dataDirs = mFileCollections.getPaths();
+
+    int i=0;
+    for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
+    {
+        // Last data dir has the highest priority
+        std::string groupName = "Data" + Ogre::StringConverter::toString(dataDirs.size()-i);
+        Ogre::ResourceGroupManager::getSingleton ().createResourceGroup (groupName);
+
+        std::string dataDirectory = iter->string();
+        std::cout << "Data dir " << dataDirectory << std::endl;
+        Bsa::addDir(dataDirectory, mFSStrict, groupName);
+        ++i;
+    }
+
+    i=0;
     for (std::vector<std::string>::const_iterator archive = mArchives.begin(); archive != mArchives.end(); ++archive)
     {
         if (mFileCollections.doesExist(*archive))
         {
+            // Last BSA has the highest priority
+            std::string groupName = "DataBSA" + Ogre::StringConverter::toString(dataDirs.size()-i);
+
+            Ogre::ResourceGroupManager::getSingleton ().createResourceGroup (groupName);
+
             const std::string archivePath = mFileCollections.getPath(*archive).string();
             std::cout << "Adding BSA archive " << archivePath << std::endl;
-            Bsa::addBSA(archivePath);
+            Bsa::addBSA(archivePath, groupName);
+            ++i;
         }
         else
         {
             std::cout << "Archive " << *archive << " not found" << std::endl;
         }
     }
-
-    const Files::PathContainer& dataDirs = mFileCollections.getPaths();
-    std::string dataDirectory;
-    for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
-    {
-        dataDirectory = iter->string();
-        std::cout << "Data dir " << dataDirectory << std::endl;
-        Bsa::addDir(dataDirectory, mFSStrict);
-    }
 }
 
 // add resources directory

apps/openmw/mwbase/windowmanager.hpp

@@ -246,6 +246,8 @@ namespace MWBase
 
             virtual void showSoulgemDialog (MWWorld::Ptr item) = 0;
 
+            virtual void frameStarted(float dt) = 0;
+
             virtual void changePointer (const std::string& name) = 0;
 
             virtual const Translation::Storage& getTranslationDataStorage() const = 0;

apps/openmw/mwgui/inventorywindow.cpp

@@ -37,6 +37,7 @@ namespace MWGui
         , mLastXSize(0)
         , mLastYSize(0)
         , mPreview(MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer ())
+        , mPreviewDirty(true)
     {
         static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &InventoryWindow::onWindowResize);
 
@@ -268,6 +269,19 @@ namespace MWGui
         mTrading = true;
     }
 
+    void InventoryWindow::doRenderUpdate ()
+    {
+        if (mPreviewDirty)
+        {
+            mPreviewDirty = false;
+            MyGUI::IntSize size = mAvatar->getSize();
+
+            mPreview.update (size.width, size.height);
+            mAvatarImage->setSize(MyGUI::IntSize(std::max(mAvatar->getSize().width, 512), std::max(mAvatar->getSize().height, 1024)));
+            mAvatarImage->setImageTexture("CharacterPreview");
+        }
+    }
+
     void InventoryWindow::notifyContentChanged()
     {
         // update the spell window just in case new enchanted items were added to inventory
@@ -282,11 +296,7 @@ namespace MWGui
         else
             mWindowManager.setSelectedWeapon(*weaponSlot, 100); /// \todo track weapon durability
 
-        MyGUI::IntSize size = mAvatar->getSize();
+        mPreviewDirty = true;
-
-        mPreview.update (size.width, size.height);
-        mAvatarImage->setSize(MyGUI::IntSize(std::max(mAvatar->getSize().width, 512), std::max(mAvatar->getSize().height, 1024)));
-        mAvatarImage->setImageTexture("CharacterPreview");
 
         mArmorRating->setCaptionWithReplacing ("#{sArmor}: "
             + boost::lexical_cast<std::string>(static_cast<int>(MWWorld::Class::get(mPtr).getArmorRating(mPtr))));

apps/openmw/mwgui/inventorywindow.hpp

@@ -16,6 +16,8 @@ namespace MWGui
 
             virtual void open();
 
+            void doRenderUpdate();
+
             /// start trading, disables item drag&drop
             void startTrade();
 
@@ -34,6 +36,8 @@ namespace MWGui
             }
 
         protected:
+            bool mPreviewDirty;
+
             MyGUI::Widget* mAvatar;
             MyGUI::ImageBox* mAvatarImage;
             MyGUI::TextBox* mArmorRating;

apps/openmw/mwgui/loadingscreen.cpp

@@ -217,15 +217,21 @@ namespace MWGui
 
     void LoadingScreen::changeWallpaper ()
     {
-        if (mResources.isNull ())
+        if (mResources.empty())
-            mResources = Ogre::ResourceGroupManager::getSingleton ().findResourceNames ("General", "Splash_*.tga");
-
-
-        if (mResources->size())
         {
-            std::string const & randomSplash = mResources->at (rand() % mResources->size());
+            Ogre::StringVector groups = Ogre::ResourceGroupManager::getSingleton().getResourceGroups ();
+            for (Ogre::StringVector::iterator it = groups.begin(); it != groups.end(); ++it)
+            {
+                Ogre::StringVectorPtr resourcesInThisGroup = Ogre::ResourceGroupManager::getSingleton ().findResourceNames (*it, "Splash_*.tga");
+                mResources.insert(mResources.end(), resourcesInThisGroup->begin(), resourcesInThisGroup->end());
+            }
+        }
 
-            Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General");
+        if (!mResources.empty())
+        {
+            std::string const & randomSplash = mResources.at (rand() % mResources.size());
+
+            Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME);
 
             mBackgroundImage->setImageTexture (randomSplash);
         }

apps/openmw/mwgui/loadingscreen.hpp

@@ -44,7 +44,7 @@ namespace MWGui
         Ogre::Rectangle2D* mRectangle;
         Ogre::MaterialPtr mBackgroundMaterial;
 
-        Ogre::StringVectorPtr mResources;
+        Ogre::StringVector mResources;
 
         bool mLoadingOn;
 

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -1190,3 +1190,8 @@ void WindowManager::showSoulgemDialog(MWWorld::Ptr item)
 {
     mSoulgemDialog->show(item);
 }
+
+void WindowManager::frameStarted (float dt)
+{
+    mInventoryWindow->doRenderUpdate ();
+}

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -238,6 +238,8 @@ namespace MWGui
     virtual void startRepair(MWWorld::Ptr actor);
     virtual void startRepairItem(MWWorld::Ptr item);
 
+    virtual void frameStarted(float dt);
+
     virtual void showSoulgemDialog (MWWorld::Ptr item);
 
     virtual void changePointer (const std::string& name);