Changeset 2145 for GTP/trunk/Lib/Vis

Timestamp:

02/20/07 15:37:34 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (12 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h

@@ -273 +273 @@
 
         bool mShowTerrain;
+
+        int mFlushRate;
+        int mCurrentFrame;
 
         ObjReader *mObjReader;

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

@@ -62 +62 @@
 mShowTerrain(false),
 mViewCellsFilename(""),
-mFilename("terrain")
+mFilename("terrain"),
+mFlushRate(10),
+mCurrentFrame(0)
 {
         Ogre::LogManager::getSingleton().
@@ -192 +194 @@
         String val;
 
+        LogManager::getSingleton().logMessage("****** OcclusionCullingSceneManager Options ********");
         config.load(stream);
 
@@ -203 +206 @@
         }
 
+        if (mUseDepthPass)
+                LogManager::getSingleton().logMessage("using depth");
+        else
+                LogManager::getSingleton().logMessage("not using depth");
+        
         val = config.getSetting("FlushQueue");
         
@@ -210 +218 @@
         }
 
+        if (mDeleteQueueAfterRendering)
+                LogManager::getSingleton().logMessage("flushing queue");
+        else
+                LogManager::getSingleton().logMessage("not flushing queue");
+        
         val = config.getSetting("Scene");
 
@@ -382 +395 @@
         // set the page source
         selectPageSource(pageSourceName, optlist);
+
+        LogManager::getSingleton().logMessage("****** Finished OcclusionCullingSceneManager Options ********");
 }
 
@@ -675 +690 @@
 
                 // for the shadow pass we use only standard rendering
-                // because shadows have low occlusion snyway
+                // because shadows have low occlusion anyway
                 if (mShadowTechnique == SHADOWTYPE_TEXTURE_MODULATIVE && 
                         mIlluminationStage == IRS_RENDER_TO_TEXTURE)
@@ -704 +719 @@
 void OcclusionCullingSceneManager::_renderVisibleObjects()
 {
-        // $$matt temp: Remove this!!
-        if (0) 
-        {
-                getDestinationRenderSystem()->_setCullingMode(CULL_NONE);
-                //LogManager::getSingleton().logMessage("warning: culling mode");
-        }
+        const bool flushQueue = mDeleteQueueAfterRendering && ((mCurrentFrame % mFlushRate) == 0);
+        ++ mCurrentFrame;
 
         if (mNormalExecution)
@@ -715 +726 @@
                 // the standard octree rendering mode
                 TerrainSceneManager::_renderVisibleObjects();
-                getRenderQueue()->clear(mDeleteQueueAfterRendering);
+                getRenderQueue()->clear(flushQueue);
                 return;
         }
@@ -847 +858 @@
 
         // almost same effect as below
-        getRenderQueue()->clear(mDeleteQueueAfterRendering);
+        getRenderQueue()->clear(flushQueue);
 
         if (0) WriteLog(); // write out stats
@@ -935 +946 @@
                 return true;
         }
-        else if (key == "DeleteRenderQueue")
+        else if (key == "FlushQueue")
         {
                 mDeleteQueueAfterRendering = (*static_cast<const bool *>(val));
@@ -1052 +1063 @@
                 return true;
         }
+        if (key == "FlushQueue")
+        {
+                * static_cast<bool *>(val) = (bool *)mDeleteQueueAfterRendering;
+                return true;
+        }
         if (key == "NormalExecution")
         {
@@ -1062 +1078 @@
                         mVisibilityManager->GetCullingManagerType();
 
-                * static_cast<unsigned int *>(val) = 
-                        (unsigned int)algorithm;
+                * static_cast<unsigned int *>(val) = (unsigned int)algorithm;
+
+                getRenderQueue()->clear(true);
+
                 return true;
         }