AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-12 14:01:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2015-08-03 10:52:32 +02:00
commit 06f170a8e1
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/openmw/mwrender/renderingmanager.cpp
View File

@ -437,19 +437,35 @@ namespace MWRender
class NotifyDrawCompletedCallback : public osg::Camera::DrawCallback class NotifyDrawCompletedCallback : public osg::Camera::DrawCallback
{ {
public: public:
NotifyDrawCompletedCallback()
: mDone(false)
{
}
virtual void operator () (osg::RenderInfo& renderInfo) const virtual void operator () (osg::RenderInfo& renderInfo) const
{ {
mMutex.lock();
mDone = true;
mMutex.unlock();
mCondition.signal(); mCondition.signal();
} }
void waitTillDone()
{
mMutex.lock();
if (mDone)
return;
mCondition.wait(&mMutex);
mMutex.unlock();
}
mutable OpenThreads::Condition mCondition; mutable OpenThreads::Condition mCondition;
mutable OpenThreads::Mutex mMutex;
mutable bool mDone;
}; };
void RenderingManager::screenshot(osg::Image *image, int w, int h) void RenderingManager::screenshot(osg::Image *image, int w, int h)
{ {
int oldCullMask = mViewer->getCamera()->getCullMask();
mViewer->getCamera()->setCullMask(oldCullMask & (~Mask_GUI));
osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera); osg::ref_ptr<osg::Camera> rttCamera (new osg::Camera);
rttCamera->setNodeMask(Mask_RenderToTexture); rttCamera->setNodeMask(Mask_RenderToTexture);
rttCamera->attach(osg::Camera::COLOR_BUFFER, image); rttCamera->attach(osg::Camera::COLOR_BUFFER, image);
@ -473,24 +489,21 @@ namespace MWRender
image->setPixelFormat(texture->getInternalFormat()); image->setPixelFormat(texture->getInternalFormat());
rttCamera->addChild(mLightRoot); rttCamera->addChild(mLightRoot);
rttCamera->setCullMask(mViewer->getCamera()->getCullMask() & (~Mask_GUI));
mRootNode->addChild(rttCamera); mRootNode->addChild(rttCamera);
mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
// The draw needs to complete before we can copy back our image. // The draw needs to complete before we can copy back our image.
osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback); osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback);
rttCamera->setFinalDrawCallback(callback); rttCamera->setFinalDrawCallback(callback);
OpenThreads::Mutex m;
m.lock(); mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
callback->mCondition.wait(&m);
m.unlock(); callback->waitTillDone();
rttCamera->removeChildren(0, rttCamera->getNumChildren()); rttCamera->removeChildren(0, rttCamera->getNumChildren());
rttCamera->setGraphicsContext(NULL); rttCamera->setGraphicsContext(NULL);
mRootNode->removeChild(rttCamera); mRootNode->removeChild(rttCamera);
mViewer->getCamera()->setCullMask(oldCullMask);
} }
osg::Vec4f RenderingManager::getScreenBounds(const MWWorld::Ptr& ptr) osg::Vec4f RenderingManager::getScreenBounds(const MWWorld::Ptr& ptr)