Changeset 2555 for GTP/trunk/Lib/Vis/OnlineCullingCHC/src/VisibilityManager.cpp

Timestamp:

10/05/07 15:36:52 (17 years ago)

Author:

mattausch

Message:

added partial implementation of chc++. problem: bounding box rendering in Ogre is VERY slow

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/src/VisibilityManager.cpp (modified) (6 diffs)

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

@@ -5 +5 @@
 #include "DummyPreprocessingManager.h"
 #include "RandomUpdateCullingManager.h"
+#include "CoherentHierarchicalCullingPlusPlusManager.h"
 #include "CullingLogManager.h"
 
@@ -19 +20 @@
 mAssumedVisibilityForChc(0)
 {
-#if 1
         SetCullingManager(VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING);
-#endif
-#if 0   
-        SetCullingManager(VisibilityEnvironment::STOP_AND_WAIT_CULLING);
-#endif
-#if 0
-        SetCullingManager(VisibilityEnvironment::FRUSTUM_CULLING);
-#endif
 }
 //-----------------------------------------------------------------------
@@ -61 +54 @@
                         mCullingManager = new FrustumCullingManager();
                         break;
-                case VisibilityEnvironment::RANDOM_UPDATE_CULLING:
+                case VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING_PLUSPLUS:
                         {
-                                RandomUpdateCullingManager *rum = new RandomUpdateCullingManager(mRandomCandidatesForRuc);
-                                rum->SetTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
-                                mCullingManager = rum;
+                                CoherentHierarchicalCullingPlusPlusManager *chcm = 
+                                        new CoherentHierarchicalCullingPlusPlusManager(mAssumedVisibilityForChc);
+                                mCullingManager = chcm;
                         }
                         break;
@@ -118 +111 @@
         mAssumedVisibilityForChc = assumedVisibility;
 
-        if (mCullingManagerType == VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING)
+        switch (mCullingManagerType)
         {
+        case VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING:
                 static_cast<CoherentHierarchicalCullingManager *>(mCullingManager)->
                                 SetAssumedVisibility(mAssumedVisibilityForChc);
+                break;
+        case VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING_PLUSPLUS:
+                static_cast<CoherentHierarchicalCullingPlusPlusManager *>(mCullingManager)->
+                                SetAssumedVisibility(mAssumedVisibilityForChc);
+                break;
         }
 }
@@ -129 +128 @@
         mRandomCandidatesForRuc = randomCandidates;
 
-        if (mCullingManagerType == VisibilityEnvironment::RANDOM_UPDATE_CULLING)
+        if (mCullingManagerType == VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING_PLUSPLUS)
         {
                 static_cast<RandomUpdateCullingManager *>(mCullingManager)->
@@ -160 +159 @@
                                 SetTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
         }
-        else if (mCullingManagerType == VisibilityEnvironment::RANDOM_UPDATE_CULLING)
+        /*else if (mCullingManagerType == VisibilityEnvironment::COHERENT_HIERARCHICAL_CULLING_PLUSPLUS)
         {
                 static_cast<RandomUpdateCullingManager *>(mCullingManager)->
                                 SetTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
-        }
+        }*/
 }
 //-----------------------------------------------------------------------