Changeset 9575

Timestamp:

01/28/09 14:45:04 (4 years ago)

Author:

robert

Message:

From Paul Melis, "1) Changes the order of the camera stats slightly, to be more in line with
the view stats
2) Uses a slightly smaller block for view statistics"

Files:

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

OpenSceneGraph/trunk/src/osgViewer/StatsHandler.cpp

@@ -393 +393 @@
                 double value = 0.0;
 
-                STATS_ATTRIBUTE("Visible vertex count")
-                STATS_ATTRIBUTE("Visible number of drawables")
                 STATS_ATTRIBUTE("Visible number of lights")
                 STATS_ATTRIBUTE("Visible number of render bins")
@@ -400 +398 @@
                 STATS_ATTRIBUTE("Visible number of materials")
                 STATS_ATTRIBUTE("Visible number of impostors")
+                STATS_ATTRIBUTE("Visible number of drawables")
+                STATS_ATTRIBUTE("Visible vertex count")
 
                 STATS_ATTRIBUTE("Visible number of GL_POINTS")
@@ -471 +471 @@
                 #define STATS_ATTRIBUTE_PAIR(str1, str2) \
                     if (stats->getAttribute(frameNumber, str1, value)) \
-                        viewStr << std::setw(10) << value; \
+                        viewStr << std::setw(9) << value; \
                     else \
-                        viewStr << std::setw(10) << "."; \
+                        viewStr << std::setw(9) << "."; \
                     if (stats->getAttribute(frameNumber, str2, value)) \
-                        viewStr << std::setw(10) << value << std::endl; \
+                        viewStr << std::setw(9) << value << std::endl; \
                     else \
-                        viewStr << std::setw(10) << "." << std::endl; \
+                        viewStr << std::setw(9) << "." << std::endl; \
 
                 double value = 0.0;
 
                 // header
-                viewStr << std::setw(10) << "Unique" << std::setw(10) << "Instanced" << std::endl;
+                viewStr << std::setw(9) << "Unique" << std::setw(9) << "Instance" << std::endl;
 
                 STATS_ATTRIBUTE_PAIR("Number of unique StateSet","Number of instanced Stateset")
@@ -1394 +1394 @@
         viewStr << "Camera" << std::endl;
         viewStr << "" << std::endl; // placeholder for Camera name
-        viewStr << "Vertices" << std::endl;
-        viewStr << "Drawables" << std::endl;
         viewStr << "Lights" << std::endl;
         viewStr << "Bins" << std::endl;
@@ -1401 +1399 @@
         viewStr << "Matrices" << std::endl;
         viewStr << "Imposters" << std::endl;
+        viewStr << "Drawables" << std::endl;
+        viewStr << "Vertices" << std::endl;
         viewStr << "Points" << std::endl;
         viewStr << "Lines" << std::endl;
@@ -1496 +1496 @@
         {
             geode->addDrawable(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, characterSize + backgroundMargin, 0),
-                                                            11 * characterSize + 2 * backgroundMargin,
+                                                            10 * characterSize + 2 * backgroundMargin,
                                                             12 * characterSize + 2 * backgroundMargin,
                                                             backgroundColor));
@@ -1510 +1510 @@
             text->setDrawCallback(new ViewSceneStatsTextDrawCallback(*it, viewCounter));
 
-            pos.x() += 11 * characterSize + 2 * backgroundMargin + backgroundSpacing;
+            pos.x() += 10 * characterSize + 2 * backgroundMargin + backgroundSpacing;
             viewCounter++;
         }