Changeset 2788 for GTP/trunk

Timestamp:

06/20/08 06:15:17 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• RenderTraverser.cpp (modified) (1 diff)
• Visualization.cpp (modified) (6 diffs)
• Visualization.h (modified) (1 diff)
• chcdemo.cpp (modified) (12 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderTraverser.cpp

@@ -222 +222 @@
         if (mUseRenderQueue && (mRenderState->GetMode() == RenderState::RENDER))
         {
-                //cout << "render queue: " << mRenderQueue.GetSize() << endl;
+                //Debug << "render queue: " << mRenderQueue.GetSize() << endl;
                 mRenderQueue.Render();
                 mRenderQueue.Clear();

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Visualization.cpp

@@ -14 +14 @@
 namespace CHCDemoEngine
 {
+
+        GLUquadric *mSphere;
 
 /******************************************************/
@@ -30 +32 @@
 mFrameId(0)
 {
+        mSphere = (GLUquadric *)gluNewQuadric();
 }
 
@@ -56 +59 @@
         tStack.push(mBvh->GetRoot());
 
+        glDisable(GL_LIGHTING);
+        
+        RenderViewPoint();
+        RenderFrustum();
+        RenderBox(mBvh->GetBox());
+
+        glEnable(GL_LIGHTING);
+
         glEnableClientState(GL_VERTEX_ARRAY);
         glEnableClientState(GL_NORMAL_ARRAY);
-
-        RenderFrustum();
 
         while (!tStack.empty())
@@ -146 +155 @@
 
         glEnable(GL_CULL_FACE);
-
         glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 }
@@ -153 +161 @@
 void Visualization::RenderFrustum()
 {
+        glColor3f(1.0f, 0.0f, 0.0f);
+
         Vector3 ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr;
         mCamera->ComputePoints(ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr);
@@ -202 +212 @@
 
 
-}
+
+void Visualization::RenderViewPoint()
+{
+        glPushMatrix();
+        Vector3 pos = mCamera->GetPosition();
+        pos.z += 100;
+        glTranslatef(pos.x, pos.y, pos.z);
+        
+        glScalef(5.0f, 5.0f, 5.0f);
+        glPushAttrib(GL_CURRENT_BIT);
+
+        glColor3f(1.0f, 0.0f, 0.0f);
+        
+        gluSphere((::GLUquadric *)mSphere,
+                2e-3f * Magnitude(mBvh->GetBox().Size()), 6, 6);
+
+        glPopAttrib();
+        glPopMatrix();
+}
+
+}

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Visualization.h

@@ -52 +52 @@
         void RenderBox(const AxisAlignedBox3 &box);
 
+        void RenderViewPoint();
 
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -57 +57 @@
 float winAspectRatio = 1.0f;
 
-float visZoomFactor = 1.5f;
-
 double accumulatedTime = 1000;
 float fps = 1e3f;
@@ -137 +135 @@
 
 
-        camera = new Camera(winWidth, winHeight);
+        camera = new Camera(winWidth, winHeight, 60);
         camera->SetNear(nearDist);
 
@@ -267 +265 @@
                 "'V'            - shows/hides bounding volumes",
                 "",
-                "'1'            - shows/hides visualization",
-                "'2'            - zooms out visualization",
-                "'3'            - zooms in visualization",
+                "'1'            - shows/hides bird eye view",
                 0,
         };
@@ -480 +476 @@
                 visMode = !visMode;
                 break;
