Restore savegame screenshot display

apps/openmw/mwgui/savegamedialog.cpp

@@ -1,18 +1,21 @@
 #include "savegamedialog.hpp"
-#include "widgets.hpp"
-
-#include <OgreImage.h>
-#include <OgreTextureManager.h>
 
 #include <MyGUI_ComboBox.h>
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_ListBox.h>
 #include <MyGUI_InputManager.h>
 
+#include <osgDB/ReadFile>
+#include <osg/Texture2D>
+
+#include <components/myguiplatform/myguitexture.hpp>
+
 #include <components/misc/stringops.hpp>
 
 #include <components/settings/settings.hpp>
 
+#include <components/files/memorystream.hpp>
+
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -22,6 +25,7 @@
 #include "../mwstate/character.hpp"
 
 #include "confirmationdialog.hpp"
+#include "widgets.hpp"
 
 namespace MWGui
 {
@@ -358,30 +362,38 @@ namespace MWGui
             <<  " " << hour << " " << (pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");
 
         mInfoText->setCaptionWithReplacing(text.str());
-#if 0
+
+
         // Decode screenshot
-        std::vector<char> data = mCurrentSlot->mProfile.mScreenshot; // MemoryDataStream doesn't work with const data :(
+        const std::vector<char>& data = mCurrentSlot->mProfile.mScreenshot;
-        Ogre::DataStreamPtr stream(new Ogre::MemoryDataStream(&data[0], data.size()));
+        Files::IMemStream instream (&data[0], data.size());
-        Ogre::Image image;
+
-        image.load(stream, "jpg");
+        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension("jpg");
-
+        if (!readerwriter)
-        const std::string textureName = "@savegame_screenshot";
+        {
-        Ogre::TexturePtr texture;
+            std::cerr << "Can't open savegame screenshot, no jpg readerwriter found" << std::endl;
-        texture = Ogre::TextureManager::getSingleton().getByName(textureName);
+            return;
-        mScreenshot->setImageTexture("");
+        }
-        if (texture.isNull())
+
+        osgDB::ReaderWriter::ReadResult result = readerwriter->readImage(instream);
+        if (!result.success())
         {
-            texture = Ogre::TextureManager::getSingleton().createManual(textureName,
+            std::cerr << "Failed to read savegame screenshot: " << result.message() << std::endl;
-                Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
+            return;
-                Ogre::TEX_TYPE_2D,
-                image.getWidth(), image.getHeight(), 0, Ogre::PF_BYTE_RGBA, Ogre::TU_DYNAMIC_WRITE_ONLY);
         }
-        texture->unload();
-        texture->setWidth(image.getWidth());
-        texture->setHeight(image.getHeight());
-        texture->loadImage(image);
 
-        mScreenshot->setImageTexture(textureName);
+        osg::ref_ptr<osg::Texture2D> texture (new osg::Texture2D);
-#endif
+        texture->setImage(result.getImage());
+        texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+        texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+        texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR);
+        texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
+        texture->setResizeNonPowerOfTwoHint(false);
+        texture->setUnRefImageDataAfterApply(true);
+
+        mScreenshotTexture.reset(new osgMyGUI::OSGTexture(texture));
+
+        mScreenshot->setRenderItemTexture(mScreenshotTexture.get());
+        mScreenshot->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 1.f, 1.f, 0.f));
     }
 }

apps/openmw/mwgui/savegamedialog.hpp

@@ -48,6 +48,7 @@ namespace MWGui
 
         void fillSaveList();
 
+        std::auto_ptr<MyGUI::ITexture> mScreenshotTexture;
         MyGUI::ImageBox* mScreenshot;
         bool mSaving;
 

components/CMakeLists.txt

@@ -85,7 +85,7 @@ IF(NOT WIN32 AND NOT APPLE)
 ENDIF()
 add_component_dir (files
     linuxpath androidpath windowspath macospath fixedpath multidircollection collections configurationmanager
-    lowlevelfile constrainedfilestream
+    lowlevelfile constrainedfilestream memorystream
     )
 
 add_component_dir (compiler

components/files/memorystream.hpp

@@ -0,0 +1,31 @@
+#ifndef OPENMW_COMPONENTS_FILES_MEMORYSTREAM_H
+#define OPENMW_COMPONENTS_FILES_MEMORYSTREAM_H
+
+#include <istream>
+
+namespace Files
+{
+
+    struct MemBuf : std::streambuf
+    {
+        MemBuf(char const* buffer, size_t size)
+        {
+            // a streambuf isn't specific to istreams, so we need a non-const pointer :/
+            char* nonconstBuffer = (const_cast<char*>(buffer));
+            this->setg(nonconstBuffer, nonconstBuffer, nonconstBuffer + size);
+        }
+    };
+
+    /// @brief A variant of std::istream that reads from a constant in-memory buffer.
+    struct IMemStream: virtual MemBuf, std::istream
+    {
+        IMemStream(char const* buffer, size_t size)
+            : MemBuf(buffer, size)
+            , std::istream(static_cast<std::streambuf*>(this))
+        {
+        }
+    };
+
+}
+
+#endif