From 025f50a2df8b5d183a575b430934a1087a7caf02 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 12 Aug 2014 16:36:13 +0200
Subject: [PATCH] Improve performance of inventory window resize (don't update
 selection buffer unnecessarily)

---
 apps/openmw/mwgui/inventorywindow.cpp     | 30 +++++++++++++++++------
 apps/openmw/mwgui/inventorywindow.hpp     |  1 +
 apps/openmw/mwrender/characterpreview.cpp | 13 +++++++++-
 apps/openmw/mwrender/characterpreview.hpp |  3 ++-
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp
index e56719da0..e2048a34b 100644
--- a/apps/openmw/mwgui/inventorywindow.cpp
+++ b/apps/openmw/mwgui/inventorywindow.cpp
@@ -37,6 +37,7 @@ namespace MWGui
         , mLastYSize(0)
         , mPreview(new MWRender::InventoryPreview(MWBase::Environment::get().getWorld ()->getPlayerPtr()))
         , mPreviewDirty(true)
+        , mPreviewResize(true)
         , mDragAndDrop(dragAndDrop)
         , mSelectedItem(-1)
         , mGuiMode(GM_Inventory)
@@ -100,6 +101,9 @@ namespace MWGui
 
         mPreview.reset(new MWRender::InventoryPreview(mPtr));
         mPreview->setup();
+
+        mPreviewDirty = true;
+        mPreviewResize = true;
     }
 
     void InventoryWindow::setGuiMode(GuiMode mode)
@@ -132,7 +136,7 @@ namespace MWGui
                              Settings::Manager::getFloat(setting + " h", "Windows") * viewSize.height);
 
         if (size.width != mMainWidget->getWidth() || size.height != mMainWidget->getHeight())
-            mPreviewDirty = true;
+            mPreviewResize = true;
 
         mMainWidget->setPosition(pos);
         mMainWidget->setSize(size);
@@ -340,7 +344,7 @@ namespace MWGui
         {
             mLastXSize = mMainWidget->getSize().width;
             mLastYSize = mMainWidget->getSize().height;
-            mPreviewDirty = true;
+            mPreviewResize = true;
         }
     }
 
@@ -416,9 +420,13 @@ namespace MWGui
         else
             mSkippedToEquip = ptr;
 
-        mItemView->update();
+        if (isVisible())
+        {
+            mItemView->update();
 
-        notifyContentChanged();
+            notifyContentChanged();
+        }
+        // else: will be updated in open()
     }
 
     void InventoryWindow::onAvatarClicked(MyGUI::Widget* _sender)
@@ -505,16 +513,22 @@ namespace MWGui
     void InventoryWindow::doRenderUpdate ()
     {
         mPreview->onFrame();
-        if (mPreviewDirty)
+        if (mPreviewResize)
         {
-            mPreviewDirty = false;
+            mPreviewResize = false;
             MyGUI::IntSize size = mAvatarImage->getSize();
-
-            mPreview->update (size.width, size.height);
+            mPreview->resize(size.width, size.height);
 
             mAvatarImage->setImageTexture("CharacterPreview");
             mAvatarImage->setImageCoord(MyGUI::IntCoord(0, 0, std::min(512, size.width), std::min(1024, size.height)));
             mAvatarImage->setImageTile(MyGUI::IntSize(std::min(512, size.width), std::min(1024, size.height)));
+        }
+        if (mPreviewDirty)
+        {
+            mPreviewDirty = false;
+            mPreview->update ();
+
+            mAvatarImage->setImageTexture("CharacterPreview");
 
             mArmorRating->setCaptionWithReplacing ("#{sArmor}: "
                 + boost::lexical_cast<std::string>(static_cast<int>(mPtr.getClass().getArmorRating(mPtr))));
diff --git a/apps/openmw/mwgui/inventorywindow.hpp b/apps/openmw/mwgui/inventorywindow.hpp
index 760ca87b0..6fd6ece4a 100644
--- a/apps/openmw/mwgui/inventorywindow.hpp
+++ b/apps/openmw/mwgui/inventorywindow.hpp
@@ -53,6 +53,7 @@ namespace MWGui
             DragAndDrop* mDragAndDrop;
 
             bool mPreviewDirty;
+            bool mPreviewResize;
             int mSelectedItem;
 
             MWWorld::Ptr mPtr;
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index fde5e9432..fd07f1a19 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -171,11 +171,22 @@ namespace MWRender
         delete mSelectionBuffer;
     }
 
-    void InventoryPreview::update(int sizeX, int sizeY)
+    void InventoryPreview::resize(int sizeX, int sizeY)
     {
         mSizeX = sizeX;
         mSizeY = sizeY;
 
+        mViewport->setDimensions (0, 0, std::min(1.f, float(mSizeX) / float(512)), std::min(1.f, float(mSizeY) / float(1024)));
+        mTexture->load();
+
+        if (!mRenderTarget)
+            setupRenderTarget();
+
+        mRenderTarget->update();
+    }
+
+    void InventoryPreview::update()
+    {
         mAnimation->updateParts();
 
         MWWorld::InventoryStore &inv = mCharacter.getClass().getInventoryStore(mCharacter);
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index d8f4609b8..711de0d15 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -81,7 +81,8 @@ namespace MWRender
         virtual ~InventoryPreview();
         virtual void onSetup();
 
-        void update(int sizeX, int sizeY);
+        void update(); // Render preview again, e.g. after changed equipment
+        void resize(int sizeX, int sizeY);
 
         int getSlotSelected(int posX, int posY);