Changeset 13041 for OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp
r12955 r13041 267 267 } 268 268 269 void StatsHandler::addUserStatsLine(const std::string& label, const osg::Vec4& textColor, const osg::Vec4& barColor, 270 const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace, 269 void StatsHandler::addUserStatsLine(const std::string& label, const osg::Vec4& textColor, const osg::Vec4& barColor, 270 const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace, 271 271 const std::string& beginTimeName, const std::string& endTimeName, float maxValue) 272 272 { … … 1227 1227 1228 1228 UserStatsLine& line = _userStatsLines[i]; 1229 createTimeStatsLine(line.label, pos, line.textColor, line.barColor, viewer->getViewerStats(), viewer->getViewerStats(), 1229 createTimeStatsLine(line.label, pos, line.textColor, line.barColor, viewer->getViewerStats(), viewer->getViewerStats(), 1230 1230 line.timeTakenName, line.multiplier, line.average, line.averageInInverseSpace, line.beginTimeName, line.endTimeName); 1231 1231 1232 1232 pos.y() -= _characterSize*_lineHeight; 1233 1233 } … … 1236 1236 pos.x() = _leftPos; 1237 1237 1238 createTimeStatsLine("Event", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(), 1238 createTimeStatsLine("Event", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(), 1239 1239 "Event traversal time taken", 1000.0, true, false, "Event traversal begin time", "Event traversal end time"); 1240 1240 … … 1245 1245 pos.x() = _leftPos; 1246 1246 1247 createTimeStatsLine("Update", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(), 1247 createTimeStatsLine("Update", pos, colorUpdate, colorUpdateAlpha, viewer->getViewerStats(), viewer->getViewerStats(), 1248 1248 "Update traversal time taken", 1000.0, true, false, "Update traversal begin time", "Update traversal end time"); 1249 1249 … … 1618 1618 1619 1619 void StatsHandler::createTimeStatsLine(const std::string& lineLabel, 1620 osg::Vec3 pos, const osg::Vec4& textColor, const osg::Vec4& barColor, 1621 osg::Stats* viewerStats, osg::Stats* stats, 1622 const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace, 1620 osg::Vec3 pos, const osg::Vec4& textColor, const osg::Vec4& barColor, 1621 osg::Stats* viewerStats, osg::Stats* stats, 1622 const std::string& timeTakenName, float multiplier, bool average, bool averageInInverseSpace, 1623 1623 const std::string& beginTimeName, const std::string& endTimeName) 1624 1624 { … … 1679 1679 pos.x() = _leftPos; 1680 1680 1681 createTimeStatsLine("Cull", pos, colorCull, colorCullAlpha, viewerStats, stats, 1681 createTimeStatsLine("Cull", pos, colorCull, colorCullAlpha, viewerStats, stats, 1682 1682 "Cull traversal time taken", 1000.0, true, false, "Cull traversal begin time", "Cull traversal end time"); 1683 1683 … … 1688 1688 pos.x() = _leftPos; 1689 1689 1690 createTimeStatsLine("Draw", pos, colorDraw, colorDrawAlpha, viewerStats, stats, 1690 createTimeStatsLine("Draw", pos, colorDraw, colorDrawAlpha, viewerStats, stats, 1691 1691 "Draw traversal time taken", 1000.0, true, false, "Draw traversal begin time", "Draw traversal end time"); 1692 1692 … … 1698 1698 pos.x() = _leftPos; 1699 1699 1700 createTimeStatsLine("GPU", pos, colorGPU, colorGPUAlpha, viewerStats, stats, 1700 createTimeStatsLine("GPU", pos, colorGPU, colorGPUAlpha, viewerStats, stats, 1701 1701 "GPU draw time taken", 1000.0, true, false, "GPU draw begin time", "GPU draw end time"); 1702 1702
