mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 02:15:32 +00:00
Code Issues Releases Wiki Activity

disable 360 screenshots in vanity/preview mode

Browse source
This commit is contained in:
Miloslav Číž 2017-11-10 15:23:44 +01:00
parent 497b33e403
commit 319ed2f9b8
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwbase/world.hpp
View file

@ -450,7 +450,7 @@ namespace MWBase
/// \todo this does not belong here /// \todo this does not belong here
virtual void screenshot (osg::Image* image, int w, int h) = 0; virtual void screenshot (osg::Image* image, int w, int h) = 0;
virtual void screenshot360 (osg::Image* image) = 0; virtual bool screenshot360 (osg::Image* image) = 0;
/// Find default position inside exterior cell specified by name /// Find default position inside exterior cell specified by name
/// \return false if exterior with given name not exists, true otherwise /// \return false if exterior with given name not exists, true otherwise

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

@ -1028,10 +1028,9 @@ namespace MWInput
void InputManager::screenshot360() void InputManager::screenshot360()
{ {
osg::ref_ptr<osg::Image> screenshot (new osg::Image); osg::ref_ptr<osg::Image> screenshot (new osg::Image);
MWBase::Environment::get().getWorld()->screenshot360(screenshot.get()); if (MWBase::Environment::get().getWorld()->screenshot360(screenshot.get()))
// calling mScreenCaptureHandler->getCaptureOperation() here caused segfault for some reason
(*mScreenCaptureOperation) (*(screenshot.get()),0); (*mScreenCaptureOperation) (*(screenshot.get()),0);
// calling mScreenCaptureHandler->getCaptureOperation() here caused segfault for some reason
} }
void InputManager::toggleInventory() void InputManager::toggleInventory()

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

@ -771,8 +771,11 @@ namespace MWRender
int mSize; int mSize;
}; };
void RenderingManager::screenshot360(osg::Image* image) bool RenderingManager::screenshot360(osg::Image* image)
{ {
if (mCamera->isVanityOrPreviewModeEnabled())
return false;
int screenshotWidth = Settings::Manager::tryGetInt("s360 width","Video",mViewer->getCamera()->getViewport()->width()); int screenshotWidth = Settings::Manager::tryGetInt("s360 width","Video",mViewer->getCamera()->getViewport()->width());
int screenshotHeight = Settings::Manager::tryGetInt("s360 height","Video",mViewer->getCamera()->getViewport()->height()); int screenshotHeight = Settings::Manager::tryGetInt("s360 height","Video",mViewer->getCamera()->getViewport()->height());
SphericalScreenshot::SphericalScreenshotMapping mapping = static_cast<SphericalScreenshot::SphericalScreenshotMapping>( SphericalScreenshot::SphericalScreenshotMapping mapping = static_cast<SphericalScreenshot::SphericalScreenshotMapping>(
@ -811,6 +814,8 @@ namespace MWRender
mPlayerAnimation->getObjectRoot()->setNodeMask(maskBackup); mPlayerAnimation->getObjectRoot()->setNodeMask(maskBackup);
mFieldOfView = fovBackup; mFieldOfView = fovBackup;
return true;
} }
void RenderingManager::screenshot(osg::Image *image, int w, int h, osg::Vec3 direction, bool disableWaterEffects) void RenderingManager::screenshot(osg::Image *image, int w, int h, osg::Vec3 direction, bool disableWaterEffects)

2
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -126,7 +126,7 @@ namespace MWRender
/// Take a screenshot of w*h onto the given image, not including the GUI. /// Take a screenshot of w*h onto the given image, not including the GUI.
void screenshot(osg::Image* image, int w, int h, osg::Vec3 direction=osg::Vec3(0,0,-1), bool disableWaterEffects=false); void screenshot(osg::Image* image, int w, int h, osg::Vec3 direction=osg::Vec3(0,0,-1), bool disableWaterEffects=false);
void screenshot360(osg::Image* image); bool screenshot360(osg::Image* image);
struct RayResult struct RayResult
{ {

4
apps/openmw/mwworld/worldimp.cpp
View file

@ -2281,9 +2281,9 @@ namespace MWWorld
mRendering->screenshot(image, w, h); mRendering->screenshot(image, w, h);
} }
void World::screenshot360 (osg::Image* image) bool World::screenshot360(osg::Image* image)
{ {
mRendering->screenshot360(image); return mRendering->screenshot360(image);
} }
void World::activateDoor(const MWWorld::Ptr& door) void World::activateDoor(const MWWorld::Ptr& door)

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -560,7 +560,7 @@ namespace MWWorld
/// \todo this does not belong here /// \todo this does not belong here
void screenshot (osg::Image* image, int w, int h) override; void screenshot (osg::Image* image, int w, int h) override;
void screenshot360 (osg::Image* image) override; bool screenshot360 (osg::Image* image) override;
/// Find center of exterior cell above land surface /// Find center of exterior cell above land surface
/// \return false if exterior with given name not exists, true otherwise /// \return false if exterior with given name not exists, true otherwise