Changeset 2774 for GTP/trunk

Timestamp:

06/18/08 23:32:43 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• Bvh.cpp (modified) (1 diff)
• CHCPlusPlusTraverser.cpp (modified) (3 diffs)
• RenderTraverser.cpp (modified) (6 diffs)
• chcdemo.cpp (modified) (2 diffs)

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

@@ -765 +765 @@
 
         for (int i = node->mFirst; i <= node->mLast; ++ i)
+        {
                 numTriangles += mGeometry[i]->GetGeometry()->GetNumTriangles();
-        
+        }
+
         return numTriangles;
 }

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

@@ -97 +97 @@
                                         
                                         // 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)));
 
                                         // node was not recently tested => reset flag 
@@ -200 +201 @@
 
                 if (query->GetNodes().empty())
+                {
                         newBatchVal = 1.0f;
+                }
                 else
                 {
@@ -237 +240 @@
                 BvhNode *node = mIQueue.front();
                 mIQueue.pop();
+
                 OcclusionQuery *query = GetNextMultiQuery(mIQueue);
                 //OcclusionQuery *query = IssueOcclusionQuery(node);

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

@@ -167 +167 @@
 
 
-
-
 void RenderTraverser::SetVisibilityThreshold(int threshold)
 {
@@ -181 +179 @@
 
 
-
-
+#if 0
 OcclusionQuery *RenderTraverser::IssueOcclusionQuery(BvhNode *node, bool wasVisible)
 {
@@ -193 +190 @@
 }
 
-
-void RenderTraverser::IssueOcclusionQuery(const OcclusionQuery &query, bool wasVisible)
+#else
+
+
+OcclusionQuery *RenderTraverser::IssueOcclusionQuery(BvhNode *node, bool wasVisible)
 {
         ++ mStats.mNumIssuedQueries;
@@ -204 +203 @@
         }
 
-        query.BeginQuery();
+        OcclusionQuery *query = mQueryHandler.RequestQuery();
+
+        query->Reset();
+        query->AddNode(node);
+
+        query->BeginQuery();
 
         if (wasVisible)
@@ -213 +217 @@
         if (wasVisible && mUseOptimization)
         {
-                for (size_t i = 0; i < query.GetNodes().size(); ++ i)
-                        RenderNode(query.GetNodes()[i]);
+                RenderNode(node);
         }
         else
@@ -222 +225 @@
                         ++ mStats.mNumStateChanges;
 
+                mBvh->RenderBoundingBox(node, mRenderState);
+        }
+
+        query->EndQuery();
+
+        return query;
+}
+
+#endif
+void RenderTraverser::IssueOcclusionQuery(const OcclusionQuery &query, bool wasVisible)
+{
+        ++ mStats.mNumIssuedQueries;
+
+        if (mUseRenderQueue && (mRenderState->GetMode() == RenderState::RENDER))
+        {
+                mRenderQueue.Render();
+                mRenderQueue.Clear();
+        }
+
+        query.BeginQuery();
+
+        if (wasVisible)
+                ++ mStats.mNumPreviouslyVisibleNodeQueries;
+
+        // if this node is a previous visible leaf:
+        // leaves will be rendered anyway => we can also test with the real geometry 
+        if (wasVisible && mUseOptimization)
+        {
+                for (size_t i = 0; i < query.GetSize(); ++ i)
+                        RenderNode(query.GetNodes()[i]);
+        }
+        else
+        {
+                // change to query mode and render box
+                if (mRenderState->SetState(RenderState::QUERY))
+                        ++ mStats.mNumStateChanges;
+
                 mBvh->RenderBoundingBoxes(query.GetNodes(), mRenderState);
         }

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

@@ -897 +897 @@
 
         sprintf_s(msg5, "fps: %6.1f", fps);
-
         //cout << "previously visible node queries: " << traverser->GetStats().mNumPreviouslyVisibleNodeQueries << endl;
 
@@ -909 +908 @@
         {
                 glColor3f(1.0f, 1.0f, 1.0f);
-                
                 Output(850, 30, msg[renderMode]);