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

Timestamp:

06/18/08 14:38:45 (16 years ago)

Author:

mattausch

Message:

chc++ still problems

File:

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

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

@@ -1 +1 @@
 #include "CHCPlusPlusTraverser.h"
+#include "RenderState.h"
+
 
 namespace CHCDemo
@@ -17 +19 @@
                            (mQueryQueue.front()->ResultAvailable() || mDistanceQueue.empty()))
                 {
-                        OcclusionQuery *query = mQueryQueue.front();
-                        mQueryQueue.pop();
-                        
-                        // wait until result available
-                        int visiblePixels = query->GetQueryResult();
+                        if (mQueryQueue.front()->ResultAvailable())
+                        {
+                                OcclusionQuery *query = mQueryQueue.front();
+                                mQueryQueue.pop();
 
-                        if (visiblePixels > mVisibilityThreshold)
+                                // 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())
                         {
-                                BvhNode *node = query->GetFrontNode();
+                                BvhNode *node = mVQueue.front();
+                                mVQueue.pop();
 
-                                mBvh->MakeParentsVisible(node);
-                                TraverseNode(node);
-                        }
-                        else
-                        {
-                                ++ mStats.mNumQueryCulledNodes;
+                                OcclusionQuery *query = IssueOcclusionQuery(node, true);
+                                mQueryQueue.push(query);
                         }
                 }       
@@ -61 +75 @@
                                         
                                         // identify nodes that we cannot skip queries for
-                                        const bool leafOrWasInvisible = 
-                                                (node->GetLastVisitedFrame() != mFrameId) && (!wasVisible || node->IsVirtualLeaf());
-
-                                        // reset node's visibility classification 
-                                        node->SetVisible(false);
+                                        const bool testFeasible = (!wasVisible || (node->IsVirtualLeaf() /*&& (node->GetAssumedVisibleFrameId() <= mFrameId)*/));
+                                                 
 
                                         // update node's visited flag
@@ -71 +82 @@
                                         
                                         // skip testing previously visible interior nodes
-                                        if (leafOrWasInvisible)
+                                        if (testFeasible)
                                         {
-                                                OcclusionQuery *query = IssueOcclusionQuery(node, wasVisible);
-                                                mQueryQueue.push(query);
+                                                // reset node's visibility classification 
+                                                node->SetVisible(false);
+
+                                                if (!wasVisible)
+                                                {
+                                                        QueryPreviouslyInvisibleNodes(node);
+                                                }
+                                                else
+                                                {
+                                                        mVQueue.push(node);
+                                                }
                                         }
                                         
-                                        // always traverse a node if it was visible
+                                        // always traverse a node if it was previously visible
                                         if (wasVisible)
                                                 TraverseNode(node);
@@ -88 +108 @@
                         }
                 }
+
+                if (mDistanceQueue.empty())
+                {
+                        // issue remaining multiqueries
+                        IssueMultiQueries();
+                }
+        }
+
+        //////////////
+        //-- issue remaining previously visible node queries
+
+        while (!mVQueue.empty())
+        {
+                BvhNode *node = mVQueue.front();
+                mVQueue.pop();
+
+                OcclusionQuery *query = IssueOcclusionQuery(node, true);
+                mQueryQueue.push(query);
+        }
+
+        while (!mQueryQueue.empty())
+        {
+                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);
+                }
+                else
+                {
+                        ++ mStats.mNumQueryCulledNodes;
+                }
         }
 }
 
+
+
+void CHCPlusPlusTraverser::QueryPreviouslyInvisibleNodes(BvhNode *node)
+{
+        mIQueue.push(node);
+
+        if (mIQueue.size() > 50)
+        {
+                IssueMultiQueries();
+        }
 }
+
+
+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 = IssueOcclusionQuery(node, false);
+                mQueryQueue.push(query);
+        }
+}
+
+
+}