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

Timestamp:

06/14/07 17:24:08 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -311 +311 @@
         }
 
+        /////////////
         val = config.getSetting("OnlineCullingAlgorithm");
                 
@@ -357 +358 @@
 
         /////////////
-        // terrain options
+        val = config.getSetting("TestGeometryForVisibleLeaves");
+
+        if (!val.empty())
+        {
+                if (val == "yes")
+                        mVisibilityManager->SetTestGeometryForVisibleLeaves(true);
+                else
+                        mVisibilityManager->SetTestGeometryForVisibleLeaves(false);
+        }
+
+        /////////////
+        val = config.getSetting("TestGeometryBounds");
+
+        if (!val.empty())
+        {
+                if (val == "yes")
+                        mHierarchyInterface->SetTestGeometryBounds(true);
+                else
+                        mHierarchyInterface->SetTestGeometryBounds(false);
+        }
+
+        /////////////
+        val = config.getSetting("AssumedVisibleFrames");
+
+        if (!val.empty())
+        {
+                mVisibilityManager->SetAssumedVisibilityForChc(atoi(val.c_str()));
+        }
+
+
+        /////////////
+        val = config.getSetting("RandomUpdateCandidates");
+
+        if (!val.empty())
+        {
+                mVisibilityManager->SetRandomUpdateCandidatesForRuc(atoi(val.c_str()));
+        }
+
+
+        /////////////
+        // output
 
         if (mUseDepthPass)
@@ -395 +436 @@
         else
                 LogManager::getSingleton().logMessage("not flushing queue after some frames");
+
+        if (mVisibilityManager->GetTestGeometryForVisibleLeaves())
+                LogManager::getSingleton().logMessage("test geometry for visible leaves");
+        else
+                LogManager::getSingleton().logMessage("not testing geometry for visible leaves");
+        
+        if (mHierarchyInterface->GetTestGeometryBounds())
+                LogManager::getSingleton().logMessage("test geometry bounds instead of bounding box");
+        else
+                LogManager::getSingleton().logMessage("not testing geometry bounds instead of bounding box");
+
+
+        /////////////
+        // terrain options
 
         if (!mShowTerrain)
@@ -1263 +1318 @@
         d << "Depth pass: " << StringConverter::toString(mUseDepthPass) << ", "
           << "Delay transparents: " << StringConverter::toString(mDelayRenderTransparents) << ", "
-          << "Use optimization: " << StringConverter::toString(mHierarchyInterface->GetTestGeometryForVisibleLeaves()) << ", "
+//        << "Use optimization: " << StringConverter::toString(mHierarchyInterface->GetTestGeometryForVisibleLeaves()) << ", "
           << "Algorithm type: " << mVisibilityManager->GetCullingManagerType() << ", "
           << "Hierarchy nodes: " << mNumOctants << ", " 
@@ -1686 +1741 @@
                 LogManager::getSingleton().logMessage("error: should not come here");
                 // question: if no view cell, set everything visible?
-                //SetObjectsVisible(true);
                 SetObjectsVisible(false);
                 return;
@@ -1693 +1747 @@
         ////////////
         //-- set PVS of view cell to visible
-
-        //std::stringstream d; d << "appying new view cell pvs: " << vc->GetPvs().GetSize();
-        //LogManager::getSingleton().logMessage(d.str());
 
         GtpVisibilityPreprocessor::ObjectPvsIterator pit = vc->GetPvs().GetIterator();
@@ -1717 +1768 @@
         const GtpVisibilityPreprocessor::Vector3 viewPoint = 
                 OgreTypeConverter::ConvertFromOgre(cam->getDerivedPosition());
-
-        //std::stringstream d; d << "vp: " << viewPoint;
-        //LogManager::getSingleton().logMessage(d.str());
 
         GtpVisibilityPreprocessor::ViewCell *newElementary = 
@@ -2173 +2221 @@
     }
 
-        // Prepare render queue for receiving new objects
-        //prepareRenderQueue();
-
         mDestRenderSystem->_beginGeometryCount();
     // Begin the frame
@@ -2281 +2326 @@
         ///////////////////////
         //-- put items in render queue
-        //////////
 
         getRenderQueue()->clear();
 
-        //////////////////////
-        //-- apply queries on geometry level
-
         if (!nodeVisibility)
         {
+                //////////////////
+                //-- apply queries on geometry level
+
                 MeshInfoContainer::iterator geomIt, geomIt_end = visibleGeometry.end();
 
@@ -2384 +2428 @@
         if (camera->isWindowSet())  
         {
-            const std::vector<Plane>& planeList = 
-                camera->getWindowPlanes();
-            for (ushort i = 0; i < 4; ++i)
+                        const std::vector<Plane>& planeList = camera->getWindowPlanes();
+
+            for (ushort i = 0; i < 4; ++ i)
             {
                 mDestRenderSystem->enableClipPlane(i, true);
@@ -2421 +2465 @@
 
         RenderHierarchicalCulling(fillQueue);
-        // _renderVisibleObjects();
    
     // End frame
@@ -2529 +2572 @@
 
                 if (mQueryMode == 2)
-                {
                         approximateVisibility = true;
-                }
         }
         else
@@ -2542 +2583 @@
                 new OcclusionQueriesQueryManager(mHierarchyInterface,
                                                                                  cam->getViewport(),
-                                                                                 //mCurrentViewport,
                                                                                  queryModes, 
                                                                                  itemBufferMode);