Changeset 2557

Timestamp:

10/22/07 16:42:43 (17 years ago)

Author:

mattausch

Message:

started with new hybrid visibility method

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgreVisibilityPredictor.h (added)
• OGRE/src/OgreOcclusionQueriesQueryManager.cpp (modified) (1 diff)
• OGRE/src/OgreVisibilityPredictor.cpp (added)
• OGRE/src/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• include/CoherentHierarchicalCullingPlusPlusManager.h (modified) (1 diff)
• src/CoherentHierarchicalCullingPlusPlusManager.cpp (modified) (8 diffs)

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

@@ -5 +5 @@
 
 #include "OgreOcclusionQueriesQueryManager.h"
-//#include "OgrePlatformHierarchyInterface.h"
 #include "OgreOcclusionCullingSceneManager.h"
 #include "VisibilityEnvironment.h"

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj

@@ -525 +525 @@
                         </File>
                         <File
+                                RelativePath="..\include\OgreVisibilityPredictor.h">
+                        </File>
+                        <File
                                 RelativePath="..\include\VisibilityMesh.h">
                         </File>
@@ -563 +566 @@
                         <File
                                 RelativePath="..\src\OgreVisibilityOptionsManager.cpp">
+                        </File>
+                        <File
+                                RelativePath=".\OgreVisibilityPredictor.cpp">
                         </File>
                         <File

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

@@ -66 +66 @@
         inline void IssueQuery(HierarchyNode *node, const bool testGeometry);
 
+        //void IssueOptimalBatches(QueryHeap &nodes);
+
 
         //////////////////////

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

@@ -52 +52 @@
                 //////////
                 //-- only wait for result if there are no nodes to process
-#if 0
-                bool resultAvailable = true;
-                while (!mQueryQueue.empty() && 
-                           (NodeInvalid(mQueryQueue.front().first) ||
-                            mQueryQueue.front().second->GetQueryResult(
-                                             visiblePixels, mHierarchyInterface->GetQueue()->empty())))
-#else
                 bool resultAvailable = false;
 
@@ -67 +60 @@
                            (resultAvailable = mQueryQueue.front().second->GetQueryResult(visiblePixels, false)))
                            )
-#endif
                 {
                         HierarchyNode *node = mQueryQueue.front().first;
@@ -75 +67 @@
                         if (NodeInvalid(node)) {mQueryQueue.pop(); continue;}
 
-                        // during the wait time issue nodes from visible queue
+                        // during the wait time we issue nodes from visible queue
                         while (1 && !mVisibleNodes.empty() && !resultAvailable)
                         {
@@ -114 +106 @@
                                 if (mVisualizeCulledNodes)
                                         mHierarchyInterface->VisualizeCulledNode(node, QUERY_CULLED);
-                                }
+                        }
                         
                         // update node's visited flag
@@ -221 +213 @@
 
         // issue rest of nodes from nodes from visible queue
-                if (0 && mHierarchyInterface->GetQueue()->empty() && mQueryQueue.empty() && !mVisibleNodes.empty())
+                if (0 && 
+                        mHierarchyInterface->GetQueue()->empty() && mQueryQueue.empty() && !mVisibleNodes.empty())
                 {
                         while (!mVisibleNodes.empty())
@@ -230 +223 @@
                 }
         }
-
-
-        if (0 && !mVisibleNodes.empty())
-        {
-                std::stringstream d;
-                d << "queries: " << (int)mQueryQueue.size() << " vis: " << (int)mVisibleNodes.size() << " inv: " << (int)mInvisibleNodes.size();
-                CullingLogManager::GetSingleton()->LogMessage(d.str());
-        }
         
-    // render rest
+    // render what is left in the render queue
         mHierarchyInterface->RenderQueue();
 
@@ -279 +264 @@
                 mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());   
         }
-
-        if (0)
-        {
-                std::stringstream d;
-                d << "tested: " << i << " nodes";
-                CullingLogManager::GetSingleton()->LogMessage(d.str());
-        }
 }
 //-----------------------------------------------------------------------
@@ -357 +335 @@
         nodes.clear();
 }
+//-----------------------------------------------------------------------
+#if 0
+void CoherentHierarchicalCullingPlusPlusManager::IssueOptimalBatches(QueryHeap &nodes)
+{
+        while (!nodes.Empty())
+        {       
+                QueryQueueEntry *entry = GetNextQueryQueueEntry();
+                entry->mIsVisibleQuery = false;
+        
+                float pFail = 1.0f; 
+                float maxBatchVal = 0.0f;
+                float newPBatch = 1.0f;
+                float newBatchVal;
                 
-}
+                // issue next query
+                while (!nodes.Empty())
+                {
+                        HierarchyNode *node = nodes.Top();
+        
+                        newPBatch *= mNodePredictor.GetProbability(node);
+
+                        if (entry->mNodes.empty())
+                                newBatchVal = 1.0f;
+                        else
+                        {
+                                const float newSize = float(entry->mNodes.size() + 1);
+                                newBatchVal = newSize / (1.0f + (1.0f - newPBatch) * newSize);
+                        }
+
+                        if (newBatchVal <= maxBatchVal)
+                                break;
+
+                        pFail = entry->mNodes.empty() ? 0.0f : (1.0f - newPBatch);
+
+                        nodes.Pop();
+                        entry->AddNode(node);
+
+                        maxBatchVal = newBatchVal;
+                }
+
+                entry->mPFail = pFail;
+
+                IssueQuery(*entry, false);
+                mQueries.push(entry);
+        }
+}
+#endif
+}