Changeset 2289

Timestamp:

03/23/07 18:43:02 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)
• include/VisibilityEnvironment.h (modified) (1 diff)
• scripts/terrainCulling.cfg (modified) (1 diff)
• src/CoherentHierarchicalCullingManager.cpp (modified) (1 diff)
• src/FrustumCullingManager.cpp (modified) (2 diffs)
• src/RandomUpdateCullingManager.cpp (modified) (1 diff)
• src/StopAndWaitCullingManager.cpp (modified) (2 diffs)
• src/VisibilityManager.cpp (modified) (1 diff)

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

@@ -322 +322 @@
                          LogManager::getSingleton().logMessage("Using stop and wait algorithm");
                  }
+                else if (val == "RUC")
+                {
+                         algorithm = 
+                                 GtpVisibility::VisibilityEnvironment::RANDOM_UPDATE_CULLING;
+
+                         LogManager::getSingleton().logMessage("Using random update culling");
+                 }
                  else if (val == "VFC")
                  {

GTP/trunk/Lib/Vis/OnlineCullingCHC/include/VisibilityEnvironment.h

@@ -23 +23 @@
         enum CullingManagerType {COHERENT_HIERARCHICAL_CULLING, 
                                                          FRUSTUM_CULLING, 
+                                                         RANDOM_UPDATE_CULLING,
                                                          STOP_AND_WAIT_CULLING, 
                                                          NUM_CULLING_MANAGERS};

GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/terrainCulling.cfg

@@ -3 +3 @@
 #
 
-OnlineCullingAlgorithm=CHC
+OnlineCullingAlgorithm=RUC
+#OnlineCullingAlgorithm=CHC
 #OnlineCullingAlgorithm=SWC
 #OnlineCullingAlgorithm=VFC

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

@@ -24 +24 @@
 void CoherentHierarchicalCullingManager::RenderScene()
 {
-        //CullingLogManager::GetSingleton()->LogMessage("chc");
+        CullingLogManager::GetSingleton()->LogMessage("chc");
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;

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

@@ -1 +1 @@
 #include "FrustumCullingManager.h"
+#include "CullingLogManager.h"
 
 
@@ -7 +8 @@
 void FrustumCullingManager::RenderScene()
 {       
+        CullingLogManager::GetSingleton()->LogMessage("vfc");
+
         while (!mHierarchyInterface->GetQueue()->empty())
-        {;
+        {
                 HierarchyNode *node = mHierarchyInterface->GetQueue()->top();
                 mHierarchyInterface->GetQueue()->pop();

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

@@ -29 +29 @@
 void RandomUpdateCullingManager::RenderScene()
 {
-        //CullingLogManager::GetSingleton()->LogMessage("random");
+        CullingLogManager::GetSingleton()->LogMessage("ruc");
 
         QueryQueue queryQueue;

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

@@ -1 +1 @@
 #include "StopAndWaitCullingManager.h"
-
+#include "CullingLogManager.h"
 
 namespace GtpVisibility {
@@ -7 +7 @@
 void StopAndWaitCullingManager::RenderScene()
 {
+        CullingLogManager::GetSingleton()->LogMessage("swc");
+
         while (!mHierarchyInterface->GetQueue()->empty())
         {

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

@@ -58 +58 @@
 
                 case VisibilityEnvironment::FRUSTUM_CULLING:
-                        //mCullingManager = new FrustumCullingManager();
+                        mCullingManager = new FrustumCullingManager();
+                        break;
+
+                case VisibilityEnvironment::RANDOM_UPDATE_CULLING:
                         mCullingManager = new RandomUpdateCullingManager();     
                         break;