Changeset 2763 for GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp

Timestamp:

06/16/08 08:56:35 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/RenderTraverser.cpp (modified) (2 diffs)

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

@@ -100 +100 @@
 
 
+
+void RenderTraverser::Switch2GLRenderState()
+{
+        // boolean used to avoid unnecessary state changes
+        if (mIsQueryMode)
+        {
+                // switch back to rendermode            
+                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+                glDepthMask(GL_TRUE);
+                glEnable(GL_LIGHTING);
+                mIsQueryMode = false;
+        }
+}
+
+
+OcclusionQuery *RenderTraverser::IssueOcclusionQuery(BvhNode *node, bool wasVisible)
+{
+        OcclusionQuery *query = mQueryHandler.RequestQuery();
+
+        query->BeginQuery();
+        
+        // if leaf and was visible => will be rendered anyway, thus we
+        // can also test with the real geometry 
+        /*if(node->IsLeaf() && wasVisible && mUseOptimization)
+        {
+                mNumRenderedGeometry += node->Render();
+        }
+        else
+        {*/
+
+        // change state so the bounding box gets not actually rendered on the screen
+        //Switch2GLQueryState();
+        mBvh->RenderBoundingBox(node);
+        //Switch2GLRenderState();
+
+        query->EndQuery();
+
+        return query;
+}
+
+
+void RenderTraverser::Switch2GLQueryState()
+{       
+        // boolean used to avoid unnecessary state changes
+        if (!mIsQueryMode)
+        {
+                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+                glDepthMask(GL_FALSE);
+                glDisable(GL_LIGHTING);
+                mIsQueryMode = true;
+        }
+}
+
+
+
 #if 0
 
@@ -160 +215 @@
 }
 
-
-unsigned int RenderTraverser::GetOcclusionQueryResult(HierarchyNode *node) const
-{
-        unsigned int result;
-
-        if (mUseArbQueries)
-        {
-                glGetQueryObjectuivARB(node->GetOcclusionQuery(), GL_QUERY_RESULT_ARB, &result);
-        }
-        else
-        {
-                glGetOcclusionQueryuivNV(node->GetOcclusionQuery(), GL_PIXEL_COUNT_NV, &result);
-        }
-
-        return result;
-}
-
-
-void RenderTraverser::Switch2GLQueryState()
-{       
-        // boolean used to avoid unnecessary state changes
-        if(!mIsQueryMode)
-        {
-                glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-                glDepthMask(GL_FALSE);
-                glDisable(GL_LIGHTING);
-                mIsQueryMode = true;
-        }
-}
-
-
-void RenderTraverser::Switch2GLRenderState()
-{
-        // boolean used to avoid unnecessary state changes
-        if(mIsQueryMode)
-        {
-                // switch back to rendermode            
-                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-                glDepthMask(GL_TRUE);
-                glEnable(GL_LIGHTING);
-                mIsQueryMode = false;
-        }
-}
-
-void RenderTraverser::IssueOcclusionQuery(HierarchyNode *node, const bool wasVisible)
-{
-        // get next available test id
-        unsigned int occlusionQuery = mOcclusionQueries[mCurrentQueryIdx ++];
-        
-        node->SetOcclusionQuery(occlusionQuery);
-
-        // do the actual occlusion query for this node
-        if (mUseArbQueries)
-        {
-                glBeginQueryARB(GL_SAMPLES_PASSED_ARB, occlusionQuery);
-        }
-        else
-        {
-                glBeginOcclusionQueryNV(occlusionQuery);
-        }
-        
-        // if leaf and was visible => will be rendered anyway, thus we
-        // can also test with the real geometry 
-        if(node->IsLeaf() && wasVisible && mUseOptimization)
-        {
-                mNumRenderedGeometry += node->Render();
-        }
-        else
-        {
-                // change state so the bounding box gets not actually rendered on the screen
-                Switch2GLQueryState();
-                node->RenderBoundingVolume();
-                Switch2GLRenderState();
-        }
-
-        if (mUseArbQueries)
-        {
-                glEndQueryARB(GL_SAMPLES_PASSED_ARB);
-        }
-        else
-        {
-                glEndOcclusionQueryNV();
-        }
-}
 
 void RenderTraverser::Preprocess()