From Jean-Sebastien Guay, "For a long time now I've wanted to be able to add custom values into the stats handler's graph. Here is my proposal of how I'd do this. It's surely not perfect and I'm open to suggestions, but I've already made more changes than I wanted to in order to be able to implement this...
The user calls statsHandler->addUserStatsLine() providing: - the label they want for that line in the graph - the text and bar colors they want in the graph - the stats names they want queried (one for time taken, one for begin and one for end time) and a few settings for how these will be displayed. Then all they have to do is call viewer->getViewerStats()->setAttribute(framenumber, name, value) for their three attributes each frame and they'll have their stats in the graph. They can also give only a time taken attribute (or some other numerical value they want printed, which can be averaged or not), or only begin+end attributes, and the graph will accordingly display only the (average or not) numerical value or only the bars. Along the way I cleaned up the existing code a bit: * Each time the setUpScene() or createCameraTimeStats() methods added a line to the graph, they did pretty much the same thing, so I moved that into a separate method called createTimeStatsLine() which is called by setUpScene() and createCameraTimeStats(). * I moved the font, characterSize, startBlocks and leftPos variables to member variables, since they were being passed around everywhere but were set only once at the beginning. * The geode on which stats lines are added is also kept in a member variable, and createCameraTimeStats() adds the per-camera lines to this geode instead of returning a new Group with a new Geode. This further reduces the number of variables the createCameraTimeStats() method needs as input. "
This commit is contained in:
Robert Osfield
@@ -42,7 +42,11 @@ StatsHandler::StatsHandler():
|
||||
_numBlocks(8),
|
||||
_blockMultiplier(10000.0),
|
||||
_statsWidth(1280.0f),
|
||||
_statsHeight(1024.0f)
|
||||
_statsHeight(1024.0f),
|
||||
_font("fonts/arial.ttf"),
|
||||
_startBlocks(150.0f),
|
||||
_leftPos(10.0f),
|
||||
_characterSize(20.0f)
|
||||
{
|
||||
_camera = new osg::Camera;
|
||||
_camera->setRenderer(new Renderer(_camera.get()));
|
||||
@@ -258,6 +262,28 @@ void StatsHandler::reset()
|
||||
_camera->removeChildren( 0, _camera->getNumChildren() );
|
||||
}
|
||||
|
||||
void StatsHandler::addUserStatsLine(const std::string& label, const osg::Vec4& textColor, const osg::Vec4& barColor,
|
||||
const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace,
|
||||
const std::string& beginTimeName, const std::string& endTimeName, float maxValue)
|
||||
{
|
||||
_userStatsLines.push_back(UserStatsLine(label, textColor, barColor, timeTakenName, multiplier, average, averageInInverseSpace, beginTimeName, endTimeName, maxValue));
|
||||
reset(); // Rebuild the stats display with the new user stats line.
|
||||
}
|
||||
|
||||
void StatsHandler::removeUserStatsLine(const std::string& label)
|
||||
{
|
||||
// Hopefully the labels are unique... This could be enforced.
|
||||
for (unsigned int i = 0; i < _userStatsLines.size(); ++i)
|
||||
{
|
||||
if (_userStatsLines[i].label == label)
|
||||
{
|
||||
_userStatsLines.erase(_userStatsLines.begin() + i);
|
||||
reset(); // Rebuild the stats display without the removed user stats line.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void StatsHandler::setUpHUDCamera(osgViewer::ViewerBase* viewer)
|
||||
{
|
||||
// Try GraphicsWindow first so we're likely to get the main viewer window
|
||||
@@ -351,6 +377,53 @@ struct AveragedValueTextDrawCallback : public virtual osg::Drawable::DrawCallbac
|
||||
mutable osg::Timer_t _tickLastUpdated;
|
||||
};
|
||||
|
||||
// Drawcallback to draw raw attribute
|
||||
struct RawValueTextDrawCallback : public virtual osg::Drawable::DrawCallback
|
||||
{
|
||||
RawValueTextDrawCallback(osg::Stats* stats, const std::string& name, int frameDelta, double multiplier):
|
||||
_stats(stats),
|
||||
_attributeName(name),
|
||||
_frameDelta(frameDelta),
|
||||
_multiplier(multiplier),
|
||||
_tickLastUpdated(0)
|
||||
{
|
||||
}
|
||||
|
||||
/** do customized draw code.*/
|
||||
virtual void drawImplementation(osg::RenderInfo& renderInfo,const osg::Drawable* drawable) const
|
||||
{
|
||||
osgText::Text* text = (osgText::Text*)drawable;
|
||||
|
||||
osg::Timer_t tick = osg::Timer::instance()->tick();
|
||||
double delta = osg::Timer::instance()->delta_m(_tickLastUpdated, tick);
|
||||
|
||||
if (delta>50) // update every 50ms
|
||||
{
|
||||
_tickLastUpdated = tick;
|
||||
|
||||
int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
|
||||
double value;
|
||||
if (_stats->getAttribute(frameNumber, _attributeName, value))
|
||||
{
|
||||
sprintf(_tmpText,"%4.2f",value * _multiplier);
|
||||
text->setText(_tmpText);
|
||||
}
|
||||
else
|
||||
{
|
||||
text->setText("");
|
||||
}
|
||||
}
|
||||
text->drawImplementation(renderInfo);
|
||||
}
|
||||
|
||||
osg::ref_ptr<osg::Stats> _stats;
|
||||
std::string _attributeName;
|
||||
int _frameDelta;
|
||||
double _multiplier;
|
||||
mutable char _tmpText[128];
|
||||
mutable osg::Timer_t _tickLastUpdated;
|
||||
};
|
||||
|
||||
struct CameraSceneStatsTextDrawCallback : public virtual osg::Drawable::DrawCallback
|
||||
{
|
||||
CameraSceneStatsTextDrawCallback(osg::Camera* camera, int cameraNumber):
|
||||
@@ -993,9 +1066,6 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
|
||||
#endif
|
||||
|
||||
std::string font("fonts/arial.ttf");
|
||||
|
||||
|
||||
// collect all the relevant cameras
|
||||
ViewerBase::Cameras validCameras;
|
||||
viewer->getCameras(validCameras);
|
||||
@@ -1030,11 +1100,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
|
||||
bool acquireGPUStats = numCamrasWithTimerQuerySupport==cameras.size();
|
||||
|
||||
float leftPos = 10.0f;
|
||||
float startBlocks = 150.0f;
|
||||
float characterSize = 20.0f;
|
||||
|
||||
osg::Vec3 pos(leftPos, _statsHeight-24.0f,0.0f);
|
||||
osg::Vec3 pos(_leftPos, _statsHeight-24.0f,0.0f);
|
||||
|
||||
osg::Vec4 colorFR(1.0f,1.0f,1.0f,1.0f);
|
||||
osg::Vec4 colorFRAlpha(1.0f,1.0f,1.0f,0.5f);
|
||||
@@ -1062,8 +1128,8 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
geode->addDrawable( frameRateLabel.get() );
|
||||
|
||||
frameRateLabel->setColor(colorFR);
|
||||
frameRateLabel->setFont(font);
|
||||
frameRateLabel->setCharacterSize(characterSize);
|
||||
frameRateLabel->setFont(_font);
|
||||
frameRateLabel->setCharacterSize(_characterSize);
|
||||
frameRateLabel->setPosition(pos);
|
||||
frameRateLabel->setText("Frame Rate: ");
|
||||
|
||||
@@ -1073,14 +1139,14 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
geode->addDrawable( frameRateValue.get() );
|
||||
|
||||
frameRateValue->setColor(colorFR);
|
||||
frameRateValue->setFont(font);
|
||||
frameRateValue->setCharacterSize(characterSize);
|
||||
frameRateValue->setFont(_font);
|
||||
frameRateValue->setCharacterSize(_characterSize);
|
||||
frameRateValue->setPosition(pos);
|
||||
frameRateValue->setText("0.0");
|
||||
|
||||
frameRateValue->setDrawCallback(new AveragedValueTextDrawCallback(viewer->getViewerStats(),"Frame rate",-1, true, 1.0));
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
|
||||
}
|
||||
|
||||
@@ -1097,27 +1163,27 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
_viewerChildNum = _switch->getNumChildren();
|
||||
_switch->addChild(group, false);
|
||||
|
||||
osg::Geode* geode = new osg::Geode();
|
||||
group->addChild(geode);
|
||||
_statsGeode = new osg::Geode();
|
||||
group->addChild(_statsGeode.get());
|
||||
|
||||
|
||||
{
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
|
||||
_threadingModelText = new osgText::Text;
|
||||
geode->addDrawable( _threadingModelText.get() );
|
||||
_statsGeode->addDrawable( _threadingModelText.get() );
|
||||
|
||||
_threadingModelText->setColor(colorFR);
|
||||
_threadingModelText->setFont(font);
|
||||
_threadingModelText->setCharacterSize(characterSize);
|
||||
_threadingModelText->setFont(_font);
|
||||
_threadingModelText->setCharacterSize(_characterSize);
|
||||
_threadingModelText->setPosition(pos);
|
||||
|
||||
updateThreadingModelText();
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
float topOfViewerStats = pos.y() + characterSize;
|
||||
float topOfViewerStats = pos.y() + _characterSize;
|
||||
|
||||
double cameraSize = 4.5 * cameras.size();
|
||||
if(!acquireGPUStats) //reduce size if GPU stats not needed
|
||||
@@ -1125,86 +1191,50 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
cameraSize -= 1.5 * cameras.size();
|
||||
}
|
||||
|
||||
geode->addDrawable(createBackgroundRectangle(
|
||||
pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
|
||||
_statsGeode->addDrawable(createBackgroundRectangle(
|
||||
pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
|
||||
_statsWidth - 2 * backgroundMargin,
|
||||
(3 + cameraSize) * characterSize + 2 * backgroundMargin,
|
||||
(3 + cameraSize) * _characterSize + 2 * backgroundMargin,
|
||||
backgroundColor) );
|
||||
|
||||
// Add user stats lines before the normal viewer and per-camera stats.
|
||||
for (unsigned int i = 0; i < _userStatsLines.size(); ++i)
|
||||
{
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
|
||||
osg::ref_ptr<osgText::Text> eventLabel = new osgText::Text;
|
||||
geode->addDrawable( eventLabel.get() );
|
||||
|
||||
eventLabel->setColor(colorUpdate);
|
||||
eventLabel->setFont(font);
|
||||
eventLabel->setCharacterSize(characterSize);
|
||||
eventLabel->setPosition(pos);
|
||||
eventLabel->setText("Event: ");
|
||||
|
||||
pos.x() = eventLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> eventValue = new osgText::Text;
|
||||
geode->addDrawable( eventValue.get() );
|
||||
|
||||
eventValue->setColor(colorUpdate);
|
||||
eventValue->setFont(font);
|
||||
eventValue->setCharacterSize(characterSize);
|
||||
eventValue->setPosition(pos);
|
||||
eventValue->setText("0.0");
|
||||
|
||||
eventValue->setDrawCallback(new AveragedValueTextDrawCallback(viewer->getViewerStats(),"Event traversal time taken",-1, false, 1000.0));
|
||||
|
||||
pos.x() = startBlocks;
|
||||
osg::Geometry* geometry = createGeometry(pos, characterSize *0.8, colorUpdateAlpha, _numBlocks);
|
||||
geometry->setDrawCallback(new BlockDrawCallback(this, startBlocks, viewer->getViewerStats(), viewer->getViewerStats(), "Event traversal begin time", "Event traversal end time", -1, _numBlocks));
|
||||
geode->addDrawable(geometry);
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
UserStatsLine& line = _userStatsLines[i];
|
||||
createTimeStatsLine(line.label, pos, line.textColor, line.barColor, viewer->getViewerStats(), viewer->getViewerStats(),
|
||||
line.timeTakenName, line.multiplier, line.average, line.averageInInverseSpace, line.beginTimeName, line.endTimeName);
|
||||
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
{
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
|
||||
osg::ref_ptr<osgText::Text> updateLabel = new osgText::Text;
|
||||
geode->addDrawable( updateLabel.get() );
|
||||
createTimeStatsLine("Event", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(),
|
||||
"Event traversal time taken", 1000.0, true, false, "Event traversal begin time", "Event traversal end time");
|
||||
|
||||
updateLabel->setColor(colorUpdate);
|
||||
updateLabel->setFont(font);
|
||||
updateLabel->setCharacterSize(characterSize);
|
||||
updateLabel->setPosition(pos);
|
||||
updateLabel->setText("Update: ");
|
||||
|
||||
pos.x() = updateLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> updateValue = new osgText::Text;
|
||||
geode->addDrawable( updateValue.get() );
|
||||
|
||||
updateValue->setColor(colorUpdate);
|
||||
updateValue->setFont(font);
|
||||
updateValue->setCharacterSize(characterSize);
|
||||
updateValue->setPosition(pos);
|
||||
updateValue->setText("0.0");
|
||||
|
||||
updateValue->setDrawCallback(new AveragedValueTextDrawCallback(viewer->getViewerStats(),"Update traversal time taken",-1, false, 1000.0));
|
||||
|
||||
pos.x() = startBlocks;
|
||||
osg::Geometry* geometry = createGeometry(pos, characterSize *0.8, colorUpdateAlpha, _numBlocks);
|
||||
geometry->setDrawCallback(new BlockDrawCallback(this, startBlocks, viewer->getViewerStats(), viewer->getViewerStats(), "Update traversal begin time", "Update traversal end time", -1, _numBlocks));
|
||||
geode->addDrawable(geometry);
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
pos.x() = leftPos;
|
||||
{
|
||||
pos.x() = _leftPos;
|
||||
|
||||
createTimeStatsLine("Update", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(),
|
||||
"Update traversal time taken", 1000.0, true, false, "Update traversal begin time", "Update traversal end time");
|
||||
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
pos.x() = _leftPos;
|
||||
|
||||
// add camera stats
|
||||
for(ViewerBase::Cameras::iterator citr = cameras.begin();
|
||||
citr != cameras.end();
|
||||
++citr)
|
||||
{
|
||||
group->addChild(createCameraTimeStats(font, pos, startBlocks, acquireGPUStats, characterSize, viewer->getViewerStats(), *citr));
|
||||
createCameraTimeStats(pos, acquireGPUStats, viewer->getViewerStats(), *citr);
|
||||
}
|
||||
|
||||
// add frame ticks
|
||||
@@ -1214,25 +1244,25 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
|
||||
osg::Vec4 colourTicks(1.0f,1.0f,1.0f, 0.5f);
|
||||
|
||||
pos.x() = startBlocks;
|
||||
pos.y() += characterSize;
|
||||
pos.x() = _startBlocks;
|
||||
pos.y() += _characterSize;
|
||||
float height = topOfViewerStats - pos.y();
|
||||
|
||||
osg::Geometry* ticks = createTick(pos, 5.0f, colourTicks, 100);
|
||||
geode->addDrawable(ticks);
|
||||
|
||||
osg::Geometry* frameMarkers = createFrameMarkers(pos, height, colourTicks, _numBlocks + 1);
|
||||
frameMarkers->setDrawCallback(new FrameMarkerDrawCallback(this, startBlocks, viewer->getViewerStats(), 0, _numBlocks + 1));
|
||||
frameMarkers->setDrawCallback(new FrameMarkerDrawCallback(this, _startBlocks, viewer->getViewerStats(), 0, _numBlocks + 1));
|
||||
geode->addDrawable(frameMarkers);
|
||||
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
}
|
||||
|
||||
// Stats line graph
|
||||
{
|
||||
pos.y() -= (backgroundSpacing + 2 * backgroundMargin);
|
||||
float width = _statsWidth - 4 * backgroundMargin;
|
||||
float height = 5 * characterSize;
|
||||
float height = 5 * _characterSize;
|
||||
|
||||
// Create a stats graph and add any stats we want to track with it.
|
||||
StatsGraph* statsGraph = new StatsGraph(pos, width, height);
|
||||
@@ -1242,6 +1272,15 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
statsGraph->addStatGraph(viewer->getViewerStats(), viewer->getViewerStats(), colorEvent, 0.016, "Event traversal time taken");
|
||||
statsGraph->addStatGraph(viewer->getViewerStats(), viewer->getViewerStats(), colorUpdate, 0.016, "Update traversal time taken");
|
||||
|
||||
for (unsigned int i = 0; i < _userStatsLines.size(); ++i)
|
||||
{
|
||||
UserStatsLine& line = _userStatsLines[i];
|
||||
if (line.average)
|
||||
{
|
||||
statsGraph->addStatGraph(viewer->getViewerStats(), viewer->getViewerStats(), line.textColor, line.maxValue, line.timeTakenName);
|
||||
}
|
||||
}
|
||||
|
||||
for(ViewerBase::Cameras::iterator citr = cameras.begin();
|
||||
citr != cameras.end();
|
||||
++citr)
|
||||
@@ -1254,12 +1293,12 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
}
|
||||
}
|
||||
|
||||
geode->addDrawable(createBackgroundRectangle( pos + osg::Vec3(-backgroundMargin, backgroundMargin, 0),
|
||||
width + 2 * backgroundMargin,
|
||||
height + 2 * backgroundMargin,
|
||||
backgroundColor) );
|
||||
_statsGeode->addDrawable(createBackgroundRectangle( pos + osg::Vec3(-backgroundMargin, backgroundMargin, 0),
|
||||
width + 2 * backgroundMargin,
|
||||
height + 2 * backgroundMargin,
|
||||
backgroundColor) );
|
||||
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
pos.y() -= height + 2 * backgroundMargin;
|
||||
}
|
||||
|
||||
@@ -1274,134 +1313,134 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
osgDB::DatabasePager* dp = scene->getDatabasePager();
|
||||
if (dp && dp->isRunning())
|
||||
{
|
||||
pos.y() -= (characterSize + backgroundSpacing);
|
||||
pos.y() -= (_characterSize + backgroundSpacing);
|
||||
|
||||
geode->addDrawable(createBackgroundRectangle( pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
|
||||
_statsWidth - 2 * backgroundMargin,
|
||||
characterSize + 2 * backgroundMargin,
|
||||
backgroundColor));
|
||||
_statsGeode->addDrawable(createBackgroundRectangle( pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
|
||||
_statsWidth - 2 * backgroundMargin,
|
||||
_characterSize + 2 * backgroundMargin,
|
||||
backgroundColor));
|
||||
|
||||
osg::ref_ptr<osgText::Text> averageLabel = new osgText::Text;
|
||||
geode->addDrawable( averageLabel.get() );
|
||||
_statsGeode->addDrawable( averageLabel.get() );
|
||||
|
||||
averageLabel->setColor(colorDP);
|
||||
averageLabel->setFont(font);
|
||||
averageLabel->setCharacterSize(characterSize);
|
||||
averageLabel->setFont(_font);
|
||||
averageLabel->setCharacterSize(_characterSize);
|
||||
averageLabel->setPosition(pos);
|
||||
averageLabel->setText("DatabasePager time to merge new tiles - average: ");
|
||||
|
||||
pos.x() = averageLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> averageValue = new osgText::Text;
|
||||
geode->addDrawable( averageValue.get() );
|
||||
_statsGeode->addDrawable( averageValue.get() );
|
||||
|
||||
averageValue->setColor(colorDP);
|
||||
averageValue->setFont(font);
|
||||
averageValue->setCharacterSize(characterSize);
|
||||
averageValue->setFont(_font);
|
||||
averageValue->setCharacterSize(_characterSize);
|
||||
averageValue->setPosition(pos);
|
||||
averageValue->setText("1000");
|
||||
|
||||
pos.x() = averageValue->getBound().xMax() + 2.0f*characterSize;
|
||||
pos.x() = averageValue->getBound().xMax() + 2.0f*_characterSize;
|
||||
|
||||
|
||||
osg::ref_ptr<osgText::Text> minLabel = new osgText::Text;
|
||||
geode->addDrawable( minLabel.get() );
|
||||
_statsGeode->addDrawable( minLabel.get() );
|
||||
|
||||
minLabel->setColor(colorDP);
|
||||
minLabel->setFont(font);
|
||||
minLabel->setCharacterSize(characterSize);
|
||||
minLabel->setFont(_font);
|
||||
minLabel->setCharacterSize(_characterSize);
|
||||
minLabel->setPosition(pos);
|
||||
minLabel->setText("min: ");
|
||||
|
||||
pos.x() = minLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> minValue = new osgText::Text;
|
||||
geode->addDrawable( minValue.get() );
|
||||
_statsGeode->addDrawable( minValue.get() );
|
||||
|
||||
minValue->setColor(colorDP);
|
||||
minValue->setFont(font);
|
||||
minValue->setCharacterSize(characterSize);
|
||||
minValue->setFont(_font);
|
||||
minValue->setCharacterSize(_characterSize);
|
||||
minValue->setPosition(pos);
|
||||
minValue->setText("1000");
|
||||
|
||||
pos.x() = minValue->getBound().xMax() + 2.0f*characterSize;
|
||||
pos.x() = minValue->getBound().xMax() + 2.0f*_characterSize;
|
||||
|
||||
osg::ref_ptr<osgText::Text> maxLabel = new osgText::Text;
|
||||
geode->addDrawable( maxLabel.get() );
|
||||
_statsGeode->addDrawable( maxLabel.get() );
|
||||
|
||||
maxLabel->setColor(colorDP);
|
||||
maxLabel->setFont(font);
|
||||
maxLabel->setCharacterSize(characterSize);
|
||||
maxLabel->setFont(_font);
|
||||
maxLabel->setCharacterSize(_characterSize);
|
||||
maxLabel->setPosition(pos);
|
||||
maxLabel->setText("max: ");
|
||||
|
||||
pos.x() = maxLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> maxValue = new osgText::Text;
|
||||
geode->addDrawable( maxValue.get() );
|
||||
_statsGeode->addDrawable( maxValue.get() );
|
||||
|
||||
maxValue->setColor(colorDP);
|
||||
maxValue->setFont(font);
|
||||
maxValue->setCharacterSize(characterSize);
|
||||
maxValue->setFont(_font);
|
||||
maxValue->setCharacterSize(_characterSize);
|
||||
maxValue->setPosition(pos);
|
||||
maxValue->setText("1000");
|
||||
|
||||
pos.x() = maxValue->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> requestsLabel = new osgText::Text;
|
||||
geode->addDrawable( requestsLabel.get() );
|
||||
_statsGeode->addDrawable( requestsLabel.get() );
|
||||
|
||||
requestsLabel->setColor(colorDP);
|
||||
requestsLabel->setFont(font);
|
||||
requestsLabel->setCharacterSize(characterSize);
|
||||
requestsLabel->setFont(_font);
|
||||
requestsLabel->setCharacterSize(_characterSize);
|
||||
requestsLabel->setPosition(pos);
|
||||
requestsLabel->setText("requests: ");
|
||||
|
||||
pos.x() = requestsLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> requestList = new osgText::Text;
|
||||
geode->addDrawable( requestList.get() );
|
||||
_statsGeode->addDrawable( requestList.get() );
|
||||
|
||||
requestList->setColor(colorDP);
|
||||
requestList->setFont(font);
|
||||
requestList->setCharacterSize(characterSize);
|
||||
requestList->setFont(_font);
|
||||
requestList->setCharacterSize(_characterSize);
|
||||
requestList->setPosition(pos);
|
||||
requestList->setText("0");
|
||||
|
||||
pos.x() = requestList->getBound().xMax() + 2.0f*characterSize;;
|
||||
pos.x() = requestList->getBound().xMax() + 2.0f*_characterSize;;
|
||||
|
||||
osg::ref_ptr<osgText::Text> compileLabel = new osgText::Text;
|
||||
geode->addDrawable( compileLabel.get() );
|
||||
_statsGeode->addDrawable( compileLabel.get() );
|
||||
|
||||
compileLabel->setColor(colorDP);
|
||||
compileLabel->setFont(font);
|
||||
compileLabel->setCharacterSize(characterSize);
|
||||
compileLabel->setFont(_font);
|
||||
compileLabel->setCharacterSize(_characterSize);
|
||||
compileLabel->setPosition(pos);
|
||||
compileLabel->setText("tocompile: ");
|
||||
|
||||
pos.x() = compileLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> compileList = new osgText::Text;
|
||||
geode->addDrawable( compileList.get() );
|
||||
_statsGeode->addDrawable( compileList.get() );
|
||||
|
||||
compileList->setColor(colorDP);
|
||||
compileList->setFont(font);
|
||||
compileList->setCharacterSize(characterSize);
|
||||
compileList->setFont(_font);
|
||||
compileList->setCharacterSize(_characterSize);
|
||||
compileList->setPosition(pos);
|
||||
compileList->setText("0");
|
||||
|
||||
pos.x() = maxLabel->getBound().xMax();
|
||||
|
||||
geode->setCullCallback(new PagerCallback(dp, minValue.get(), maxValue.get(), averageValue.get(), requestList.get(), compileList.get(), 1000.0));
|
||||
_statsGeode->setCullCallback(new PagerCallback(dp, minValue.get(), maxValue.get(), averageValue.get(), requestList.get(), compileList.get(), 1000.0));
|
||||
}
|
||||
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
}
|
||||
}
|
||||
|
||||
// Camera scene stats
|
||||
{
|
||||
pos.y() -= (characterSize + backgroundSpacing + 2 * backgroundMargin);
|
||||
pos.y() -= (_characterSize + backgroundSpacing + 2 * backgroundMargin);
|
||||
|
||||
osg::Group* group = new osg::Group;
|
||||
_cameraSceneChildNum = _switch->getNumChildren();
|
||||
@@ -1410,17 +1449,17 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
osg::Geode* geode = new osg::Geode();
|
||||
geode->setCullingActive(false);
|
||||
group->addChild(geode);
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
|
||||
10 * characterSize + 2 * backgroundMargin,
|
||||
22 * characterSize + 2 * backgroundMargin,
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
|
||||
10 * _characterSize + 2 * backgroundMargin,
|
||||
22 * _characterSize + 2 * backgroundMargin,
|
||||
backgroundColor));
|
||||
|
||||
// Camera scene & primitive stats static text
|
||||
osg::ref_ptr<osgText::Text> camStaticText = new osgText::Text;
|
||||
geode->addDrawable( camStaticText.get() );
|
||||
camStaticText->setColor(staticTextColor);
|
||||
camStaticText->setFont(font);
|
||||
camStaticText->setCharacterSize(characterSize);
|
||||
camStaticText->setFont(_font);
|
||||
camStaticText->setCharacterSize(_characterSize);
|
||||
camStaticText->setPosition(pos);
|
||||
|
||||
std::ostringstream viewStr;
|
||||
@@ -1453,15 +1492,15 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
camStaticText->setText(viewStr.str());
|
||||
|
||||
// Move camera block to the right
|
||||
pos.x() += 10 * characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
pos.x() += 10 * _characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
|
||||
// Add camera scene stats, one block per camera
|
||||
int cameraCounter = 0;
|
||||
for(ViewerBase::Cameras::iterator citr = cameras.begin(); citr != cameras.end(); ++citr)
|
||||
{
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
|
||||
5 * characterSize + 2 * backgroundMargin,
|
||||
22 * characterSize + 2 * backgroundMargin,
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
|
||||
5 * _characterSize + 2 * backgroundMargin,
|
||||
22 * _characterSize + 2 * backgroundMargin,
|
||||
backgroundColor));
|
||||
|
||||
// Camera scene stats
|
||||
@@ -1469,14 +1508,14 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
geode->addDrawable( camStatsText.get() );
|
||||
|
||||
camStatsText->setColor(dynamicTextColor);
|
||||
camStatsText->setFont(font);
|
||||
camStatsText->setCharacterSize(characterSize);
|
||||
camStatsText->setFont(_font);
|
||||
camStatsText->setCharacterSize(_characterSize);
|
||||
camStatsText->setPosition(pos);
|
||||
camStatsText->setText("");
|
||||
camStatsText->setDrawCallback(new CameraSceneStatsTextDrawCallback(*citr, cameraCounter));
|
||||
|
||||
// Move camera block to the right
|
||||
pos.x() += 5 * characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
pos.x() += 5 * _characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
cameraCounter++;
|
||||
}
|
||||
}
|
||||
@@ -1491,17 +1530,17 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
geode->setCullingActive(false);
|
||||
group->addChild(geode);
|
||||
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
|
||||
6 * characterSize + 2 * backgroundMargin,
|
||||
12 * characterSize + 2 * backgroundMargin,
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
|
||||
6 * _characterSize + 2 * backgroundMargin,
|
||||
12 * _characterSize + 2 * backgroundMargin,
|
||||
backgroundColor));
|
||||
|
||||
// View scene stats static text
|
||||
osg::ref_ptr<osgText::Text> camStaticText = new osgText::Text;
|
||||
geode->addDrawable( camStaticText.get() );
|
||||
camStaticText->setColor(staticTextColor);
|
||||
camStaticText->setFont(font);
|
||||
camStaticText->setCharacterSize(characterSize);
|
||||
camStaticText->setFont(_font);
|
||||
camStaticText->setCharacterSize(_characterSize);
|
||||
camStaticText->setPosition(pos);
|
||||
|
||||
std::ostringstream viewStr;
|
||||
@@ -1524,7 +1563,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
camStaticText->setText(viewStr.str());
|
||||
|
||||
// Move viewer block to the right
|
||||
pos.x() += 6 * characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
pos.x() += 6 * _characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
|
||||
std::vector<osgViewer::View*> views;
|
||||
viewer->getViews(views);
|
||||
@@ -1533,9 +1572,9 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
int viewCounter = 0;
|
||||
for (it = views.begin(); it != views.end(); ++it)
|
||||
{
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
|
||||
10 * characterSize + 2 * backgroundMargin,
|
||||
12 * characterSize + 2 * backgroundMargin,
|
||||
geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
|
||||
10 * _characterSize + 2 * backgroundMargin,
|
||||
12 * _characterSize + 2 * backgroundMargin,
|
||||
backgroundColor));
|
||||
|
||||
// Text for scene statistics
|
||||
@@ -1543,28 +1582,68 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase* viewer)
|
||||
geode->addDrawable( text );
|
||||
|
||||
text->setColor(dynamicTextColor);
|
||||
text->setFont(font);
|
||||
text->setCharacterSize(characterSize);
|
||||
text->setFont(_font);
|
||||
text->setCharacterSize(_characterSize);
|
||||
text->setPosition(pos);
|
||||
text->setDrawCallback(new ViewSceneStatsTextDrawCallback(*it, viewCounter));
|
||||
|
||||
pos.x() += 10 * characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
pos.x() += 10 * _characterSize + 2 * backgroundMargin + backgroundSpacing;
|
||||
viewCounter++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
osg::Node* StatsHandler::createCameraTimeStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool acquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera)
|
||||
void StatsHandler::createTimeStatsLine(const std::string& lineLabel,
|
||||
osg::Vec3 pos, const osg::Vec4& textColor, const osg::Vec4& barColor,
|
||||
osg::Stats* viewerStats, osg::Stats* stats,
|
||||
const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace,
|
||||
const std::string& beginTimeName, const std::string& endTimeName)
|
||||
{
|
||||
osg::ref_ptr<osgText::Text> label = new osgText::Text;
|
||||
_statsGeode->addDrawable( label.get() );
|
||||
|
||||
label->setColor(textColor);
|
||||
label->setFont(_font);
|
||||
label->setCharacterSize(_characterSize);
|
||||
label->setPosition(pos);
|
||||
label->setText(lineLabel + ": ");
|
||||
|
||||
pos.x() = label->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> value = new osgText::Text;
|
||||
_statsGeode->addDrawable( value.get() );
|
||||
|
||||
value->setColor(textColor);
|
||||
value->setFont(_font);
|
||||
value->setCharacterSize(_characterSize);
|
||||
value->setPosition(pos);
|
||||
value->setText("0.0");
|
||||
|
||||
if (!timeTakenName.empty())
|
||||
{
|
||||
if (average)
|
||||
{
|
||||
value->setDrawCallback(new AveragedValueTextDrawCallback(stats, timeTakenName, -1, averageInInverseSpace, multiplier));
|
||||
}
|
||||
else
|
||||
{
|
||||
value->setDrawCallback(new RawValueTextDrawCallback(stats, timeTakenName, -1, multiplier));
|
||||
}
|
||||
}
|
||||
|
||||
if (!beginTimeName.empty() && !endTimeName.empty())
|
||||
{
|
||||
pos.x() = _startBlocks;
|
||||
osg::Geometry* geometry = createGeometry(pos, _characterSize *0.8, barColor, _numBlocks);
|
||||
geometry->setDrawCallback(new BlockDrawCallback(this, _startBlocks, viewerStats, stats, beginTimeName, endTimeName, -1, _numBlocks));
|
||||
_statsGeode->addDrawable(geometry);
|
||||
}
|
||||
}
|
||||
|
||||
void StatsHandler::createCameraTimeStats(osg::Vec3& pos, bool acquireGPUStats, osg::Stats* viewerStats, osg::Camera* camera)
|
||||
{
|
||||
osg::Stats* stats = camera->getStats();
|
||||
if (!stats) return 0;
|
||||
|
||||
osg::Group* group = new osg::Group;
|
||||
|
||||
osg::Geode* geode = new osg::Geode();
|
||||
group->addChild(geode);
|
||||
|
||||
float leftPos = pos.x();
|
||||
if (!stats) return;
|
||||
|
||||
osg::Vec4 colorCull( 0.0f,1.0f,1.0f,1.0f);
|
||||
osg::Vec4 colorCullAlpha( 0.0f,1.0f,1.0f,0.5f);
|
||||
@@ -1574,110 +1653,32 @@ osg::Node* StatsHandler::createCameraTimeStats(const std::string& font, osg::Vec
|
||||
osg::Vec4 colorGPUAlpha( 1.0f,0.5f,0.0f,0.5f);
|
||||
|
||||
{
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
|
||||
osg::ref_ptr<osgText::Text> cullLabel = new osgText::Text;
|
||||
geode->addDrawable( cullLabel.get() );
|
||||
createTimeStatsLine("Cull", pos, colorCull, colorCullAlpha, viewerStats, stats,
|
||||
"Cull traversal time taken", 1000.0, true, false, "Cull traversal begin time", "Cull traversal end time");
|
||||
|
||||
cullLabel->setColor(colorCull);
|
||||
cullLabel->setFont(font);
|
||||
cullLabel->setCharacterSize(characterSize);
|
||||
cullLabel->setPosition(pos);
|
||||
cullLabel->setText("Cull: ");
|
||||
|
||||
pos.x() = cullLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> cullValue = new osgText::Text;
|
||||
geode->addDrawable( cullValue.get() );
|
||||
|
||||
cullValue->setColor(colorCull);
|
||||
cullValue->setFont(font);
|
||||
cullValue->setCharacterSize(characterSize);
|
||||
cullValue->setPosition(pos);
|
||||
cullValue->setText("0.0");
|
||||
|
||||
cullValue->setDrawCallback(new AveragedValueTextDrawCallback(stats,"Cull traversal time taken",-1, false, 1000.0));
|
||||
|
||||
pos.x() = startBlocks;
|
||||
osg::Geometry* geometry = createGeometry(pos, characterSize *0.8, colorCullAlpha, _numBlocks);
|
||||
geometry->setDrawCallback(new BlockDrawCallback(this, startBlocks, viewerStats, stats, "Cull traversal begin time", "Cull traversal end time", -1, _numBlocks));
|
||||
geode->addDrawable(geometry);
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
{
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
|
||||
osg::ref_ptr<osgText::Text> drawLabel = new osgText::Text;
|
||||
geode->addDrawable( drawLabel.get() );
|
||||
createTimeStatsLine("Draw", pos, colorDraw, colorDrawAlpha, viewerStats, stats,
|
||||
"Draw traversal time taken", 1000.0, true, false, "Draw traversal begin time", "Draw traversal end time");
|
||||
|
||||
drawLabel->setColor(colorDraw);
|
||||
drawLabel->setFont(font);
|
||||
drawLabel->setCharacterSize(characterSize);
|
||||
drawLabel->setPosition(pos);
|
||||
drawLabel->setText("Draw: ");
|
||||
|
||||
pos.x() = drawLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> drawValue = new osgText::Text;
|
||||
geode->addDrawable( drawValue.get() );
|
||||
|
||||
drawValue->setColor(colorDraw);
|
||||
drawValue->setFont(font);
|
||||
drawValue->setCharacterSize(characterSize);
|
||||
drawValue->setPosition(pos);
|
||||
drawValue->setText("0.0");
|
||||
|
||||
drawValue->setDrawCallback(new AveragedValueTextDrawCallback(stats,"Draw traversal time taken",-1, false, 1000.0));
|
||||
|
||||
|
||||
pos.x() = startBlocks;
|
||||
osg::Geometry* geometry = createGeometry(pos, characterSize *0.8, colorDrawAlpha, _numBlocks);
|
||||
geometry->setDrawCallback(new BlockDrawCallback(this, startBlocks, viewerStats, stats, "Draw traversal begin time", "Draw traversal end time", -1, _numBlocks));
|
||||
geode->addDrawable(geometry);
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
if (acquireGPUStats)
|
||||
{
|
||||
pos.x() = leftPos;
|
||||
pos.x() = _leftPos;
|
||||
|
||||
osg::ref_ptr<osgText::Text> gpuLabel = new osgText::Text;
|
||||
geode->addDrawable( gpuLabel.get() );
|
||||
createTimeStatsLine("GPU", pos, colorGPU, colorGPUAlpha, viewerStats, stats,
|
||||
"GPU draw time taken", 1000.0, true, false, "GPU draw begin time", "GPU draw end time");
|
||||
|
||||
gpuLabel->setColor(colorGPU);
|
||||
gpuLabel->setFont(font);
|
||||
gpuLabel->setCharacterSize(characterSize);
|
||||
gpuLabel->setPosition(pos);
|
||||
gpuLabel->setText("GPU: ");
|
||||
|
||||
pos.x() = gpuLabel->getBound().xMax();
|
||||
|
||||
osg::ref_ptr<osgText::Text> gpuValue = new osgText::Text;
|
||||
geode->addDrawable( gpuValue.get() );
|
||||
|
||||
gpuValue->setColor(colorGPU);
|
||||
gpuValue->setFont(font);
|
||||
gpuValue->setCharacterSize(characterSize);
|
||||
gpuValue->setPosition(pos);
|
||||
gpuValue->setText("0.0");
|
||||
|
||||
gpuValue->setDrawCallback(new AveragedValueTextDrawCallback(stats,"GPU draw time taken",-1, false, 1000.0));
|
||||
|
||||
pos.x() = startBlocks;
|
||||
osg::Geometry* geometry = createGeometry(pos, characterSize *0.8, colorGPUAlpha, _numBlocks);
|
||||
geometry->setDrawCallback(new BlockDrawCallback(this, startBlocks, viewerStats, stats, "GPU draw begin time", "GPU draw end time", -1, _numBlocks));
|
||||
geode->addDrawable(geometry);
|
||||
|
||||
pos.y() -= characterSize*1.5f;
|
||||
pos.y() -= _characterSize*1.5f;
|
||||
}
|
||||
|
||||
|
||||
pos.x() = leftPos;
|
||||
|
||||
return group;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user