-        case '2':
-                visZoomFactor += 0.1;   
-                break;
-        case '3':
-                visZoomFactor -= 0.1;
-                if (visZoomFactor < 0.1) visZoomFactor = 0.1;
-                break;
         case '8':
                 {
@@ -630 +619 @@
 
         gluPerspective(60.0f, 1.0f / winAspectRatio, nearDist, 2.0f * Magnitude(bvh->GetBox().Diagonal()));
+
         glMatrixMode(GL_MODELVIEW);
 
@@ -817 +807 @@
         glColor4f(0.0,0.0,0.0,0.5); 
 
-        glRecti(winWidth, 0, winWidth / 2, winHeight / 2);
+        glRecti(winWidth, 0, winWidth - winWidth / 4, winHeight / 3);
         glDisable(GL_BLEND);
         end2D();
-
-        glViewport(winWidth / 2, winHeight / 2, winWidth, winHeight);
+        
+        glViewport(winWidth - winWidth / 4, winHeight - winHeight / 3, winWidth, winHeight);
+
+
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        
+        //gluPerspective(60.0f, 1.0f / winAspectRatio, nearDist, 2.0f * Magnitude(bvh->GetBox().Diagonal()));
+        AxisAlignedBox3 box = bvh->GetBox();
+        const float offs = 2000;
+        glOrtho(box.Min().y - offs, box.Max().y + offs, box.Min().y - offs, box.Max().y + offs, 0.1, 20.0f * Magnitude(bvh->GetBox().Diagonal())); 
+        
+        
         glPushMatrix();
-        //glMatrixMode(GL_PROJECTION);
+
         glMatrixMode(GL_MODELVIEW);
         glLoadIdentity();
 
-        Vector3 pos(camera->GetPosition());
-    pos.z = 10.0f * bvh->GetBox().Size().z;
-        pos.y = 800;
-        pos.x += 1000;
-
-        Matrix4x4 m = RotationZMatrix(-rotation);
-        Matrix4x4 t = TranslationMatrix(pos);
-        Matrix4x4 minust = TranslationMatrix(-pos);
-
         glMultMatrixf((float *)visView.x);
 
-        glMultMatrixf((float *)t.x);
-        glMultMatrixf((float *)m.x);
-        glMultMatrixf((float *)minust.x);
+        //SetupLighting();
+        GLfloat position[] = {0.8f, 1.0f, 1.5f, 0.0f};
+        glLightfv(GL_LIGHT0, GL_POSITION, position);
+
+        GLfloat position1[] = {bvh->GetBox().Center().x, bvh->GetBox().Max().y, bvh->GetBox().Center().z, 1.0f};
+        glLightfv(GL_LIGHT1, GL_POSITION, position1);
+
+
 
         glClear(GL_DEPTH_BUFFER_BIT);
@@ -847 +844 @@
         //-- visualization of the occlusion culling
 
-        //traverser->RenderScene();
         visualization->Render();
         
@@ -856 +852 @@
 
 
-/** Sets up view matrix in order to get a good position 
-        for viewing the kd tree node culling
+/** Sets up view matrix for bird eye view
 */
 void setupVisView()
 {
-        Vector3 pos(-camera->GetPosition());
-    pos.z = -10.0f * bvh->GetBox().Size().z;
-        pos.y += 800;
-        pos.x -= 1000;
+        Vector3 pos(-bvh->GetBox().Center());
+ 
+        pos.z = -15.0f * bvh->GetBox().Size().z;
+        pos.y += 1400;
+        pos.x -= 1170;
 
         Vector3 dir(0, 0, 1);
         Vector3 up(0, 1, 0);
-        //Vector3 up(camera->GetDirection());up.y = 0;
 
         Vector3 left = Normalize(CrossProd(dir, up));
@@ -879 +874 @@
         visView.x[3][1] = pos.y;
         visView.x[3][2] = pos.z;
+
+        //cout << visView<< endl;
 }
 
@@ -929 +926 @@
         char msg4[200];
         char msg5[200];
+        char msg6[200];
 
 
@@ -965 +963 @@
                           renderedNodes, bvh->GetNumVirtualNodes(), str.c_str(), str2.c_str()); 
 
-        sprintf_s(msg4, "traversed: %5d, frustum culled: %5d, query culled: %5d, issued queries: %5d, state changes: %5d",
-                          traversedNodes, frustumCulledNodes, queryCulledNodes, issuedQueries, stateChanges);
-
-        sprintf_s(msg5, "fps: %6.1f", fps);
+        sprintf_s(msg4, "traversed: %5d, frustum culled: %5d, query culled: %5d",
+                          traversedNodes, frustumCulledNodes, queryCulledNodes);
+
+        sprintf_s(msg5, "issued queries: %5d, state changes: %5d", issuedQueries, stateChanges);
+
+        sprintf_s(msg6, "fps: %6.1f", fps);
         //cout << "previously visible node queries: " << traverser->GetStats().mNumPreviouslyVisibleNodeQueries << endl;
 
@@ -988 +988 @@
                         Output(20, 90, msg4);
                         Output(20, 120, msg5);
+                        Output(20, 150, msg6);
                 }
         }