Changeset 2287 for GTP

Timestamp:

03/23/07 18:10:25 (18 years ago)

Author:

mattausch

Message:

update culling manager first working version

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• src/CoherentHierarchicalCullingManager.cpp (modified) (4 diffs)
• src/CullingManager.cpp (modified) (1 diff)
• src/RandomUpdateCullingManager.cpp (modified) (7 diffs)
• src/VisibilityManager.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp

@@ -109 +109 @@
 
         // if we come across some renderable geometry => render it
-        if (!octree->mNodes.empty())
-        {
+        //if (!octree->mNodes.empty())
+        //{
                 RenderNodeRecursive(node);
-        }
+        //}
 
 /*
@@ -264 +264 @@
         Octree *octant = static_cast<Octree *>(node);
 
-        if (octant->lastRendered() != mFrameId)
+        if (1)//octant->lastRendered() != mFrameId)
         {
                 octant->setLastRendered(mFrameId);
+
                 OctreeSceneManager *ocm = 
                         static_cast<OctreeSceneManager *>(mSceneManager);

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

@@ -1 +1 @@
 #include "CoherentHierarchicalCullingManager.h"
+#include "CullingLogManager.h"
+
 #include <time.h>
 
@@ -22 +24 @@
 void CoherentHierarchicalCullingManager::RenderScene()
 {
+        //CullingLogManager::GetSingleton()->LogMessage("chc");
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;
@@ -37 +40 @@
                                 mHierarchyInterface->GetQueue()->empty()))
                 {
-                HierarchyNode *node = queryQueue.front().first;
+                        HierarchyNode *node = queryQueue.front().first;
                         
                         queryQueue.pop();
@@ -74 +77 @@
                         if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
                         {
-                                ++ mNumFrustumCulledNodes;      
+                                ++ mNumFrustumCulledNodes;
+
                                 if (mVisualizeCulledNodes)
                                 {

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

@@ -16 +16 @@
 {
 }
-
-
 //-----------------------------------------------------------------------
 void CullingManager::SetHierarchyInterface(HierarchyInterface *hierarchyInterface)

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

@@ -6 +6 @@
 namespace GtpVisibility {
 
+const static int R_CANDIDATES = 1;
 //-----------------------------------------------------------------------
 RandomUpdateCullingManager::RandomUpdateCullingManager()
@@ -13 +14 @@
         srand(time(NULL));
 
-        mRandomCandidates = 1;
+        mRandomCandidates = R_CANDIDATES;
 }
 //-----------------------------------------------------------------------
@@ -23 +24 @@
         srand(time(NULL));
 
-        mRandomCandidates = 1;
+        mRandomCandidates = R_CANDIDATES;
 }
 //-----------------------------------------------------------------------
 void RandomUpdateCullingManager::RenderScene()
 {
+        //CullingLogManager::GetSingleton()->LogMessage("random");
+
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;
@@ -33 +36 @@
         /////////////
         //-- PART 1: process finished occlusion queries
+
+        // update the fully visible classifications
+        mHierarchyInterface->DetermineFullVisibility(mHierarchyInterface->GetHierarchyRoot());
+
         //mHierarchyInterface->TraverseNode2(mHierarchyInterface->GetHierarchyRoot());
-        //return;
-
+        
+#if 1
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
         {
@@ -84 +91 @@
                         if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
                         {
-                                ++ mNumFrustumCulledNodes;      
+                                ++ mNumFrustumCulledNodes;
+
                                 if (mVisualizeCulledNodes)
                                 {
@@ -127 +135 @@
                                                                                                                         mHierarchyInterface->GetFrameId());
 
-                                                queryQueue.push(QueryPair(node, 
+                                                queryQueue.push(QueryPair(randomLeaf, 
                                                         mHierarchyInterface->IssueNodeOcclusionQuery(node)));
                                         }
@@ -165 +173 @@
                 }
         }
-
-        // update the fully visible classifications
-        mHierarchyInterface->DetermineFullVisibility(mHierarchyInterface->GetHierarchyRoot());
+#endif
+        //while (!mHierarchyInterface->GetQueue()->empty())
+        //      mHierarchyInterface->GetQueue()->pop();
+        
 }
 //-----------------------------------------------------------------------

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

@@ -53 +53 @@
                 switch (ocmType)
                 {
-                case VisibilityEnvironment::STOP_AND_WAIT_CULLING:
-                        mCullingManager = new StopAndWaitCullingManager();
-                        break;
-
                 case VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING:
                         mCullingManager = new CoherentHierarchicalCullingManager(mAssumedVisibilityForChc);
@@ -63 +59 @@
                 case VisibilityEnvironment::FRUSTUM_CULLING:
                         //mCullingManager = new FrustumCullingManager();
-                        mCullingManager = new RandomUpdateCullingManager();
+                        mCullingManager = new RandomUpdateCullingManager();     
+                        break;
+
+                case VisibilityEnvironment::STOP_AND_WAIT_CULLING:
+                        mCullingManager = new StopAndWaitCullingManager();
+                        //mCullingManager = new RandomUpdateCullingManager();
                         break;