Changeset 2808 for GTP/trunk

Timestamp:

06/29/08 23:48:17 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (4 diffs)
• src/RenderTexture.cpp (added)
• src/RenderTexture.h (added)
• src/SceneQuery.cpp (modified) (4 diffs)
• src/SceneQuery.h (modified) (2 diffs)
• src/chcdemo.cpp (modified) (6 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -41 +41 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include"
+                                AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include;"$(CG_INC_PATH)""
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
                                 MinimalRebuild="true"
@@ -63 +63 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="glut32.lib glew32s.lib glew32.lib DevIL.lib ILUT.lib zlib.lib"
+                                AdditionalDependencies="glut32.lib glew32s.lib glew32.lib DevIL.lib ILUT.lib zlib.lib cg.lib cgGL.lib"
                                 LinkIncremental="2"
-                                AdditionalLibraryDirectories="libs/GL;libs/Devil/lib;libs/Zlib/lib"
+                                AdditionalLibraryDirectories="libs/GL;libs/Devil/lib;libs/Zlib/lib;&quot;$(CG_LIB_PATH)&quot;"
+                                IgnoreDefaultLibraryNames="LIBCMT"
                                 GenerateDebugInformation="true"
                                 SubSystem="1"
@@ -126 +127 @@
                                 OmitFramePointers="true"
                                 EnableFiberSafeOptimizations="true"
-                                AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include"
+                                AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include;&quot;$(CG_INC_PATH)&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE; _CRT_SECURE_NO_WARNINGS"
                                 StringPooling="true"
@@ -243 +244 @@
                         </File>
                         <File
+                                RelativePath=".\src\RenderTexture.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath=".\src\RenderTexture.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\SceneQuery.cpp"
                                 >

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

@@ -7 +7 @@
 #include <IL/il.h>
 #include <assert.h>
+#include "RenderTexture.h"
+
+
+using namespace std;
+
+int texWidth = 2048;
+int texHeight = 2048;
+
+/*static void cgErrorCallback()
+{
+        CGerror lastError = cgGetError();
+
+        if(lastError)
+        {
+                printf("%s\n\n", cgGetErrorString(lastError));
+                printf("%s\n", cgGetLastListing(sCgContext));
+                printf("Cg error, exiting...\n");
+
+                exit(0);
+        }
+}*/
+
+
+static void PrintGLerror(char *msg)
+{
+        GLenum errCode;
+        const GLubyte *errStr;
+        
+        if ((errCode = glGetError()) != GL_NO_ERROR) 
+        {
+                errStr = gluErrorString(errCode);
+                fprintf(stderr,"OpenGL ERROR: %s: %s\n", errStr, msg);
+        }
+}
 
 
@@ -26 +60 @@
 {
 
-using namespace std;
-
-
-//const static int viewport[4] = {0, 0, 512, 512};
-const static int viewport[4] = {0, 0, 1024, 768};
-//const static int viewport[4] = {0, 0, 2048, 2048};
-
-
-
-SceneQuery::SceneQuery(const AxisAlignedBox3 &sceneBox, RenderTraverser *renderer): 
-mSceneBox(sceneBox), mDepth(NULL)
-{
-        Prepare(renderer);
-}
-
-
-bool SceneQuery::CalcIntersection(Vector3 &pt)
-{
-        int px = (pt.x - mSceneBox.Min(0)) * (viewport[2] - 1) / mSceneBox.Size(0);
-        int py = (pt.y - mSceneBox.Min(1)) * (viewport[3] - 1) / mSceneBox.Size(1);
-
-        unsigned char d = mDepth[px + py * viewport[2]];
-
-        const float offs = mSceneBox.Size(2) * 1e-1f;
-
-        static float depth = (float)d;
-
-        if (d > 0)
-        {
-                const float x = 0.1f;
-                depth = depth * x + d * (1.0f - x);
-                pt.z =  mSceneBox.Max().z - mSceneBox.Size().z * depth / 255.0f + offs;
-                //cout << "new depth " << pt.z << " (" << d << ")" << endl;
-
-                return true;
-        }
-        //cout << "invalid depth: " << d << endl;
-
-        return false;
-}
-
-
-void SceneQuery::Prepare(RenderTraverser *renderer)
-{
-        cout << "Preparing scene queries" << endl;
-
-        const float xlen = mSceneBox.Size().x * 0.5f;
-        const float ylen = mSceneBox.Size().y * 0.5f;
-        
-        Camera *orthoCam = new Camera(xlen, ylen);
-        orthoCam->SetOrtho(true);
-
-        orthoCam->SetNear(0.0f);
-        orthoCam->Yaw(M_PI * 0.5f);
-
-        Vector3 pos = Vector3(mSceneBox.Center().x, mSceneBox.Center().y, mSceneBox.Max().z);
-        orthoCam->SetPosition(pos);
-
-        //glPixelStorei(GL_PACK_ROW_LENGTH, viewport[2]);
-        glPixelStorei(GL_PACK_ALIGNMENT, 1);
-        glReadBuffer(GL_BACK);
-
-        // hack: should create offscreen buffer for this
-        glViewport(0, 0, viewport[2], viewport[3]);
-
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        
-        glOrtho(-xlen, xlen, -ylen, ylen, 0.0f, mSceneBox.Size().z); 
-        
-        glMatrixMode(GL_MODELVIEW);
-        
-        orthoCam->SetupCameraView();
-
-        glClear(GL_DEPTH_BUFFER_BIT);
-
-        mDepth = new unsigned char[viewport[2] * viewport[3]];
-        //mDepth = new float[viewport[2] * viewport[3]];
-
-        //renderer->SetCamera(orthoCam);
-
-        renderer->RenderScene();
-
-        glReadPixels(0, 0, viewport[2], viewport[3], GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, mDepth);
-        //glReadPixels(0, 0, viewport[2], viewport[3], GL_DEPTH_COMPONENT, GL_FLOAT, mDepth);
-/*
+
+void GrabDepthBuffer(float *data, RenderTexture *rt)
+{
+        rt->BindDepth();
+        rt->EnableTextureTarget();
+
+        const int texFormat = GL_DEPTH_COMPONENT;
+        glGetTexImage(rt->GetTextureTarget(), 0, texFormat, GL_FLOAT, data);
+
+        rt->DisableTextureTarget();
+}
+
+
+void ExportDepthBuffer(float *data)
+{
         startil();
 
-        if (!ilTexImage(viewport[2], viewport[3], 1, 1, IL_LUMINANCE, IL_UNSIGNED_BYTE, mDepth))
+        ILstring filename = ILstring("depth.tga");
+        ilRegisterType(IL_FLOAT);
+
+        const int depth = 1;
+        const int bpp = 1;
+
+        if (!ilTexImage(texWidth, texHeight, depth, bpp, IL_LUMINANCE, IL_FLOAT, data))
         {
                 cerr << "IL error " << ilGetError() << endl;
@@ -121 +90 @@
         }
 
-        ILstring writename = ILstring("out.tga");
-
-        ilSetInteger(IL_TGA_RLE, 1);
-        if (!ilSaveImage(writename))
+        if (!ilSaveImage(filename))
         {
                 cerr << "TGA write error " << ilGetError() << endl;
@@ -130 +96 @@
 
         stopil();
-*/
+
+        cout << "exported depth buffer" << endl;
+}
+
+
+SceneQuery::SceneQuery(const AxisAlignedBox3 &sceneBox, RenderTraverser *renderer): 
+mSceneBox(sceneBox), mDepth(NULL)
+{
+        Prepare(renderer);
+}
+
+
+bool SceneQuery::CalcIntersection(Vector3 &pt)
+{
+        const int px = (pt.x - mSceneBox.Min(0)) * (texWidth - 1) / mSceneBox.Size(0);
+        const int py = (pt.y - mSceneBox.Min(1)) * (texHeight - 1) / mSceneBox.Size(1);
+
+        float d = mDepth[px + py * texHeight];
+
+        static float depth = d;
+
+        if (d > 0)
+        {
+                // temporal smoothing of depth values
+                const float x = 0.5f;
+                depth = d * x + depth * (1.0f - x);
+
+                const float offs = mSceneBox.Size(2) * 5e-2f;
+                pt.z =  mSceneBox.Max().z - mSceneBox.Size().z * depth + offs;
+
+                return true;
+        }
+
+        return false;
+}
+
+
+void SceneQuery::Prepare(RenderTraverser *renderer)
+{
+        cout << "Preparing scene queries" << endl;
+
+        RenderTexture *depthTexture = new RenderTexture(texWidth, texHeight, true, true);
+
+#ifdef ATI
+        depthTexture->Initialize(true, true, false, false, false, 8, 8, 8, 8, RenderTexture::RT_COPY_TO_TEXTURE);
+#else
+        depthTexture->Initialize(true, true, false, false, false, 8, 8, 8, 8);//, RenderTexture::RT_COPY_TO_TEXTURE);
+#endif
+
+        PrintGLerror("Init");
+
+
+        const float xlen = mSceneBox.Size().x * 0.5f;
+        const float ylen = mSceneBox.Size().y * 0.5f;
+        
+        Camera *orthoCam = new Camera(xlen, ylen);
+        orthoCam->SetOrtho(true);
+
+        orthoCam->SetNear(0.0f);
+        orthoCam->Yaw(M_PI * 0.5f);
+
+        Vector3 pos = Vector3(mSceneBox.Center().x, mSceneBox.Center().y, mSceneBox.Max().z);
+        orthoCam->SetPosition(pos);
+
+        depthTexture->BeginCapture();
+
+        glViewport(0, 0, texWidth, texHeight);
+
+        glClearColor(1, 1, 1, 1);
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        glFrontFace(GL_CCW);
+        glCullFace(GL_BACK);
+
+        glDisable(GL_CULL_FACE);
+        //glEnable(GL_CULL_FACE);
+
+        glShadeModel(GL_FLAT);
+        glEnable(GL_DEPTH_TEST);
+
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+        
+        glOrtho(-xlen, xlen, -ylen, ylen, 0.0f, mSceneBox.Size().z); 
+        
+        glMatrixMode(GL_MODELVIEW);
+        
+        orthoCam->SetupCameraView();
+
+        mDepth = new float[texHeight * texWidth];
+
+        //renderer->SetCamera(orthoCam);
+        renderer->RenderScene();
+
+        depthTexture->EndCapture();
+
+        GrabDepthBuffer(mDepth, depthTexture);
+        //ExportDepthBuffer(mDepth);
+        //PrintGLerror("grab");
+
+        DEL_PTR(depthTexture);
         DEL_PTR(orthoCam);
 }
 
-}
+
+
+
+}

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

