Changeset 2292 for GTP/trunk/Lib/Vis/OnlineCullingCHC/src

Timestamp:

03/26/07 18:49:17 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/src

Files:

• CoherentHierarchicalCullingManager.cpp (modified) (3 diffs)
• FrustumCullingManager.cpp (modified) (1 diff)
• RandomUpdateCullingManager.cpp (modified) (8 diffs)
• StopAndWaitCullingManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp

@@ -11 +11 @@
         SetAssumedVisibility(0);
         // initialise random generator in case we use assumed visibility
-        srand(time(NULL));
+        //srand(time(NULL));
 }
 //-----------------------------------------------------------------------
@@ -19 +19 @@
         SetAssumedVisibility(assumedVisibility);
         // initialise random generator in case we use assumed visibility
-        srand(time(NULL));
+        //srand(time(NULL));
 }
 //-----------------------------------------------------------------------
 void CoherentHierarchicalCullingManager::RenderScene()
 {
-        CullingLogManager::GetSingleton()->LogMessage("chc");
+        if (0) CullingLogManager::GetSingleton()->LogMessage("chc");
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;
@@ -158 +158 @@
 inline void CoherentHierarchicalCullingManager::SkipQuery(HierarchyNode *node) const
 {
-        // -- set node to be visible in this frame, then traverse it
+        //-- set node to be visible in this frame, then traverse it
         mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
         

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/FrustumCullingManager.cpp

@@ -8 +8 @@
 void FrustumCullingManager::RenderScene()
 {       
-        CullingLogManager::GetSingleton()->LogMessage("vfc");
+        if (0) CullingLogManager::GetSingleton()->LogMessage("vfc");
 
         while (!mHierarchyInterface->GetQueue()->empty())

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/RandomUpdateCullingManager.cpp

@@ -2 +2 @@
 #include <time.h>
 #include "CullingLogManager.h"
+#include <vector>
+//#include <iostream>
+#include <sstream>
+
+
+using namespace std;
 
 
@@ -12 +18 @@
         SetAssumedVisibility(0);
         // initialise random generator in case we use assumed visibility
-        srand(time(NULL));
+        //srand(time(NULL));
 
         mRandomCandidates = R_CANDIDATES;
@@ -22 +28 @@
         SetAssumedVisibility(assumedVisibility);
         // initialise random generator in case we use assumed visibility
-        srand(time(NULL));
+        //srand(time(NULL));
 
         mRandomCandidates = R_CANDIDATES;
@@ -29 +35 @@
 void RandomUpdateCullingManager::RenderScene()
 {
-        CullingLogManager::GetSingleton()->LogMessage("ruc");
+        if (0) CullingLogManager::GetSingleton()->LogMessage("ruc");
 
         QueryQueue queryQueue;
@@ -37 +43 @@
         //-- PART 1: process finished occlusion queries
 
-        // update the fully visible classifications
-        mHierarchyInterface->DetermineFullVisibility(mHierarchyInterface->GetHierarchyRoot());
-
-        //mHierarchyInterface->TraverseNode2(mHierarchyInterface->GetHierarchyRoot());
-        
-#if 1
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
         {
@@ -121 +121 @@
                                 if (mHierarchyInterface->IsNodeFullyVisible(node))
                                 {
+#if 1
                                         // node fully visible => test only random leaves
                                         for (int i = 0; i < mRandomCandidates; ++ i)
@@ -138 +139 @@
                                                         mHierarchyInterface->IssueNodeOcclusionQuery(node)));
                                         }
-
-                                        mHierarchyInterface->TraverseNode2(node);
+#else
+                                        // test all leaves for visibility changes
+                                        HierarchyNodeContainer mynodes;
+                                        mHierarchyInterface->CollectLeaves(node, mynodes);
+
+                                        HierarchyNodeContainer::const_iterator nit, nit_end = mynodes.end();
+
+                                        for (nit = mynodes.begin(); nit != nit_end; ++ nit)
+                                        {
+                                                HierarchyNode *leaf = *nit;
+                                                mHierarchyInterface->SetNodeVisible(leaf, false);
+
+                                                // update node's visited flag
+                                                mHierarchyInterface->SetLastVisited(leaf, mHierarchyInterface->GetFrameId());
+
+                                                queryQueue.push(QueryPair(leaf, 
+                                                        mHierarchyInterface->IssueNodeOcclusionQuery(node)));
+                                        }
+#endif
+                                        mHierarchyInterface->RenderNodeRecursive(node);
 
                                         continue;
@@ -173 +192 @@
                 }
         }
-#endif
+
         //while (!mHierarchyInterface->GetQueue()->empty())
         //      mHierarchyInterface->GetQueue()->pop();
-        
+
+        // update the fully visible classifications
+        // TODO: this should be done during traversal!
+        mHierarchyInterface->DetermineFullVisibility(mHierarchyInterface->GetHierarchyRoot());
 }
 //-----------------------------------------------------------------------

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/StopAndWaitCullingManager.cpp

@@ -7 +7 @@
 void StopAndWaitCullingManager::RenderScene()
 {
-        CullingLogManager::GetSingleton()->LogMessage("swc");
+        if (0) CullingLogManager::GetSingleton()->LogMessage("swc");
 
         while (!mHierarchyInterface->GetQueue()->empty())