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

Timestamp:

06/19/08 04:34:20 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -4 +4 @@
 using namespace std;
 
-namespace CHCDemo
+namespace CHCDemoEngine
 {
 
@@ -18 +18 @@
         const int visible = query->GetQueryResult() > mVisibilityThreshold;
 
-        BvhNode *node = query->GetFrontNode();
-
-        if (visible)
-        {
-                // node was previously invisible
-                if (!node->IsVisible())
-                {
-                        // reset flag
-                        node->SetTimesTestedInvisible(0);
-                        node->SetAssumedVisibleFrameId(mFrameId + mAssumedVisibleFrames);
+        // multiquery
+        if (query->GetSize() > 1)
+        {
+                // failed query: query individual nodes
+                if (visible)
+                {
+                        for (size_t i = 0; i < query->GetSize(); ++ i)
+                        {
+                                BvhNode *node = query->GetNodes()[i];
+                                OcclusionQuery *q = IssueOcclusionQuery(node, false);
+                                mQueryQueue.push(q);
+                        }
+                }
+                else // query successful: update classifications
+                {
+                        for (size_t i = 0; i < query->GetSize(); ++ i)
+                        {
+                                BvhNode *node = query->GetNodes()[i];
+                                node->IncTimesTestedInvisible();
+                                node->SetVisible(false);
+                        }
+
+                        mStats.mNumQueryCulledNodes += query->GetSize();
+                }
+        }
+        else // single query
+        {
+                BvhNode *node = query->GetFrontNode();
+
+                // failed query: query individual nodes
+                if (visible)
+                {
+                        // node was previously invisible
+                        if (!node->IsVisible())
+                        {
+                                // reset flag
+                                node->SetTimesTestedInvisible(0);
+                                node->SetAssumedVisibleFrameId(mFrameId + mAssumedVisibleFrames);
+                        }
+                        else
+                        {       // randomize first invokation
+                                node->SetAssumedVisibleFrameId(mFrameId + Random(mAssumedVisibleFrames + 1));
+                        }
+
+                        mBvh->MakeParentsVisible(node);
+                        TraverseNode(node);
                 }
                 else
-                        // randomize first invokation
-                        node->SetAssumedVisibleFrameId(mFrameId + Random(mAssumedVisibleFrames + 1));
-
-                mBvh->MakeParentsVisible(node);
-                TraverseNode(node);
-        }
-        else
-        {
-                node->IncTimesTestedInvisible();
-                ++ mStats.mNumQueryCulledNodes;
-        }
-
-        node->SetVisible(visible);
+                {
+                        node->IncTimesTestedInvisible();
+                        ++ mStats.mNumQueryCulledNodes;
+                }
+
+                node->SetVisible(visible);
+        }
 }
 
@@ -51 +81 @@
         while (!mDistanceQueue.empty() || !mQueryQueue.empty())
         {
-                bool resultAvailable;
+                bool resultAvailable = false;
                 while (!mQueryQueue.empty() && 
                            (mDistanceQueue.empty() || (resultAvailable = mQueryQueue.front()->ResultAvailable())))
@@ -119 +149 @@
                                                 }
                                         }
+                                        else
+                                        {
+                                                if (node->IsVirtualLeaf())
+                                                {
+                                                        node->SetVisible(true);
+                                                        mBvh->MakeParentsVisible(node);
+                                                } 
+                                                else // reset visibility classification
+                                                {
+                                                        node->SetVisible(false);
+                                                }
+                                        }
                                         
                                         // always traverse a node if it was previously visible
@@ -202 +244 @@
                 if (query->GetNodes().empty())
                 {
+                        // single node will anever cause a wasted query
                         newBatchVal = 1.0f;
                 }
@@ -219 +262 @@
         }
 
+        //cout <<"size: " << query->GetSize() << endl;
         IssueOcclusionQuery(*query, false);
 
@@ -227 +271 @@
 void CHCPlusPlusTraverser::IssueMultiQueries()
 {
-        if (0 && mUseRenderQueue)
-        {
-                if (mRenderState->SetState(RenderState::RENDER))
-                        ++ mStats.mNumStateChanges;
-        
-                mRenderQueue.Render();
-                mRenderQueue.Clear();
-        }
-
         while (!mIQueue.empty())
         {
-                BvhNode *node = mIQueue.front();
-                mIQueue.pop();
-
-                OcclusionQuery *query = GetNextMultiQuery(mIQueue);
-                //OcclusionQuery *query = IssueOcclusionQuery(node);
+                OcclusionQuery *query;
+
+                if (mUseMultiQueries)
+                {
+                        query = GetNextMultiQuery(mIQueue);
+                }
+                else
+                {
+                        BvhNode *node = mIQueue.front();
+                        mIQueue.pop();
+                        query = IssueOcclusionQuery(node, false);
+                }
 
                 mQueryQueue.push(query);