Changeset 3003

Timestamp:

10/03/08 18:42:33 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (5 diffs)
• src/shaders/globillum.cg (modified) (3 diffs)
• src/shaders/tonemap.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -25 +25 @@
 tempCohFactor=50.0f
 
-useHDR=1
+useHDR=0

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

@@ -10 +10 @@
 #include "Light.h"
 
+#include <IL/il.h>
+#include <assert.h>
+
 
 using namespace std;
 
+
+static void startil()
+{
+        ilInit();
+        assert(ilGetError() == IL_NO_ERROR);
+}
+
+
+static void stopil()
+{
+        ilShutDown();
+        assert(ilGetError() == IL_NO_ERROR);
+}
 
 namespace CHCDemoEngine
@@ -279 +295 @@
 
         mDownSampleFbo = new FrameBufferObject(w / 2, h / 2, FrameBufferObject::DEPTH_NONE);
+        //mDownSampleFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
@@ -902 +919 @@
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixGiParam, (const float *)oldProjViewMatrix.x);
 
-        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+//      GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+        GLuint colorsTex = mDownSampleFbo->GetColorBuffer(0)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
@@ -1267 +1285 @@
 
 
+static void ExportData(float *data, int w, int h)
+{
+        startil();
+
+        cout << "w: " << w << " h: " << h << endl;
+        ILstring filename = ILstring("downsample2.jpg");
+        ilRegisterType(IL_FLOAT);
+
+        const int depth = 1;
+        const int bpp = 4;
+
+        if (!ilTexImage(w, h, depth, bpp, IL_RGBA, IL_FLOAT, data))
+        {
+                cerr << "IL error " << ilGetError() << endl;
+                stopil();
+                return;
+        }
+
+        if (!ilSaveImage(filename))
+        {
+                cerr << "TGA write error " << ilGetError() << endl;
+        }
+
+        stopil();
+
+        // cout << "exported buffer" << endl;
+}
+
+
 void DeferredRenderer::DownSample(FrameBufferObject *fbo)
 {
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, mWidth, mHeight);
+        //glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, mWidth / 2, mHeight / 2);
+        
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glLoadIdentity();
+
+        const float offs2 = 0.5f;
+        glOrtho(-offs2, offs2, -offs2, offs2, 0, 1);
+
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+        glLoadIdentity();
+
 
         ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
@@ -1305 +1364 @@
         FrameBufferObject::Release();
 
-        glPopAttrib();
+        //glPopAttrib();
+        glViewport(0, 0, mWidth, mHeight);
         PrintGLerror("downsample");
+
+        float *data = (float *)mDownSampleFbo->GetColorBuffer(0)->ReadTexture();
+        //float *data = (float *)mFbo->GetColorBuffer(colorBufferIdx)->ReadTexture();
+        ExportData(data, mWidth / 2, mHeight / 2);
+        //ExportData(data, mWidth, mHeight);
+
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+
+        delete [] data;
+        
+        PrintGLerror("shadow map");
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg

@@ -175 +175 @@
         float w = norm.w;
         // the current world position
-        const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
+        const float4 centerPosition2 = tex2D(positions, IN.texCoord.xy);
 
         /// reconstruct position from the eye space depth
-        /*float3 viewDir = normalize(IN.view);
+        float3 viewDir = normalize(IN.view);
         const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
         
@@ -185 +185 @@
 
         centerPosition.w = centerPosition2.w;
-*/
+
         // the current color
         const float4 currentCol = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
@@ -191 +191 @@
         const float currentDepth = centerPosition.w;
 
-        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition2, w, eyePos, bl, br, tl, tr);
         
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/tonemap.cg

@@ -33 +33 @@
     average *= 1.0f / 4.0f;
 
-    return average;
+    return tex2D(colors, IN.texCoord);//average;
 }