krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Improve setting of culling mask for the savegame screenshot camera

Browse source
This commit is contained in:
scrawl 2015-08-02 18:05:15 +02:00
parent 88c61ed2b6
commit 664ae079db
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -466,9 +466,6 @@ namespace MWRender
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);
@ -492,6 +489,7 @@ 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);
@ -506,8 +504,6 @@ namespace MWRender
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)