Changeset 2773 for GTP/trunk/App/Demos/Vis/CHC_revisited/CHCPlusPlusTraverser.cpp

Timestamp:

06/18/08 20:42:06 (16 years ago)

Author:

mattausch

Message:

implemented multiqueries, but still buggy version

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/CHCPlusPlusTraverser.cpp (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/CHC_revisited/CHCPlusPlusTraverser.cpp

@@ -16 +16 @@
 {
         // wait until result available
-        int visiblePixels = query->GetQueryResult();
-
-        int visible = visiblePixels > mVisibilityThreshold;
+        const int visible = query->GetQueryResult() > mVisibilityThreshold;
 
         BvhNode *node = query->GetFrontNode();
@@ -26 +24 @@
                 // node was previously invisible
                 if (!node->IsVisible())
+                {
+                        // reset flag
+                        node->SetTimesTestedInvisible(0);
                         node->SetAssumedVisibleFrameId(mFrameId + mAssumedVisibleFrames);
+                }
                 else
                         // randomize first invokation
@@ -36 +38 @@
         else
         {
+                node->IncTimesTestedInvisible();
                 ++ mStats.mNumQueryCulledNodes;
         }
@@ -58 +61 @@
                                 
                                 OcclusionQuery *query = IssueOcclusionQuery(node, true);
+
                                 mQueryQueue.push(query);
                                 resultAvailable = mQueryQueue.front()->ResultAvailable();
@@ -94 +98 @@
                                         // identify nodes that we cannot skip queries for
                                         const bool testFeasible = (!wasVisible || (node->IsVirtualLeaf() && (node->GetAssumedVisibleFrameId() <= mFrameId)));
+
+                                        // node was not recently tested => reset flag 
+                                        if (node->GetLastVisitedFrame() != mFrameId - 1)
+                                                node->SetTimesTestedInvisible(0);
 
                                         // update node's visited flag
@@ -176 +184 @@
 
 
+OcclusionQuery * CHCPlusPlusTraverser::GetNextMultiQuery(BvhNodeQueue &iqueue)
+{
+        OcclusionQuery *query = mQueryHandler.RequestQuery();
+
+        float pFail = 1.0f; 
+        float maxBatchVal = 0.0f;
+        float newPBatch = 1.0f;
+        float newBatchVal;
+
+        // issue next query
+        while (!iqueue.empty())
+        {
+                BvhNode *node = iqueue.front();
+                newPBatch *= mVisibilityPredictor.GetProbability(node);
+
+                if (query->GetNodes().empty())
+                        newBatchVal = 1.0f;
+                else
+                {
+                        int newSize = query->GetSize() + 1;
+                        newBatchVal = newSize / (1.0f + (1.0f - newPBatch) * newSize);
+                }
+
+                if (newBatchVal <= maxBatchVal)
+                        break;
+
+                iqueue.pop();
+                query->AddNode(node);
+
+                maxBatchVal = newBatchVal;
+        }
+
+        IssueOcclusionQuery(*query, false);
+
+        return query;
+}
+
+
 void CHCPlusPlusTraverser::IssueMultiQueries()
 {
@@ -191 +237 @@
                 BvhNode *node = mIQueue.front();
                 mIQueue.pop();
-
-                OcclusionQuery *query = IssueOcclusionQuery(node, false);
+                OcclusionQuery *query = GetNextMultiQuery(mIQueue);
+                //OcclusionQuery *query = IssueOcclusionQuery(node);
+
                 mQueryQueue.push(query);
         }