Changeset 2764 for GTP/trunk/App/Demos/Vis/CHC_revisited/CHCTraverser.cpp

Timestamp:

06/17/08 03:47:02 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1 +1 @@
 #include "CHCTraverser.h"
+#include "SceneEntity.h"
+
 
 namespace CHCDemo
@@ -17 +19 @@
 void CHCTraverser::Render()
 {
-#if 0
+        mStats.Reset();
+        mRenderState->mTexturesEnabled = false;
+        EnqueueNode(mBvh->GetRoot());
+
         QueryQueue queryQueue;
 
@@ -24 +29 @@
         {
                 while (!queryQueue.empty() && 
-                           (ResultAvailable(queryQueue.front()) || mDistanceQueue.empty()))
+                           (queryQueue.front()->ResultAvailable() || mDistanceQueue.empty()))
                 {
-                        HierarchyNode *node = queryQueue.front();
+                        OcclusionQuery *query = queryQueue.front();
                         queryQueue.pop();
                         
                         // wait until result available
-                        int visiblePixels = GetOcclusionQueryResult(node);
+                        int visiblePixels = query->GetQueryResult();
 
-                        if(visiblePixels > mVisibilityThreshold)
+                        if (visiblePixels > mVisibilityThreshold)
                         {
-                                PullUpVisibility(node);
+                                BvhNode *node = query->GetFrontNode();
+
+                                mBvh->MakeParentsVisible(node);
                                 TraverseNode(node);
                         }
                         else
                         {
-                                mNumQueryCulledNodes ++;
+                                ++ mStats.mNumQueryCulledNodes;
                         }
                 }       
@@ -46 +53 @@
                 if (!mDistanceQueue.empty())
                 {
-                        HierarchyNode *node = mDistanceQueue.top();
-
+                        BvhNode *node = mDistanceQueue.top();
                         mDistanceQueue.pop();
         
-                        mNumTraversedNodes ++;
-
-                        bool intersects;
-                        
-                        if (InsideViewFrustum(node, intersects))
+                        if (mBvh->IsWithinViewFrustum(node))
                         {
                                 // for near plane intersecting bounding box possible 
                                 // wrong results => skip occlusion query
-                                if(intersects)
+                                if (IntersectsNearPlane(node))
                                 {
                                         // update node's visited flag
-                                        node->SetLastVisited(mFrameID);
+                                        node->SetLastVisitedFrame(mFrameID);
                                         node->SetVisible(true);
-                                        PullUpVisibility(node);
+                                        mBvh->MakeParentsVisible(node);
+
                                         TraverseNode(node);
                                 }
@@ -69 +72 @@
                                 {               
                                         // identify previously visible nodes
-                                        bool wasVisible = node->Visible() && (node->LastVisited() == mFrameID - 1);
+                                        const bool wasVisible = node->IsVisible() && (node->GetLastVisitedFrame() == mFrameID - 1);
                                         
                                         // identify nodes that we cannot skip queries for
-                                        bool leafOrWasInvisible = (node->LastVisited() != mFrameID) && (!wasVisible || node->IsLeaf());
+                                        const bool leafOrWasInvisible = 
+                                                (node->GetLastVisitedFrame() != mFrameID) && (!wasVisible || node->IsVirtualLeaf());
 
                                         // reset node's visibility classification 
@@ -78 +82 @@
 
                                         // update node's visited flag
-                                        node->SetLastVisited(mFrameID);
+                                        node->SetLastVisitedFrame(mFrameID);
                                         
                                         // skip testing previously visible interior nodes
-                                        if(leafOrWasInvisible)
+                                        if (leafOrWasInvisible)
                                         {
-                                                IssueOcclusionQuery(node, wasVisible);
-                                                queryQueue.push(node);
+                                                OcclusionQuery *query = IssueOcclusionQuery(node, wasVisible);
+                                                queryQueue.push(query);
                                         }
                                         
                                         // always traverse a node if it was visible
-                                        if(wasVisible)
+                                        if (wasVisible)
                                                 TraverseNode(node);
                                 }
@@ -95 +99 @@
                         {
                                 // for stats
-                                mNumFrustumCulledNodes ++;
+                                ++ mStats.mNumFrustumCulledNodes;
                         }
                 }
         }
-#endif
 }