FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restructed use of frameNumber to avoid multiple queries

Browse Source
This commit is contained in:
Robert Osfield
2016-06-23 16:45:22 +01:00
parent 72a4bc6394
commit 130c02eb2e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgViewer/ViewerBase.cpp
View File

@@ -703,10 +703,10 @@ void ViewerBase::renderingTraversals()
double beginRenderingTraversals = elapsedTime();
osg::FrameStamp* frameStamp = getViewerFrameStamp();
unsigned int frameNumber = frameStamp ? frameStamp->getFrameNumber() : 0;
if (getViewerStats() && getViewerStats()->collectStats("scene"))
{
unsigned int frameNumber = frameStamp ? frameStamp->getFrameNumber() : 0;
Views views;
getViews(views);
@@ -857,10 +857,12 @@ void ViewerBase::renderingTraversals()
++sitr)
{
Scene* scene = *sitr;
osgDB::DatabasePager* dp = scene ? scene->getDatabasePager() : 0;
if (!scene) continue;
osgDB::DatabasePager* dp = scene->getDatabasePager();
if (dp) dp->signalEndFrame();
osgDB::ImagePager* ip = scene ? scene->getImagePager() : 0;
osgDB::ImagePager* ip = scene->getImagePager();
if (ip) ip->signalEndFrame();
}
@@ -883,9 +885,9 @@ void ViewerBase::renderingTraversals()
double endRenderingTraversals = elapsedTime();
// update current frames stats
getViewerStats()->setAttribute(frameStamp->getFrameNumber(), "Rendering traversals begin time ", beginRenderingTraversals);
getViewerStats()->setAttribute(frameStamp->getFrameNumber(), "Rendering traversals end time ", endRenderingTraversals);
getViewerStats()->setAttribute(frameStamp->getFrameNumber(), "Rendering traversals time taken", endRenderingTraversals-beginRenderingTraversals);
getViewerStats()->setAttribute(frameNumber, "Rendering traversals begin time ", beginRenderingTraversals);
getViewerStats()->setAttribute(frameNumber, "Rendering traversals end time ", endRenderingTraversals);
getViewerStats()->setAttribute(frameNumber, "Rendering traversals time taken", endRenderingTraversals-beginRenderingTraversals);
}
_requestRedraw = false;