Changeset 3286 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

01/19/09 10:28:16 (15 years ago)

Author:

mattausch

Message:

worked on visualizations

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (11 diffs)

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

@@ -157 +157 @@
 
 float shotRays = .0f;
+/// the visibility solution is initialized at this number of rays shot that 
+int visibilitySolutionInitialState = 0;
 
 
@@ -480 +482 @@
                 env.GetFloatParam(string("viewCellsScaleFactor"), viewCellsScaleFactor);
                 env.GetFloatParam(string("skyDomeScaleFactor"), skyDomeScaleFactor);
+                env.GetIntParam(string("visibilitySolutionInitialState"), visibilitySolutionInitialState);
                 
                 //env.GetStringParam(string("modelPath"), model_path);
@@ -1192 +1195 @@
                 if (!walkThroughPlayer->ReadNextFrame(camera)) 
                 {
+                        cout << "reached end of walkthrough" << endl;
                         currentReplayFrame = -1;
                         replayPath = false;
@@ -1216 +1220 @@
         {
                 if (!walkThroughRecorder)
+                {
                         walkThroughRecorder = new WalkThroughRecorder(walkThroughSuffix + ".log");
-                
-                if ((Distance(oldPos, camera->GetPosition()) > 1e-6f) ||
+                }
+
+                // question: check if player has moved more than a minimum distance?
+
+                if (0 || 
+                        (Distance(oldPos, camera->GetPosition()) > 1e-6f) ||
                         (DotProd(oldDir, camera->GetDirection()) < 1.0f - 1e-6f))
                 {
@@ -1239 +1248 @@
                         LoadVisibilitySolution();
                         applicationTimer.Start();
+                        shotRays = visibilitySolutionInitialState;
                 }
 
@@ -1824 +1834 @@
                         cout << "recording frames on replaying" << endl;
                 else
-                        cout << "finished recording frames on replaying" << endl;
+                        cout << "not recording frames on replaying" << endl;
                 break;
         case GLUT_KEY_LEFT:
@@ -2375 +2385 @@
                 }
 
-                glColor3f(1.0f, 1.0f, 1.0f);
+                glColor3f(0.0f, 1.0f, 0.0f);
+
                 static char *alg_str[] = {
                         "Frustum Cull"
@@ -2384 +2395 @@
                 };
         
-#if 0
                 if (!showAlgorithmTime)
                 {
@@ -2390 +2400 @@
                         {                       
                                 sprintf(msg[7], "%s:  %6.1f fps", alg_str[renderMode], fps);            
-                                myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
+                                myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);
                         }
+
+                        int mrays = (int)shotRays / 1000000;
+                        sprintf(msg[7], "%s:  %04d M rays", alg_str[renderMode], mrays);        
+                        myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 60.0f);
                 }
                 else
                 {
                         sprintf(msg[7], "%s:  %6.1f ms", alg_str[renderMode], rTime);
-                        myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
-                }
-#else
-                int mrays = (int)shotRays / 1000000;
-                sprintf(msg[7], "%s:  %04d M rays", alg_str[renderMode], mrays);        
-                //myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
-                myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);//, top_color, bottom_color);
-#endif
-        }
-
+                        myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);
+                }
+
+                glColor3f(1.0f, 1.0f, 1.0f);
+        }
+
+        glColor3f(1, 1, 1);
         glDisable(GL_BLEND);
         glDisable(GL_TEXTURE_2D);
@@ -2664 +2675 @@
         viewCell = viewCellsTree->GetViewCell(camera->GetPosition());
 
-        // assume 60 FPS
-        const float raysPerMs = pvsTotalSamples / pvsTotalTime;
-        const float scale = renderTime * raysPerMs;
-
-        cout << "rays per sec: " << raysPerMs << endl;
-
-        //const float elapsedAlgorithmTime = applicationTimer.Elapsedms(false);
-        //int numTriangles = 0;
+        const float elapsedAlgorithmTime = applicationTimer.Elapsedms(false);
+
+        // assume 60 FPS, total time is in secs
+        const float raysPerMs = 2.0f * pvsTotalSamples / (pvsTotalTime * 1000.0f);
+        //shotRays = visibilitySolutionInitialState + elapsedAlgorithmTime * raysPerMs;
+        //shotRays += 1000 * raysPerMs / 60.0f;
+
+        //cout << "totalt: " << pvsTotalTime << endl;
+        //cout << "rays per ms: " << raysPerMs << endl;
 
         SceneEntity::SetCurrentVisibleId(globalVisibleId);
@@ -2679 +2691 @@
                 PvsEntry entry = viewCell->mPvs.GetEntry(i);
 #ifdef USE_TIMESTAMPS
-                if ((entry.mTimeStamp < 0.0f) || (entry.mTimeStamp <= shotRays))
-#else
-                if (1)
+                if (!((entry.mTimeStamp < 0.0f) || (entry.mTimeStamp <= shotRays)))
+                        continue;
 #endif
-                {
-                        entry.mEntity->SetVisibleId(globalVisibleId);
-                        //numTriangles += entry.mEntity->CountNumTriangles();
-                }
-        }
-
-        shotRays += scale;
+                entry.mEntity->SetVisibleId(globalVisibleId);
+                //numTriangles += entry.mEntity->CountNumTriangles();
+        }
+
         ++ globalVisibleId;
 }