diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index fac6fcff2..f5053cca9 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -995,7 +995,7 @@ namespace MWRender osg::ref_ptr mImage; }; - void RenderingManager::screenshotScreen(osg::Image* image, int w, int h) + void RenderingManager::screenshotFramebuffer(osg::Image* image, int w, int h) { osg::Camera* camera = mViewer->getCamera(); osg::ref_ptr tempDrw = new osg::Drawable; @@ -1009,7 +1009,7 @@ namespace MWRender mViewer->updateTraversal(); mViewer->renderingTraversals(); callback->waitTillDone(); - // now that we've "used up" the current frame, get a fresh framenumber for the next frame() following after the screenshot is completed + // now that we've "used up" the current frame, get a fresh frame number for the next frame() following after the screenshot is completed mViewer->advance(mViewer->getFrameStamp()->getSimulationTime()); camera->removeChild(tempDrw); camera->setFinalDrawCallback(nullptr); diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp index 2efe10cf9..09cff26f1 100644 --- a/apps/openmw/mwrender/renderingmanager.hpp +++ b/apps/openmw/mwrender/renderingmanager.hpp @@ -144,8 +144,8 @@ namespace MWRender void setWaterHeight(float level); /// Take a screenshot of w*h onto the given image, not including the GUI. - void screenshotScreen(osg::Image* image, int w, int h); // copie directly from framebuffer and scale to given size void screenshot(osg::Image* image, int w, int h, osg::Matrixd cameraTransform=osg::Matrixd()); // make a new render at given size + void screenshotFramebuffer(osg::Image* image, int w, int h); // copy directly from framebuffer and scale to given size bool screenshot360(osg::Image* image, std::string settingStr); struct RayResult diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 73be0e6f4..ce06d887c 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -2554,7 +2554,7 @@ namespace MWWorld void World::screenshot(osg::Image* image, int w, int h) { - mRendering->screenshotScreen(image, w, h); + mRendering->screenshotFramebuffer(image, w, h); } bool World::screenshot360(osg::Image* image, std::string settingStr)