Changeset 3223 for GTP/trunk/App

Timestamp:

12/11/08 02:32:29 (16 years ago)

Author:

mattausch

Message:

worked on stats

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (1 diff)
• plot_friendly (added)
• ps_memory_plot (added)
• ps_memory_plot2 (added)
• ps_memory_plot3 (added)
• showplot (added)
• src/StatsWriter.h (modified) (3 diffs)
• src/chcdemo.cpp (modified) (11 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -8 +8 @@
 
 useLODs=1
+# shadow map size
 shadowSize=4096
 # the filenames given to recorded frames (+ number.bmp)
 recordedFramesSuffix=image
+# the filename for the statistics
+statsFilename=mystats.log
 
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/StatsWriter.h

@@ -12 +12 @@
 struct FrameStats
 {
-        FrameStats() {}
+        FrameStats():
+        mFrame(0), mFPS(0), mTime(.0f), mNodes(0), mTriangles(0), mObjects(0)
+        {}
+
+
         FrameStats(int frame, int fps, float time, int nodes, int triangles, int objects):
         mFrame(frame), mFPS(fps), mTime(time), mNodes(nodes), mTriangles(triangles), mObjects(objects)
         {}
 
+
+        friend std::ostream& operator<< (std::ostream &s, const FrameStats &A);
 
 
@@ -27 +33 @@
         int mTriangles;
         int mObjects;
-
-
-        friend std::ostream& operator<< (std::ostream &s, const FrameStats &A);
 };
 
@@ -38 +41 @@
         s << "#FRAME" << "\n" << A.mFrame << std::endl;
         s << "#FPS" << "\n" << A.mFPS << std::endl;
-        s << "TIME" << "\n" << A.mTime << std::endl;
+        s << "#TIME" << "\n" << A.mTime << std::endl;
         s << "#NODES" << "\n" << A.mNodes << std::endl;
         s << "#TRIANGLES" << "\n" << A.mTriangles << std::endl;
         s << "#OBJECTS" << "\n" << A.mObjects << std::endl;
+
+        return s;
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -57 +57 @@
 #include "Shape.h"
 #include "WalkThroughRecorder.h"
+#include "StatsWriter.h"
 
 
@@ -119 +120 @@
 /// replays the recorded path
 bool replayPath = false;
-
+/// frame number for replay
 int currentReplayFrame = -1;
 
 string recordedFramesSuffix("frames");
+string statsFilename("stats");
 
 /// the walkThroughRecorder
 WalkThroughRecorder *walkThroughRecorder = NULL;
 WalkThroughPlayer *walkThroughPlayer = NULL;
+StatsWriter *statsWriter = NULL;
 
 
@@ -421 +424 @@
 
                 env.GetStringParam(string("recordedFramesSuffix"), recordedFramesSuffix);
+                env.GetStringParam(string("statsFilename"), statsFilename);
 
                 //env.GetStringParam(string("modelPath"), model_path);
@@ -450 +454 @@
                 cout << "ssao full resolution: " << ssaoUseFullResolution << endl;
                 cout << "recorded frames suffix: " << recordedFramesSuffix << endl;
+                cout << "stats filename: " << statsFilename << endl;
 
                 //cout << "model path: " << model_path << endl;
@@ -1081 +1086 @@
                 ++ currentReplayFrame;
 
+                // reset if end of walkthrough is reached
                 if (!walkThroughPlayer->ReadNextFrame(camera)) 
                 {
@@ -1131 +1137 @@
                 glEnable(GL_MULTISAMPLE_ARB);
                 renderState.SetRenderTechnique(FORWARD);
-                //glEnable(GL_LIGHTING);
-
+                
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
                 glEnableClientState(GL_NORMAL_ARRAY);
@@ -1145 +1150 @@
                 if (!fbo) InitFBO(); 
                 fbo->Bind();
-
+                // render to single depth texture
                 glDrawBuffers(1, mrt);
-
+                // clear buffer once
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -1305 +1310 @@
         elapsedTime = frameTimer.Elapsedms(restart);
 
+        // statistics
         DisplayStats();
 
@@ -1971 +1977 @@
         DEL_PTR(walkThroughRecorder);
         DEL_PTR(walkThroughPlayer);
+        DEL_PTR(statsWriter);
 
         ResourceManager::DelSingleton();
@@ -2035 +2042 @@
         static float rTime = 1000.0f;
 
+        // the render time used up purely for the traversal algorithm using glfinish
         if (showAlgorithmTime)
         {
@@ -2078 +2086 @@
 
 
+        ////////////////
+        //-- record stats on walkthrough
+
+        static float accTime = .0f;
+        static float averageTime = .0f;
+
+        if (currentReplayFrame > -1) 
+        {
+                accTime += frameTime;
+                averageTime = accTime / (currentReplayFrame + 1);
+
+                if (!statsWriter)
+                        statsWriter = new StatsWriter(statsFilename);
+                        
+                FrameStats frameStats;
+                frameStats.mFrame = currentReplayFrame;
+                frameStats.mFPS = 1e3f / (float)frameTime;
+                frameStats.mTime = frameTime;
+                frameStats.mNodes = renderedNodes;
+                frameStats.mObjects = renderedObjects;
+                frameStats.mTriangles = renderedTriangles;
+
+                statsWriter->WriteFrameStats(frameStats);
+        }
+        else if (statsWriter)
+        {
+                Debug << "average frame time " << averageTime << " for traversal algorithm " << renderMode << endl;
+
+                // reset average frame time
+                averageTime = .0f;
+                accTime = .0f;
+
+                DEL_PTR(statsWriter);
+        }
+
+
         Begin2D();