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

Timestamp:

01/18/09 02:25:26 (15 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -154 +154 @@
 static int globalVisibleId = 0;
 
+PerfTimer applicationTimer;
+
+float shotRays = .0f;
 
 
@@ -927 +930 @@
                 tr = new CHCPlusPlusTraverser();
                 break;
-        case RenderTraverser::CULL_COLLECTOR:
-                tr = new PvsCollectionRenderer();
-                break;
+        //case RenderTraverser::CULL_COLLECTOR:
+        //      tr = new PvsCollectionRenderer();
+        //      break;
         default:
                 tr = new FrustumCullingTraverser();
@@ -1229 +1232 @@
         if (1 && usePvs)
         {
-                if (!viewCellsTree)     LoadVisibilitySolution();
+                if (!viewCellsTree)     
+                {
+                        applicationTimer.Start();
+                        LoadVisibilitySolution();
+                }
 
                 if (viewCellsTree) LoadPvs();
@@ -1313 +1320 @@
         else
         {
-                if (traverser->GetType() == RenderTraverser::CULL_COLLECTOR)
-                        ((PvsCollectionRenderer *)traverser)->SetViewCell(usePvs ? viewCell : NULL);
-
-                //for (size_t i = 0; i < staticObjects.size(); ++ i)
-                //      staticObjects[i]->Render(&renderState);
-                
+                //if (traverser->GetType() == RenderTraverser::CULL_COLLECTOR)
+                //      ((PvsCollectionRenderer *)traverser)->SetViewCell(usePvs ? viewCell : NULL);
+
                 // actually render the scene geometry using the specified algorithm
                 traverser->RenderScene();
@@ -2372 +2376 @@
                         , "CHC"
                         , "CHC ++"
-                        , "Collector"
+//                      , "Collector"
                 };
-                
+        
+#if 0
                 if (!showAlgorithmTime)
                 {
@@ -2388 +2393 @@
                         myfont.DrawString(msg[7], 1.3f, 690.0f, 760.0f);//, top_color, bottom_color);
                 }
-
-                
-                //sprintf(msg[8], "algorithm time: %6.1f ms", rTime);
-                //myfont.DrawString(msg[8], 720.0f, 730.0f);            
+#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);
+#endif
         }
 
@@ -2428 +2434 @@
                         RenderShadowMap(newFar);
                 }
+
                 // initialize deferred rendering
                 InitDeferredRendering();
@@ -2651 +2658 @@
         viewCell = viewCellsTree->GetViewCell(camera->GetPosition());
 
-        int numTriangles = 0;
+        // assume 60 FPS and 1M rays per second
+        const float scale = 1e6f / 60.0f;
+
+        //const float elapsedAlgorithmTime = applicationTimer.Elapsedms(false);
+        //int numTriangles = 0;
 
         SceneEntity::SetCurrentVisibleId(globalVisibleId);
@@ -2657 +2668 @@
         for (int i = 0; i < viewCell->mPvs.GetSize(); ++ i)
         {
-                SceneEntity *ent = viewCell->mPvs.GetEntry(i);
-                ent->SetVisibleId(globalVisibleId);
-                //ent->Render(&renderState);
-
-                numTriangles += ent->CountNumTriangles();
-        }
-
+                PvsEntry entry = viewCell->mPvs.GetEntry(i);
+
+                if (1)//(entry.mTimeStamp < 0.0f) || (entry.mTimeStamp <= shotRays))
+                {
+                        entry.mEntity->SetVisibleId(globalVisibleId);
+                        //numTriangles += entry.mEntity->CountNumTriangles();
+                }
+        }
+
+        shotRays += scale;
         ++ globalVisibleId;
 }
@@ -2701 +2715 @@
 void LoadPompeiiFloor()
 {
-        AxisAlignedBox3 pompeiiBox = SceneEntity::ComputeBoundingBox(staticObjects);
+        AxisAlignedBox3 pompeiiBox = 
+                SceneEntity::ComputeBoundingBox(staticObjects);
 
         // todo: dispose texture
@@ -2722 +2737 @@
         depthPass->SetLightingEnabled(false);
 
-        ShaderProgram *defaultFragmentTexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("defaultFragmentTexMrt");
-        ShaderProgram *defaultVertexProgramMrt = ShaderManager::GetSingleton()->GetShaderProgram("defaultVertexMrt");
+        ShaderProgram *defaultFragmentTexProgramMrt =
+                ShaderManager::GetSingleton()->GetShaderProgram("defaultFragmentTexMrt");
+        ShaderProgram *defaultVertexProgramMrt = 
+                ShaderManager::GetSingleton()->GetShaderProgram("defaultVertexMrt");
 
         deferred->SetFragmentProgram(defaultFragmentTexProgramMrt);