Changeset 3101 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneQuery.cpp

Timestamp:

11/05/08 15:14:22 (16 years ago)

Author:

mattausch

Message:

depth queries not working

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SceneQuery.cpp (modified) (10 diffs)

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

@@ -6 +6 @@
 #include "RenderTraverser.h"
 #include "FrameBufferObject.h"
+#include "RenderState.h"
 
 #include <IL/il.h>
@@ -75 +76 @@
         startil();
 
-        ILstring filename = ILstring("depth.tga");
+        ILstring filename = ILstring("sceneQuery.tga");
         ilRegisterType(IL_FLOAT);
 
@@ -100 +101 @@
 
 SceneQuery::SceneQuery(const AxisAlignedBox3 &sceneBox, 
-                                           RenderTraverser *renderer): 
-mSceneBox(sceneBox), mDepth(NULL)
+                                           RenderTraverser *renderer, RenderState *state): 
+mSceneBox(sceneBox), mDepth(NULL), mRenderState(state)
 {
         Prepare(renderer);
@@ -112 +113 @@
         const int py = (mSceneBox.Max(1) - pt.y) * (texHeight - 1) / mSceneBox.Size(1);
 
-        float d = mDepth[px + py * texHeight];
+        const float d = mDepth[px + py * texHeight];
 
         static float depth = d;
 
-        if (d > 0)
+        if (d > .0f)
         {
                 // temporal smoothing of depth values
@@ -136 +137 @@
         cout << "Preparing scene queries" << endl;
 
-        const float xlen = mSceneBox.Size().x * 0.5f;
-        const float ylen = mSceneBox.Size().y * 0.5f;
+        const float xlen = mSceneBox.Size().x * .5f;
+        const float ylen = mSceneBox.Size().y * .5f;
         
         PerspectiveCamera *orthoCam = new PerspectiveCamera(xlen / ylen);
@@ -165 +166 @@
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
+        // hack: disable cull face because of alpha textured balconies
         glDisable(GL_CULL_FACE);
-        glEnable(GL_DEPTH_TEST);
+        mRenderState->LockCullFaceEnabled(true);
+
+        //glDisable(GL_CULL_FACE);
+        //glEnable(GL_DEPTH_TEST);
 
         glMatrixMode(GL_MODELVIEW);
@@ -177 +182 @@
 
         glOrtho(xlen, -xlen, ylen, -ylen, 0.0f, mSceneBox.Size().z); 
+        //glOrtho(xlen, .0f, ylen, .0f, .0f, mSceneBox.Size().z); 
 
         glMatrixMode(GL_MODELVIEW);
@@ -190 +196 @@
         glEnableClientState(GL_NORMAL_ARRAY);
 
+        // forward rendering
+        mRenderState->SetRenderTechnique(0);
+
         renderer->RenderScene();
 
@@ -197 +206 @@
         renderer->SetCamera(oldCam);
         
-
-        glEnable(GL_CULL_FACE);
+        mRenderState->LockCullFaceEnabled(false);
+        //glEnable(GL_CULL_FACE);
 
         glMatrixMode(GL_MODELVIEW);
@@ -211 +220 @@
 
         GrabDepthBuffer(mDepth, fbo->GetDepthTex());
-        //ExportDepthBuffer(mDepth); PrintGLerror("grab");
+        ExportDepthBuffer(mDepth); PrintGLerror("grab depth");
 
         DEL_PTR(fbo);