Move WriteScreenshotToFileOperation to components

apps/openmw/engine.cpp

@@ -40,6 +40,8 @@
 
 #include <components/misc/frameratelimiter.hpp>
 
+#include <components/sceneutil/screencapture.hpp>
+
 #include "mwinput/inputmanagerimp.hpp"
 
 #include "mwgui/windowmanagerimp.hpp"
@@ -781,54 +783,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 }
 
-class WriteScreenshotToFileOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
-{
-public:
-    WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat)
-        : mScreenshotPath(screenshotPath)
-        , mScreenshotFormat(screenshotFormat)
-    {
-    }
-
-    void operator()(const osg::Image& image, const unsigned int context_id) override
-    {
-        // Count screenshots.
-        int shotCount = 0;
-
-        // Find the first unused filename with a do-while
-        std::ostringstream stream;
-        do
-        {
-            // Reset the stream
-            stream.str("");
-            stream.clear();
-
-            stream << mScreenshotPath << "/screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << mScreenshotFormat;
-
-        } while (boost::filesystem::exists(stream.str()));
-
-        boost::filesystem::ofstream outStream;
-        outStream.open(boost::filesystem::path(stream.str()), std::ios::binary);
-
-        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(mScreenshotFormat);
-        if (!readerwriter)
-        {
-            Log(Debug::Error) << "Error: Can't write screenshot, no '" << mScreenshotFormat << "' readerwriter found";
-            return;
-        }
-
-        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(image, outStream);
-        if (!result.success())
-        {
-            Log(Debug::Error) << "Error: Can't write screenshot: " << result.message() << " code " << result.status();
-        }
-    }
-
-private:
-    std::string mScreenshotPath;
-    std::string mScreenshotFormat;
-};
-
 // Initialise and enter main loop.
 void OMW::Engine::go()
 {
@@ -860,7 +814,7 @@ void OMW::Engine::go()
     mViewer->setUseConfigureAffinity(false);
 #endif
 
-    mScreenCaptureOperation = new WriteScreenshotToFileOperation(
+    mScreenCaptureOperation = new SceneUtil::WriteScreenshotToFileOperation(
         mCfgMgr.getScreenshotPath().string(),
         Settings::Manager::getString("screenshot format", "General"));
 

components/CMakeLists.txt

@@ -53,6 +53,7 @@ add_component_dir (sceneutil
     clone attach visitor util statesetupdater controller skeleton riggeometry morphgeometry lightcontroller
     lightmanager lightutil positionattitudetransform workqueue unrefqueue pathgridutil waterutil writescene serialize optimizer
     actorutil detourdebugdraw navmesh agentpath shadow mwshadowtechnique recastmesh shadowsbin osgacontroller
+    screencapture
     )
 
 add_component_dir (nif

components/sceneutil/screencapture.cpp

@@ -0,0 +1,73 @@
+#include "screencapture.hpp"
+
+#include <components/debug/debuglog.hpp>
+#include <components/sceneutil/workqueue.hpp>
+
+#include <osg/Image>
+#include <osgDB/ReaderWriter>
+#include <osgDB/Registry>
+
+#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem/operations.hpp>
+
+#include <string>
+#include <sstream>
+#include <iomanip>
+
+namespace SceneUtil
+{
+    void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
+                               const osg::Image& image)
+    {
+        // Count screenshots.
+        int shotCount = 0;
+
+        // Find the first unused filename with a do-while
+        std::ostringstream stream;
+        do
+        {
+            // Reset the stream
+            stream.str("");
+            stream.clear();
+
+            stream << screenshotPath << "/screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << screenshotFormat;
+
+        } while (boost::filesystem::exists(stream.str()));
+
+        boost::filesystem::ofstream outStream;
+        outStream.open(boost::filesystem::path(stream.str()), std::ios::binary);
+
+        osgDB::ReaderWriter* readerwriter = osgDB::Registry::instance()->getReaderWriterForExtension(screenshotFormat);
+        if (!readerwriter)
+        {
+            Log(Debug::Error) << "Error: Can't write screenshot, no '" << screenshotFormat << "' readerwriter found";
+            return;
+        }
+
+        osgDB::ReaderWriter::WriteResult result = readerwriter->writeImage(image, outStream);
+        if (!result.success())
+        {
+            Log(Debug::Error) << "Error: Can't write screenshot: " << result.message() << " code " << result.status();
+        }
+    }
+
+    WriteScreenshotToFileOperation::WriteScreenshotToFileOperation(const std::string& screenshotPath,
+                                                                   const std::string& screenshotFormat)
+        : mScreenshotPath(screenshotPath)
+        , mScreenshotFormat(screenshotFormat)
+    {
+    }
+
+    void WriteScreenshotToFileOperation::operator()(const osg::Image& image, const unsigned int /*context_id*/)
+    {
+        try
+        {
+            writeScreenshotToFile(mScreenshotPath, mScreenshotFormat, image);
+        }
+        catch (const std::exception& e)
+        {
+            Log(Debug::Error) << "Failed to write screenshot to file with path=\"" << mScreenshotPath
+                              << "\", format=\"" << mScreenshotFormat << "\": " << e.what();
+        }
+    }
+}

components/sceneutil/screencapture.hpp

@@ -0,0 +1,31 @@
+#ifndef OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
+#define OPENMW_COMPONENTS_SCENEUTIL_SCREENCAPTURE_H
+
+#include <osgViewer/ViewerEventHandlers>
+
+#include <string>
+
+namespace osg
+{
+    class Image;
+}
+
+namespace SceneUtil
+{
+    void writeScreenshotToFile(const std::string& screenshotPath, const std::string& screenshotFormat,
+                               const osg::Image& image);
+
+    class WriteScreenshotToFileOperation : public osgViewer::ScreenCaptureHandler::CaptureOperation
+    {
+        public:
+            WriteScreenshotToFileOperation(const std::string& screenshotPath, const std::string& screenshotFormat);
+
+            void operator()(const osg::Image& image, const unsigned int /*context_id*/) override;
+
+        private:
+            const std::string mScreenshotPath;
+            const std::string mScreenshotFormat;
+    };
+}
+
+#endif