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

Timestamp:

01/18/09 19:45:20 (15 years ago)

Author:

mattausch

Message:

working on viz for submission

File:

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

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

@@ -384 +384 @@
 void LoadPompeiiFloor();
 
+float pvsTotalSamples = .0f;
+float pvsTotalTime = .0f;
+
 
 // new view projection matrix of the camera
@@ -1131 +1134 @@
 #endif
 
-/*
+                /*
                 /////////////////////////
                 //-- update animations
@@ -1230 +1233 @@
         glEnableClientState(GL_VERTEX_ARRAY);
 
-        if (1 && usePvs)
+        if (usePvs)
         {
                 if (!viewCellsTree)     
                 {
+                        LoadVisibilitySolution();
                         applicationTimer.Start();
-                        LoadVisibilitySolution();
                 }
 
@@ -1471 +1474 @@
                 Debug << "camPosition=" << camera->GetPosition().x << " " << camera->GetPosition().y << " " << camera->GetPosition().z << endl;
                 Debug << "camDirection=" << camera->GetDirection().x << " " << camera->GetDirection().y << " " << camera->GetDirection().z << endl;
+                Debug << "lightDirection=" << light->GetDirection().x << " " << light->GetDirection().y << " " << light->GetDirection().z << endl;
 
                 CleanUp();
@@ -1787 +1791 @@
                 {
                         cout << "replaying path" << endl;
+
                         currentReplayFrame = -1;
+
+                        // hack: load pvs on replay (remove later!)
+                        usePvs = true;
                 }
                 else
@@ -2211 +2219 @@
         static float rTime = 1000.0f;
 
-        // the render time used up purely for the traversal algorithm using glfinish
-        if (showAlgorithmTime)
-        {
-                if (algTime < 500) renderTime = algTime * expFactor + (1.0f - expFactor) * renderTime;
-        }
+        // the render time is used only for the traversal algorithm using glfinish
+        if (algTime < 500) renderTime = algTime * expFactor + (1.0f - expFactor) * renderTime;
+        
 
         accumulatedTime += elapsedTime;
@@ -2224 +2230 @@
 
                 if (frameTime) fps = 1e3f / (float)frameTime;
-
                 rTime = renderTime;
 
@@ -2376 +2381 @@
                         , "CHC"
                         , "CHC ++"
-//                      , "Collector"
+            //, "Collector"
                 };
         
@@ -2396 +2401 @@
                 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, 690.0f, 760.0f);//, top_color, bottom_color);
+                myfont.DrawString(msg[7], 1.3f, winWidth - 350, winHeight - 30.0f);//, top_color, bottom_color);
 #endif
         }
@@ -2658 +2664 @@
         viewCell = viewCellsTree->GetViewCell(camera->GetPosition());
 
-        // assume 60 FPS and 1M rays per second
-        const float scale = 1e6f / 60.0f;
+        // 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);
@@ -2669 +2678 @@
         {
                 PvsEntry entry = viewCell->mPvs.GetEntry(i);
-
-                if (1)//(entry.mTimeStamp < 0.0f) || (entry.mTimeStamp <= shotRays))
+#ifdef USE_TIMESTAMPS
+                if ((entry.mTimeStamp < 0.0f) || (entry.mTimeStamp <= shotRays))
+#else
+                if (1)
+#endif
                 {
                         entry.mEntity->SetVisibleId(globalVisibleId);
@@ -2692 +2704 @@
         VisibilitySolutionLoader visLoader;
 
-        viewCellsTree = visLoader.Load(vis_filename, bvh, viewCellsScaleFactor);
+        viewCellsTree = visLoader.Load(vis_filename, 
+                                           bvh,
+                                                                   pvsTotalSamples,
+                                                                   pvsTotalTime,
+                                                                   viewCellsScaleFactor);
 
         if (!viewCellsTree)