Changeset 2765 for GTP

Timestamp:

06/17/08 04:21:47 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• CHCTraverser.cpp (modified) (4 diffs)
• FrustumCullingTraverser.cpp (modified) (1 diff)
• OcclusionQuery.h (modified) (2 diffs)
• RenderTraverser.cpp (modified) (3 diffs)
• RenderTraverser.h (modified) (2 diffs)
• StopAndWaitTraverser.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (4 diffs)

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

@@ -19 +19 @@
 void CHCTraverser::Render()
 {
-        mStats.Reset();
-        mRenderState->mTexturesEnabled = false;
-        EnqueueNode(mBvh->GetRoot());
-
         QueryQueue queryQueue;
 
@@ -63 +59 @@
                                 {
                                         // update node's visited flag
-                                        node->SetLastVisitedFrame(mFrameID);
+                                        node->SetLastVisitedFrame(mFrameId);
                                         node->SetVisible(true);
                                         mBvh->MakeParentsVisible(node);
@@ -72 +68 @@
                                 {               
                                         // identify previously visible nodes
-                                        const bool wasVisible = node->IsVisible() && (node->GetLastVisitedFrame() == mFrameID - 1);
+                                        const bool wasVisible = node->IsVisible() && (node->GetLastVisitedFrame() == mFrameId - 1);
                                         
                                         // identify nodes that we cannot skip queries for
                                         const bool leafOrWasInvisible = 
-                                                (node->GetLastVisitedFrame() != mFrameID) && (!wasVisible || node->IsVirtualLeaf());
+                                                (node->GetLastVisitedFrame() != mFrameId) && (!wasVisible || node->IsVirtualLeaf());
 
                                         // reset node's visibility classification 
@@ -82 +78 @@
 
                                         // update node's visited flag
-                                        node->SetLastVisitedFrame(mFrameID);
+                                        node->SetLastVisitedFrame(mFrameId);
                                         
                                         // skip testing previously visible interior nodes

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

@@ -15 +15 @@
 void FrustumCullingTraverser::Render()
 {
-        mStats.Reset();
-        mRenderState->mTexturesEnabled = false;
-        EnqueueNode(mBvh->GetRoot());
-
         while (!mDistanceQueue.empty())
         {

GTP/trunk/App/Demos/Vis/CHC_revisited/OcclusionQuery.h

@@ -65 +65 @@
 
         QueryHandler();
+        ~QueryHandler() { DestroyQueries(); }
 
         OcclusionQuery *RequestQuery();
@@ -71 +72 @@
         */
         void ResetQueries();
+        /** Destroys all the queries.
+        */
         void DestroyQueries();
 

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

@@ -3 +3 @@
 #include "Timers.h"
 #include "Camera.h"
+#include "SceneEntity.h"
 
 
@@ -29 +30 @@
 
 
-RenderTraverser::RenderTraverser(): 
-mFrameID(1), 
+RenderTraverser::RenderTraverser():  
 mVisibilityThreshold(0),
 mBvh(NULL), 
 mIsQueryMode(false),
-mUseOptimization(true)
+mUseOptimization(true),
+mFrameId(-1)
 {
 }
@@ -42 +43 @@
 {
         mQueryHandler.DestroyQueries();
+}
+
+
+void RenderTraverser::InitFrame(Camera *camera, int currentFrameId)
+{
+        mFrameId = currentFrameId;
+        mBvh->InitFrame(camera, currentFrameId);
+
+        mStats.Reset();
+        mQueryHandler.ResetQueries();
+        mRenderState->mTexturesEnabled = false;
+        EnqueueNode(mBvh->GetRoot());
 }
 

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

@@ -84 +84 @@
         const TraversalStatistics &GetStats() const { return mStats; }
 
+        void InitFrame(Camera *camera, int currentFrameId);
+
 protected:
 
@@ -129 +131 @@
         TraversalQueue mDistanceQueue; 
         
-        int mFrameID;
+        int mFrameId;
         int mVisibilityThreshold;
 

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

@@ -23 +23 @@
 void StopAndWaitTraverser::Render()
 {
-        mStats.Reset();
-        mRenderState->mTexturesEnabled = false;
-        EnqueueNode(mBvh->GetRoot());
-
-        //cout<<"\n***** starting frame **********\n";
-        int traversed = 0;
         while (!mDistanceQueue.empty())
         {
@@ -34 +28 @@
                 mDistanceQueue.pop();
         
-                //float d = mBvh->GetDistance(node);cout << d << " ";
-
-                // interesting for the visualization, so rest and set
+                // interesting for the visualization
                 node->SetVisible(false);
 
@@ -72 +64 @@
                 {
                         ++ mStats.mNumFrustumCulledNodes;
-                }
-                //cout << "intersect: " << intersect << " bx " << node->GetBox() << endl;
+                }       
         }
-
-        mQueryHandler.ResetQueries();
-        //std::cout << "traversed: " << traversed << std::endl;
 }
 

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

@@ -308 +308 @@
         GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
         GLfloat diffuse[] = {1.0, 1.0, 1.0, 1.0};
-        //GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
         GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
             
-        //GLfloat lmodel_ambient[] = {0.5f, 0.5f, 0.5f, 1.0};
-        GLfloat lmodel_ambient[] = {0.2f, 0.2f, 0.2f, 1.0f};
+        GLfloat lmodel_ambient[] = {0.5f, 0.5f, 0.5f, 1.0f};
+        //GLfloat lmodel_ambient[] = {0.2f, 0.2f, 0.2f, 1.0f};
 
         glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
@@ -373 +372 @@
         SetupEyeView();
 
-        bvh->InitFrame(camera, currentFrame);
+
+        traverser->InitFrame(camera, currentFrame);
 
 
@@ -380 +380 @@
 
         t1 = GetTime();
-
-        traverser->SetCamera(camera);
-
-        //traverser->RenderFrustum();
 
         glEnableClientState(GL_VERTEX_ARRAY);
@@ -860 +856 @@
         CalcDecimalPoint(str2, traverser->GetStats().mNumRenderedTriangles);
 
-        sprintf_s(msg4, "rendered objects %d (of %d), rendered triangles: %s (of %s)", 
+        sprintf_s(msg4, "rendered objects %5d (of %5d), rendered triangles: %s (of %s)", 
                           traverser->GetStats().mNumRenderedGeometry, sceneEntities.size(), str.c_str(), str2.c_str());