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

planet mapping adjustment

Browse source
This commit is contained in:
Miloslav Číž 2017-11-11 15:10:54 +01:00
parent 4fc532d873
commit 511a5686da
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwinput/inputmanagerimp.cpp
View file

@ -1042,6 +1042,7 @@ namespace MWInput
if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get(),settingStr)) if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get(),settingStr))
(*mScreenCaptureOperation) (*(screenshot.get()),0); (*mScreenCaptureOperation) (*(screenshot.get()),0);
// mScreenCaptureHandler->getCaptureOperation() causes crash for some reason
} }
} }

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

@ -654,7 +654,7 @@ namespace MWRender
{ {
dest->allocateImage(mSize * 6,mSize,mImages[0]->r(),mImages[0]->getPixelFormat(),mImages[0]->getDataType()); dest->allocateImage(mSize * 6,mSize,mImages[0]->r(),mImages[0]->getPixelFormat(),mImages[0]->getDataType());
for (int i = 0; i < 6; i++) for (int i = 0; i < 6; ++i)
osg::copyImage(mImages[i].get(),0,0,0,mImages[i]->s(),mImages[i]->t(),mImages[i]->r(),dest,i * mSize,0,0); osg::copyImage(mImages[i].get(),0,0,0,mImages[i]->s(),mImages[i]->t(),mImages[i]->r(),dest,i * mSize,0,0);
return; return;
@ -778,7 +778,9 @@ namespace MWRender
int screenshotW = mViewer->getCamera()->getViewport()->width(); int screenshotW = mViewer->getCamera()->getViewport()->width();
int screenshotH = mViewer->getCamera()->getViewport()->height(); int screenshotH = mViewer->getCamera()->getViewport()->height();
SphericalScreenshot::SphericalScreenshotMapping screenshotMapping = SphericalScreenshot::MAPPING_SPHERICAL; SphericalScreenshot::SphericalScreenshotMapping screenshotMapping = SphericalScreenshot::MAPPING_SPHERICAL;
int cubeSize = screenshotW / 2; int cubeSize = screenshotMapping == SphericalScreenshot::SphericalScreenshotMapping::MAPPING_SMALL_PLANET ?
screenshotW: // planet mapping needs higher resolution
screenshotW / 2;
std::vector<std::string> settingArgs; std::vector<std::string> settingArgs;
boost::algorithm::split(settingArgs,settingStr,boost::is_any_of(" ")); boost::algorithm::split(settingArgs,settingStr,boost::is_any_of(" "));