@@ -10 +10 @@
 
 class RenderTraverser;
-
 
 /** A simple class that computes the first intersection of a horizontal ray with
@@ -33 +32 @@
         void Prepare(RenderTraverser *traverser);
 
-
         ///////////
 
         AxisAlignedBox3 mSceneBox;
 
-        unsigned char *mDepth;
+        //unsigned char *mDepth;
+        float *mDepth;
 };
 

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

@@ -23 +23 @@
 #include "SceneQuery.h"
 #include "RenderQueue.h"
+#include <Cg/cg.h>
+#include <Cg/cgGL.h>
 
 
@@ -156 +158 @@
 
 
+// cg stuff
+static CGcontext sCgContext = NULL;
+static CGprogram sCgDepthPeelingProgram = NULL;
+static CGprogram sCgPassThroughProgram = NULL;
+
+static CGprofile sCgFragmentProfile;
+static CGparameter sTextureParam;
+static CGparameter sTexWidthParam; 
+static CGparameter sStepSizeParam;
+
+
 
 int main(int argc, char* argv[])
@@ -306 +319 @@
                 "'F3'           - shows/hides bounds (boxes or tight bounds)",
                 "'F4'           - shows/hides statistics",
-                "'F5',          - toggles between fly / walkmode",
-                "'F6',          - shows/hides parameters",
+                "'F5',          - shows/hides parameters",
+                "'F6',          - toggles between fly / walkmode",
                 "'F7',          - depth pass",
                 "'F8',          - enable/disable glFinish for more accurate timings",
@@ -1090 +1103 @@
 void DisplayStats()
 {
-        char *msg[] = {"Frustum Culling", "Stop and Wait",
-                                    "CHC", "CHC ++"};
-
-        char msg2[400];
-        char msg3[200];
-        char msg4[200];
-        char msg5[200];
-        char msg6[200];
-        char msg7[200];
-        char msg8[200];
-
+        static char msg[7][300];
 
         static double renderTime = algTime;
-        const float expFactor = 0.3f;
-
-        //if (useRenderQueue) cout << "rq overhead: " << 1e6f * rqTimer.TotalTime() << " ms" << endl;
+        const float expFactor = 0.5f;
 
         // if some strange render time spike happened in this frame => don't count
-        if (algTime < 1000) renderTime = algTime * expFactor + (1.0f - expFactor) * algTime;
-        //renderTime = 1e3f * (elapsedTime * expFactor + (1.0f - expFactor) * elapsedTime);
+        if (algTime < 500) renderTime = algTime * expFactor + (1.0f - expFactor) * algTime;
 
         accumulatedTime += elapsedTime * 1e3f;
@@ -1130 +1130 @@
         }
 
-        sprintf(msg2, "assumed visible frames: %4d, max batch size: %4d", 
-                      assumedVisibleFrames, maxBatchSize);
-
-        sprintf(msg3, "multiqueries: %d, tight bounds: %d, render queue: %d, depth pass: %d, glFinish: %d", 
-                      useMultiQueries, useTightBounds, useRenderQueue, depthPass, useGlFinish);
-
         string str;
         string str2;
 
+        int i = 0;
+
         CalcDecimalPoint(str, renderedTriangles);
         CalcDecimalPoint(str2, bvh->GetBvhStats().mTriangles);
 
-        sprintf(msg4, "rendered nodes: %6d (of %6d), rendered triangles: %s (of %s)", 
-                          renderedNodes, bvh->GetNumVirtualNodes(), str.c_str(), str2.c_str()); 
-
-        sprintf(msg5, "traversed: %5d, frustum culled: %5d, query culled: %5d",
-                          traversedNodes, frustumCulledNodes, queryCulledNodes);
-
-        sprintf(msg6, "issued queries: %5d, state changes: %5d, render batches: %5d", issuedQueries, stateChanges, numBatches);
-
-        sprintf(msg8, "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);
-
-        sprintf(msg7, "fps: %6.1f", fps);
+        sprintf(msg[i ++], "rendered nodes: %6d (of %6d), rendered triangles: %s (of %s)", 
+                        renderedNodes, bvh->GetNumVirtualNodes(), str.c_str(), str2.c_str()); 
+
+        sprintf(msg[i ++], "traversed: %5d, frustum culled: %5d, query culled: %5d",
+                        traversedNodes, frustumCulledNodes, queryCulledNodes);
+
+        sprintf(msg[i ++], "issued queries: %5d, state changes: %5d, render batches: %5d", 
+                    issuedQueries, stateChanges, numBatches);
+
+        sprintf(msg[i ++], "fps: %6.1f", fps);
+
+
+        sprintf(msg[i ++], "assumed visible frames: %4d, max batch size: %4d", 
+                    assumedVisibleFrames, maxBatchSize);
+
+        sprintf(msg[i ++], "multiqueries: %d, tight bounds: %d, render queue: %d, depth pass: %d, glFinish: %d", 
+                    useMultiQueries, useTightBounds, useRenderQueue, depthPass, useGlFinish);
+
+        sprintf(msg[i ++], "triangles per virtual leaf: %5d", trianglesPerVirtualLeaf);
 
 
@@ -1163 +1167 @@
         else
         {
+                static char *alg_str[] = {"Frustum Culling", "Stop and Wait", "CHC", "CHC ++"};
+
                 glColor3f(1.0f, 1.0f, 1.0f);
-                //glColor3f(1.0f, 0.0f, 0.0f);
-                Output(850, 30, msg[renderMode]);
-
-                
+                Output(850, 30, alg_str[renderMode]);
+
                 if (showStatistics)
                 {
-                        Output(20, 30, msg4);
-                        Output(20, 60, msg5);
-                        Output(20, 90, msg6);
-                        Output(20, 120, msg7);
+                        for (int i = 0; i < 4; ++ i)
+                                Output(20, (i + 1) * 30, msg[i]);
                 }
 
                 if (showOptions)
                 {
-                        Output(20, 150, msg2);
-                        Output(20, 180, msg3);
-                        Output(20, 210, msg8);
+                        for (int i = 4; i < 8; ++ i)
+                                Output(20, (i + 1) * 30, msg[i]);
                 }
         }