Changeset 720 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

Timestamp:

03/31/06 10:37:45 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (29 diffs)

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

@@ -1 @@
-#include "OgreVisibilityTerrainSceneManager.h"
+#include "OgreOcclusionCullingSceneManager.h"
 #include "OgreVisibilityOptionsManager.h"
 #include <OgreMath.h>
@@ -14 +14 @@
 
 //-----------------------------------------------------------------------
-VisibilityTerrainSceneManager::VisibilityTerrainSceneManager(
+OcclusionCullingSceneManager::OcclusionCullingSceneManager(
                                                         GtpVisibility::VisibilityManager *visManager): 
 mVisibilityManager(visManager), 
@@ -40 +40 @@
         //mShowBoundingBoxes = true;
         //mShowBoxes = true;
+//std::stringstream d; d << "here555";
+//mDummyLog.open("");
 
         // TODO: set maxdepth to reasonable value
@@ -45 +47 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::InitDepthPass()
+void OcclusionCullingSceneManager::InitDepthPass()
 {
         MaterialPtr depthMat = MaterialManager::getSingleton().getByName("Visibility/DepthPass");
@@ -66 +68 @@
 }
 //-----------------------------------------------------------------------
-VisibilityTerrainSceneManager::~VisibilityTerrainSceneManager()
+OcclusionCullingSceneManager::~OcclusionCullingSceneManager()
 {
         OGRE_DELETE(mHierarchyInterface);
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::InitItemBufferPass()
+void OcclusionCullingSceneManager::InitItemBufferPass()
 {
         MaterialPtr itemBufferMat = MaterialManager::getSingleton().
@@ -95 +97 @@
 }
 //-------------------------------------------------------------------------
-void VisibilityTerrainSceneManager::setWorldGeometry( const String& filename )
+void OcclusionCullingSceneManager::setWorldGeometry( const String& filename )
 {
     // Clear out any existing world resources (if not default)
@@ -124 +126 @@
 
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::PrepareVisualization(Camera *cam)
+void OcclusionCullingSceneManager::PrepareVisualization(Camera *cam)
 {
         // add player camera for visualization purpose
@@ -173 +175 @@
 }
 //-----------------------------------------------------------------------
-Pass *VisibilityTerrainSceneManager::setPass(Pass* pass)
+Pass *OcclusionCullingSceneManager::setPass(Pass* pass)
 {
         // TODO: setting vertex program is not efficient
@@ -236 +238 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_findVisibleObjects(Camera* cam,
+void OcclusionCullingSceneManager::_findVisibleObjects(Camera* cam,
                                                                                                                 bool onlyShadowCasters)
 {
@@ -266 +268 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_renderVisibleObjects()
+void OcclusionCullingSceneManager::_renderVisibleObjects()
 {
 
@@ -329 +331 @@
                 // hierarchical visibility culling and rendering
                 InitVisibilityCulling(mCameraInProgress);
+
+                std::stringstream d; d << "here34\n";
+                LogManager::getSingleton().logMessage(d.str());
 
                 /** 
@@ -376 +381 @@
         getRenderQueue()->clear(); // finally clear render queue
         OGRE_DELETE(mRenderQueue); // HACK: should be cleared before...
-        //WriteLog(); // write out stats
-
-}
-
-//-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::_updateSceneGraph(Camera* cam)
+        WriteLog(); // write out stats
+
+}
+
+//-----------------------------------------------------------------------
+void OcclusionCullingSceneManager::_updateSceneGraph(Camera* cam)
 {
         mVisibilityManager->GetCullingManager()->SetHierarchyInterface(mHierarchyInterface);
@@ -389 +394 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::setOption(const String & key, const void * val)
+bool OcclusionCullingSceneManager::setOption(const String & key, const void * val)
 {
         if (key == "UseDepthPass")
@@ -482 +487 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOption(const String & key, void *val)
+bool OcclusionCullingSceneManager::getOption(const String & key, void *val)
 {
         if (key == "NumHierarchyNodes")
@@ -494 +499 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOptionValues(const String & key, 
+bool OcclusionCullingSceneManager::getOptionValues(const String & key, 
                                                                                                         StringVector &refValueList)
 {
@@ -500 +505 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::getOptionKeys(StringVector & refKeys)
+bool OcclusionCullingSceneManager::getOptionKeys(StringVector & refKeys)
 {
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
@@ -506 +511 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::setVisibilityManager(GtpVisibility::
+void OcclusionCullingSceneManager::setVisibilityManager(GtpVisibility::
                                                                                                                  VisibilityManager *visManager)
 {
@@ -512 +517 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::VisibilityManager *VisibilityTerrainSceneManager::getVisibilityManager( void )
+GtpVisibility::VisibilityManager *OcclusionCullingSceneManager::getVisibilityManager( void )
 {
         return mVisibilityManager;
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::WriteLog()
+void OcclusionCullingSceneManager::WriteLog()
 {
         std::stringstream d;
@@ -535 +540 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderObjects(
+void OcclusionCullingSceneManager::renderObjects(
         const RenderPriorityGroup::TransparentRenderablePassList& objs, 
     bool doLightIteration, const LightList* manualLightList)
@@ -546 +551 @@
 }
 //-----------------------------------------------------------------------
-bool VisibilityTerrainSceneManager::validatePassForRendering(Pass* pass)
+bool OcclusionCullingSceneManager::validatePassForRendering(Pass* pass)
 {
         // skip all but first pass if we are doing the depth pass
@@ -557 +562 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderQueueGroupObjects(RenderQueueGroup* pGroup)
 {
         if (!mIsItemBufferPhase)
@@ -576 +581 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::RenderItemBuffer(RenderPriorityGroup* pGroup)
+void OcclusionCullingSceneManager::RenderItemBuffer(RenderPriorityGroup* pGroup)
 {
         // Do solids
@@ -602 +607 @@
                 for (irend = rendList->begin(); irend != irendend; ++irend)
                 {
-                        std::stringstream d; d << "itembuffer, pass name: " << 
-                                ipass->first->getParent()->getParent()->getName();
-                                
-                        LogManager::getSingleton().logMessage(d.str());
+                        //std::stringstream d; d << "itembuffer, pass name: " << 
+                        //      ipass->first->getParent()->getParent()->getName();
+                        //      LogManager::getSingleton().logMessage(d.str());
                         
                         RenderSingleObjectForItemBuffer(*irend, ipass->first);
@@ -633 +637 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass)
+void OcclusionCullingSceneManager::RenderSingleObjectForItemBuffer(Renderable *rend, Pass *pass)
 {
         static LightList nullLightList;
@@ -678 +682 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::VisibilityManager *VisibilityTerrainSceneManager::GetVisibilityManager()
+GtpVisibility::VisibilityManager *OcclusionCullingSceneManager::GetVisibilityManager()
 {
         return mVisibilityManager;
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::InitVisibilityCulling(Camera *cam)
+void OcclusionCullingSceneManager::InitVisibilityCulling(Camera *cam)
 {
         // reset culling manager stats
@@ -704 +708 @@
         mLeavePassesInQueue = 0;
 
-        if (!mUseDepthPass && !mUseItemBuffer)
+        // if we have the depth pass or use an item buffer, no passes are left in the queue
+        if (0 && !mUseDepthPass && !mUseItemBuffer)
         {
                 if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
@@ -746 +751 @@
                                                                            mLeavePassesInQueue);
                 
-        //std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;LogManager::getSingleton().logMessage(d.str());
-}
-//-----------------------------------------------------------------------
-OctreeHierarchyInterface *VisibilityTerrainSceneManager::GetHierarchyInterface()
+        std::stringstream d; d << "leave passes in queue: " << mLeavePassesInQueue;
+        LogManager::getSingleton().logMessage(d.str());
+}
+//-----------------------------------------------------------------------
+OctreeHierarchyInterface *OcclusionCullingSceneManager::GetHierarchyInterface()
 {
         return mHierarchyInterface;
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::endFrame()
+void OcclusionCullingSceneManager::endFrame()
 {
         TerrainRenderable::ResetRenderLevelIndex();
 }
 //-----------------------------------------------------------------------
-Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, 
+Entity* OcclusionCullingSceneManager::createEntity(const String& entityName, 
                                                                                                         const String& meshName)
 {
@@ -775 +781 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
 {
         // only render solid passes during hierarchical culling
@@ -807 +813 @@
 }
 //-----------------------------------------------------------------------
-void VisibilityTerrainSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+void OcclusionCullingSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
 {
    if (mIsHierarchicalCulling)