Changeset 880

Timestamp:

08/04/07 08:41:39 (1 year ago)

Author:

allenb

Message:

- Updated display to make line charts look better
- Added perfMon frame rate to the display

Files:

• branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/OSGPerfMonitorForeground.cpp (modified) (5 diffs)
• branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/testPerfMonitorForeground.cpp (modified) (2 diffs)
• branches/fcptr_stable_jun07/Source/System/Statistics/PerfMonitor/OSGPerfMonitor.cpp (modified) (2 diffs)
• branches/fcptr_stable_jun07/Source/System/Statistics/PerfMonitor/OSGPerfMonitor.h (modified) (1 diff)

branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/OSGPerfMonitorForeground.cpp

@@ -218 +218 @@
-
-   std::vector<std::string> output_lines;       // This will be the list of lines of text
+
+   // Put some basic stats at the top of the output
+   boost::format stats_formatter("FPS: %s");
+   std::string stats_line = boost::str(stats_formatter % PerfMonitor::the()->getFrameRate(10));
+   output_lines.push_back(stats_line);
-   
-   // compute the max length of the prefix strings ("   sample_name")
@@ -231 +236 @@
-   // Now create the lines of text
-   OSG_ASSERT(mode_names.count(render_mode) == 1);
-
-
+
-   std::string header_string = boost::str(
-         boost::format("%s%s %=10s %=10s %=7s") % mode_name
@@ -409 +413 @@
-   std::vector<OSG::Color4f> chart_colors;
-   OSG::Color4f bg_color = getBgColor();
-(bg_color * 1.2f
-8
-1[3] = chart_color2[3] = bg_color[3]
+OSG::Color4f(1.0,1.0,1.0,0.0
+2
+2[3] = 0.4
-   chart_colors.push_back(chart_color1);
-   chart_colors.push_back(chart_color2);
@@ -431 +435 @@
-
-      // Skip the first line since it is the header and skip another to get to bottom of sample line
-
+
+
+
-      glTranslatef(0.0, -sample_height, 0.0);
-
@@ -438 +444 @@
-      {
-         // Draw border box
-3
+4
-         next_base_color_idx += 1;
-         if (next_base_color_idx >= chart_colors.size())

branches/fcptr_stable_jun07/Source/System/Statistics/Foregrounds/testPerfMonitorForeground.cpp

@@ -85 +85 @@
-           perfmon_fg->cycleMode();        
-           break;
+        case 'S':
+        case 's':
+           mgr->setStatistics(!mgr->getStatistics());
+           break;
-
-        // Output help about the controls
@@ -94 +98 @@
-          std::cerr << "\nControls:"
-                    << "ESC: Exit application\n"
-
+
+
-                    << std::endl;
-       }

branches/fcptr_stable_jun07/Source/System/Statistics/PerfMonitor/OSGPerfMonitor.cpp

@@ -4 +4 @@
-#include <OpenSG/OSGBaseInitFunctions.h>
-#include <OpenSG/OSGSingletonHolder.ins>
+#include <OpenSG/OSGBaseFunctions.h>
-
-OSG_USING_NAMESPACE
@@ -125 +126 @@
-}
-
+
+float PerfMonitorBase::getFrameRate(unsigned avgOverFrames)
+{
+   if (0 == avgOverFrames)
+   { 
+      return mFrameRate; 
+   }
+   else
+   {
+      avgOverFrames = OSG::osgMin(avgOverFrames, unsigned(mFrameTimes.size()));
+      float av_frame_time = std::accumulate(mFrameTimes.begin(), mFrameTimes.begin()+avgOverFrames, 0.0)
+                         / float(avgOverFrames);
+      float frame_rate = 1.0/av_frame_time;
+      return frame_rate;
+   }
+}
+
+
-unsigned PerfMonitorBase::max_samples = 500;
-

branches/fcptr_stable_jun07/Source/System/Statistics/PerfMonitor/OSGPerfMonitor.h

@@ -217 +217 @@
-   bool getEnabled()
-   { return mEnabled; }
-
-
+
+
+
+
+
+
-   frame_times_vector_t getFrameTimes()
-   { return frame_times_vector_t(mFrameTimes.begin(), mFrameTimes.end()); }