Changeset 9563 for OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

Timestamp:

01/28/09 10:24:06 (4 years ago)

Author:

robert

Message:

From Paul Melis, removed redundent spacing.

Files:

• OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp (modified) (45 diffs)

OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -50 +50 @@
 bool StatsHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
 {
-    
+
     osgViewer::View* myview = dynamic_cast<osgViewer::View*>(&aa);
     if (!myview) return false;
-    
+
     osgViewer::ViewerBase* viewer = myview->getViewerBase();
     if (viewer && _threadingModelText.valid() && viewer->getThreadingModel()!=_threadingModel)
@@ -60 +60 @@
         updateThreadingModelText();
     }
-    
-    
+
+
     if (ea.getHandled()) return false;
 
@@ -81 +81 @@
 
                     if (_statsType==LAST) _statsType = NO_STATS;
-                    
+
                     osgViewer::ViewerBase::Cameras cameras;
                     viewer->getCameras(cameras);
@@ -105 +105 @@
                                 }
                             }
-                            
+
                             viewer->getViewerStats()->collectStats("scene",false);
 
-                            _camera->setNodeMask(0x0); 
+                            _camera->setNodeMask(0x0);
                             _switch->setAllChildrenOff();
                             break;
@@ -115 +115 @@
                         {
                             viewer->getViewerStats()->collectStats("frame_rate",true);
-                            
+
                             _camera->setNodeMask(0xffffffff);
                             _switch->setValue(_frameRateChildNum, true);
@@ -135 +135 @@
                                 }
                             }
-                        
+
                             viewer->getViewerStats()->collectStats("event",true);
                             viewer->getViewerStats()->collectStats("update",true);
@@ -146 +146 @@
                                 if ((*itr)->getStats()) (*itr)->getStats()->collectStats("gpu",true);
                             }
-                            
+
                             _camera->setNodeMask(0xffffffff);
                             _switch->setValue(_viewerChildNum, true);
@@ -245 +245 @@
         case(osgViewer::Viewer::CullThreadPerCameraDrawThreadPerContext): _threadingModelText->setText("ThreadingModel: CullThreadPerCameraDrawThreadPerContext"); break;
         case(osgViewer::Viewer::AutomaticSelection): _threadingModelText->setText("ThreadingModel: AutomaticSelection"); break;
-        default: 
+        default:
             _threadingModelText->setText("ThreadingModel: unknown"); break;
     }
