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

Timestamp:

06/18/08 17:33:16 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -2 +2 @@
 #include "RenderState.h"
 
+using namespace std;
 
 namespace CHCDemo
 {
 
-CHCPlusPlusTraverser::CHCPlusPlusTraverser() 
+
+CHCPlusPlusTraverser::CHCPlusPlusTraverser()
 {
 }
@@ -16 +18 @@
         while (!mDistanceQueue.empty() || !mQueryQueue.empty())
         {
+                bool resultAvailable;
                 while (!mQueryQueue.empty() && 
-                           (mQueryQueue.front()->ResultAvailable() || mDistanceQueue.empty()))
-                {
-                        if (mQueryQueue.front()->ResultAvailable())
-                        {
-                                OcclusionQuery *query = mQueryQueue.front();
-                                mQueryQueue.pop();
-
-                                // wait until result available
-                                int visiblePixels = query->GetQueryResult();
-
-                                if (visiblePixels > mVisibilityThreshold)
-                                {
-                                        BvhNode *node = query->GetFrontNode();
-
-                                        node->SetVisible(true);
-                                        mBvh->MakeParentsVisible(node);
-                                        TraverseNode(node);
-                                }
-                                else
-                                {
-                                        ++ mStats.mNumQueryCulledNodes;
-                                }
-                        }
-                        else if (!mVQueue.empty())
+                           (mDistanceQueue.empty() || (resultAvailable = mQueryQueue.front()->ResultAvailable())))
+                {
+                        while (!resultAvailable && !mVQueue.empty())
                         {
                                 BvhNode *node = mVQueue.front();
                                 mVQueue.pop();
-
+                                
                                 OcclusionQuery *query = IssueOcclusionQuery(node, true);
                                 mQueryQueue.push(query);
+                                resultAvailable = mQueryQueue.front()->ResultAvailable();
+                        }
+                        
+                        OcclusionQuery *query = mQueryQueue.front();
+                        mQueryQueue.pop();
+
+                        // wait until result available
+                        int visiblePixels = query->GetQueryResult();
+
+                        if (visiblePixels > mVisibilityThreshold)
+                        {
+                                BvhNode *node = query->GetFrontNode();
+
+                                node->SetVisible(true);
+                                mBvh->MakeParentsVisible(node);
+                                TraverseNode(node);
+                        }
+                        else
+                        {
+                                ++ mStats.mNumQueryCulledNodes;
                         }
                 }       
@@ -75 +77 @@
                                         
                                         // identify nodes that we cannot skip queries for
-                                        const bool testFeasible = (!wasVisible || (node->IsVirtualLeaf() /*&& (node->GetAssumedVisibleFrameId() <= mFrameId)*/));
+                                        const bool testFeasible = (!wasVisible || (node->IsVirtualLeaf() && (node->GetAssumedVisibleFrameId() <= mFrameId)));
                                                  
 
@@ -109 +111 @@
                 }
 
+                // distance queue empty: feed the remaining multiqueries to
+                // be able to proceed traversal
                 if (mDistanceQueue.empty())
                 {
-                        // issue remaining multiqueries
                         IssueMultiQueries();
                 }
+        }
+
+        // render the rest of the objects
+        if (mUseRenderQueue)
+        {
+                if (mRenderState->SetState(RenderState::RENDER))
+                        ++ mStats.mNumStateChanges;
+
+                mRenderQueue.Render();
+                mRenderQueue.Clear();
         }
 
@@ -156 +169 @@
         mIQueue.push(node);
 
-        if (mIQueue.size() > 50)
+        if (mIQueue.size() > mMaxBatchSize)
         {
                 IssueMultiQueries();