mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 06:36:39 +00:00
Code Issues Releases Wiki Activity

Add option to change screenshot image format

Browse source
This commit is contained in:
scrawl 2014-09-11 04:28:14 +02:00
parent 7fa3100993
commit 36a90198e2
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/engine.cpp
View file

@ -509,7 +509,7 @@ void OMW::Engine::screenshot()
int shotCount = 0; int shotCount = 0;
const std::string& screenshotPath = mCfgMgr.getUserDataPath().string(); const std::string& screenshotPath = mCfgMgr.getUserDataPath().string();
std::string format = Settings::Manager::getString("screenshot format", "General");
// Find the first unused filename with a do-while // Find the first unused filename with a do-while
std::ostringstream stream; std::ostringstream stream;
do do
@ -518,11 +518,11 @@ void OMW::Engine::screenshot()
stream.str(""); stream.str("");
stream.clear(); stream.clear();
stream << screenshotPath << "screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << ".png"; stream << screenshotPath << "screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << "." << format;
} while (boost::filesystem::exists(stream.str())); } while (boost::filesystem::exists(stream.str()));
mOgre->screenshot(stream.str()); mOgre->screenshot(stream.str(), format);
} }
void OMW::Engine::setCompileAll (bool all) void OMW::Engine::setCompileAll (bool all)

2
files/settings-default.cfg
View file

@ -60,6 +60,8 @@ num mipmaps = 8
shader mode = shader mode =
screenshot format = png
[Shadows] [Shadows]
# Shadows are only supported when object shaders are on! # Shadows are only supported when object shaders are on!
enabled = false enabled = false

4
libs/openengine/ogre/renderer.cpp
View file

@ -44,7 +44,7 @@ void OgreRenderer::update(float dt)
{ {
} }
void OgreRenderer::screenshot(const std::string &file) void OgreRenderer::screenshot(const std::string &file, const std::string& imageFormat)
{ {
/* Since Ogre uses narrow character interfaces, it does not support /* Since Ogre uses narrow character interfaces, it does not support
Unicode paths on Windows. Therefore we had to implement screenshot Unicode paths on Windows. Therefore we had to implement screenshot
@ -65,7 +65,7 @@ void OgreRenderer::screenshot(const std::string &file)
); );
mWindow->copyContentsToMemory(image.getPixelBox()); mWindow->copyContentsToMemory(image.getPixelBox());
Ogre::DataStreamPtr stream = image.encode("png"); Ogre::DataStreamPtr stream = image.encode(imageFormat);
Ogre::MemoryDataStream *mem = dynamic_cast<Ogre::MemoryDataStream *>(stream.get()); Ogre::MemoryDataStream *mem = dynamic_cast<Ogre::MemoryDataStream *>(stream.get());
if (mem != 0) { // likely if (mem != 0) { // likely
const char *ptr = reinterpret_cast<char *>(mem->getCurrentPtr()); const char *ptr = reinterpret_cast<char *>(mem->getCurrentPtr());

2
libs/openengine/ogre/renderer.hpp
View file

@ -108,7 +108,7 @@ namespace OEngine
void update(float dt); void update(float dt);
/// Write a screenshot to file /// Write a screenshot to file
void screenshot(const std::string &file); void screenshot(const std::string &file, const std::string& imageFormat);
float getFPS(); float getFPS();