@@ -260 +260 @@
 {
     osgViewer::GraphicsWindow* window = dynamic_cast<osgViewer::GraphicsWindow*>(_camera->getGraphicsContext());
-    
+
     if (!window)
-    {    
+    {
         osgViewer::Viewer::Windows windows;
         viewer->getWindows(windows);
@@ -284 +284 @@
 
     _camera->setRenderer(new Renderer(_camera.get()));
-    
+
     _initialized = true;
 }
@@ -339 +339 @@
     CameraSceneStatsTextDrawCallback(osg::Camera* camera, int cameraNumber):
         _camera(camera),
-        _tickLastUpdated(0), 
+        _tickLastUpdated(0),
         _cameraNumber(cameraNumber)
     {
@@ -362 +362 @@
             osg::Stats* stats = _camera->getStats();
             osgViewer::Renderer* renderer = dynamic_cast<osgViewer::Renderer*>(_camera->getRenderer());
-            
+
             if (stats && renderer)
             {
-                viewStr.setf(std::ios::left,std::ios::adjustfield);
+                viewStr.setf(std::ios::left, std::ios::adjustfield);
                 viewStr.width(14);
 
@@ -409 +409 @@
                 STATS_ATTRIBUTE("Visible number of GL_POLYGON")
 
-
                 text->setText(viewStr.str());
             }
@@ -466 +465 @@
                     --frameNumber;
                 }
-                
+
                 #define STATS_ATTRIBUTE_PAIR(str1, str2) \
                     if (stats->getAttribute(frameNumber, str1, value)) \
@@ -493 +492 @@
                 text->setText(viewStr.str());
             }
-            else 
+            else
             {
                 osg::notify(osg::WARN)<<std::endl<<"No valid view to collect scene stats from"<<std::endl;
-                
+
                 text->setText("");
             }
@@ -511 +510 @@
 {
     BlockDrawCallback(StatsHandler* statsHandler, float xPos, osg::Stats* viewerStats, osg::Stats* stats, const std::string& beginName, const std::string& endName, int frameDelta, int numFrames):
-        _statsHandler(statsHandler), 
+        _statsHandler(statsHandler),
         _xPos(xPos),
         _viewerStats(viewerStats),
@@ -526 +525 @@
         osg::Vec3Array* vertices = (osg::Vec3Array*)geom->getVertexArray();
 
-        int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();            
+        int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
 
         int startFrame = frameNumber + _frameDelta - _numFrames + 1;
@@ -539 +538 @@
         double beginValue, endValue;
         for(int i = startFrame; i <= endFrame; ++i)
-        {            
+        {
             if (_stats->getAttribute( i, _beginName, beginValue) &&
                 _stats->getAttribute( i, _endName, endValue) )
@@ -566 +565 @@
 {
     osg::StateSet *ss = new osg::StateSet;
-  
+
     osg::Geometry* geometry = new osg::Geometry;
-  
+
     geometry->setUseDisplayList(false);
     geometry->setStateSet(ss);
@@ -574 +573 @@
     osg::Vec3Array* vertices = new osg::Vec3Array;
     geometry->setVertexArray(vertices);
-  
+
     vertices->push_back(osg::Vec3(pos.x(), pos.y(), 0));
     vertices->push_back(osg::Vec3(pos.x(), pos.y()-height,0));
     vertices->push_back(osg::Vec3(pos.x()+width, pos.y()-height,0));
     vertices->push_back(osg::Vec3(pos.x()+width, pos.y(),0));
-  
+
     osg::Vec4Array* colors = new osg::Vec4Array;
     colors->push_back(color);
     geometry->setColorArray(colors);
     geometry->setColorBinding(osg::Geometry::BIND_OVERALL);
-  
+
     osg::DrawElementsUInt *base =  new osg::DrawElementsUInt(osg::PrimitiveSet::QUADS,0);
     base->push_back(0);
@@ -622 +621 @@
     struct Graph : public osg::Geometry
     {
-        Graph(float width, float height, osg::Stats* viewerStats, osg::Stats* stats, 
+        Graph(float width, float height, osg::Stats* viewerStats, osg::Stats* stats,
               const osg::Vec4& color, float max, const std::string& nameBegin, const std::string& nameEnd = "")
         {
@@ -640 +639 @@
     struct GraphUpdateCallback : public osg::Drawable::DrawCallback
     {
-        GraphUpdateCallback(float width, float height, osg::Stats* viewerStats, osg::Stats* stats, 
+        GraphUpdateCallback(float width, float height, osg::Stats* viewerStats, osg::Stats* stats,
                             float max, const std::string& nameBegin, const std::string& nameEnd = "")
             : _width((unsigned int)width), _height((unsigned int)height), _curX(0),
@@ -689 +688 @@
                 vertices->erase(vertices->begin(), vertices->begin() + excedent);
 
-                // Make the graph scroll when there is enough data. 
-                // Note: We check the frame number so that even if we have 
-                // many graphs, the transform is translated only once per 
+                // Make the graph scroll when there is enough data.
+                // Note: We check the frame number so that even if we have
+                // many graphs, the transform is translated only once per
                 // frame.
                 static const float increment = -1.0;
                 if (GraphUpdateCallback::_frameNumber != frameNumber)
                 {
-                    // We know the exact layout of this part of the scene 
+                    // We know the exact layout of this part of the scene
                     // graph, so this is OK...
-                    osg::MatrixTransform* transform = 
+                    osg::MatrixTransform* transform =
                         geometry->getParent(0)->getParent(0)->asTransform()->asMatrixTransform();
                     if (transform)
@@ -767 +766 @@
     geometry->addPrimitiveSet(new osg::DrawArrays(GL_QUADS, 0, numBlocks*4));
 
-    return geometry;       
+    return geometry;
 }
 
@@ -774 +773 @@
 {
     FrameMarkerDrawCallback(StatsHandler* statsHandler, float xPos, osg::Stats* viewerStats, int frameDelta, int numFrames):
-        _statsHandler(statsHandler), 
+        _statsHandler(statsHandler),
         _xPos(xPos),
         _viewerStats(viewerStats),
@@ -786 +785 @@
         osg::Vec3Array* vertices = (osg::Vec3Array*)geom->getVertexArray();
 
-        int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();            
+        int frameNumber = renderInfo.getState()->getFrameStamp()->getFrameNumber();
 
         int startFrame = frameNumber + _frameDelta - _numFrames + 1;
@@ -799 +798 @@
         double currentReferenceTime;
         for(int i = startFrame; i <= endFrame; ++i)
-        {            
+        {
             if (_viewerStats->getAttribute( i, "Reference time", currentReferenceTime))
             {
@@ -821 +820 @@
 {
 
-    PagerCallback(    osgDB::DatabasePager* dp, 
-                    osgText::Text* minValue, 
-                    osgText::Text* maxValue, 
-                    osgText::Text* averageValue, 
-                    osgText::Text* filerequestlist, 
-                    osgText::Text* compilelist, 
+    PagerCallback(    osgDB::DatabasePager* dp,
+                    osgText::Text* minValue,
+                    osgText::Text* maxValue,
+                    osgText::Text* averageValue,
+                    osgText::Text* filerequestlist,
+                    osgText::Text* compilelist,
                     double multiplier):
         _dp(dp),
@@ -839 +838 @@
 
     virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-    { 
+    {
         if (_dp.valid())
-        {            
+        {
             double value = _dp->getAverageTimeToMergeTiles();
             if (value>= 0.0 && value <= 1000)
-            { 
+            {
                 sprintf(_tmpText,"%4.0f",value * _multiplier);
                 _averageValue->setText(_tmpText);
@@ -852 +851 @@
                 _averageValue->setText("");
             }
-            
+
             value = _dp->getMinimumTimeToMergeTile();
             if (value>= 0.0 && value <= 1000)
-            { 
+            {
                 sprintf(_tmpText,"%4.0f",value * _multiplier);
                 _minValue->setText(_tmpText);
@@ -866 +865 @@
             value = _dp->getMaximumTimeToMergeTile();
             if (value>= 0.0 && value <= 1000)
-            { 
+            {
                 sprintf(_tmpText,"%4.0f",value * _multiplier);
                 _maxValue->setText(_tmpText);
@@ -886 +885 @@
 
     osg::observer_ptr<osgDB::DatabasePager> _dp;
-    
+
     osg::ref_ptr<osgText::Text> _minValue;
     osg::ref_ptr<osgText::Text> _maxValue;
@@ -921 +920 @@
     geometry->addPrimitiveSet(new osg::DrawArrays(GL_LINES, 0, numBlocks*2));
 
-    return geometry;       
+    return geometry;
 }
 
@@ -948 +947 @@
     geometry->addPrimitiveSet(new osg::DrawArrays(GL_LINES, 0, numTicks*2));
 
-    return geometry;       
+    return geometry;
 }
 
@@ -975 +974 @@
         ++itr)
     {
-        if ((*itr)->getStats()) 
+        if ((*itr)->getStats())
         {
             cameras.push_back(*itr);
@@ -1051 +1050 @@
 
         pos.y() -= characterSize*1.5f;
-  
+
     }
 
@@ -1070 +1069 @@
         group->addChild(geode);
 
-        
+
         {
             pos.x() = leftPos;
@@ -1086 +1085 @@
             pos.y() -= characterSize*1.5f;
         }
-        
+
         float topOfViewerStats = pos.y() + characterSize;
 
@@ -1204 +1203 @@
             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(ViewerBase::Cameras::iterator citr = cameras.begin();
                 citr != cameras.end();
@@ -1340 +1339 @@
 
                 pos.x() = compileLabel->getBound().xMax();
-                
+
                 osg::ref_ptr<osgText::Text> compileList = new osgText::Text;
                 geode->addDrawable( compileList.get() );
@@ -1404 +1403 @@
         viewStr << "Quads" << std::endl;
         viewStr << "Quad strips" << std::endl;
-        viewStr << "Polygons" << std::endl;  
+        viewStr << "Polygons" << std::endl;
         viewStr.setf(std::ios::right,std::ios::adjustfield);
         camStaticText->setText(viewStr.str());
@@ -1422 +1421 @@
             // Camera scene stats
             osg::ref_ptr<osgText::Text> camStatsText = new osgText::Text;
-            geode->addDrawable( camStatsText.get() );  
-            
+            geode->addDrawable( camStatsText.get() );
+
             camStatsText->setColor(dynamicTextColor);
             camStatsText->setFont(font);
@@ -1454 +1453 @@
         // View scene stats static text
         osg::ref_ptr<osgText::Text> camStaticText = new osgText::Text;
-        geode->addDrawable( camStaticText.get() );  
+        geode->addDrawable( camStaticText.get() );
         camStaticText->setColor(staticTextColor);
         camStaticText->setFont(font);
@@ -1497 +1496 @@
             osgText::Text* text = new  osgText::Text;
             geode->addDrawable( text );
-  
+
             text->setColor(dynamicTextColor);
             text->setFont(font);