Changeset 2972

Timestamp:

09/24/08 18:06:30 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (3 diffs)
• src/DeferredRenderer.h (modified) (2 diffs)
• src/DeferredShader.cpp (deleted)
• src/DeferredShader.h (deleted)
• src/shaders/tonemap.cg (added)

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

@@ -799 +799 @@
                                 >
                         </File>
+                        <File
+                                RelativePath=".\src\shaders\tonemap.cg"
+                                >
+                        </File>
                 </Filter>
                 <Filter

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

@@ -36 +36 @@
 
 
+static CGprogram sCgInitialIntensityProgram;
+static CGprogram sCgDownSampleProgram;
+static CGprogram sCgToneProgram;
+
+
 ///////////////////////////////////////
 
@@ -100 +105 @@
 static CGparameter sMiddleGreyParam;
 static CGparameter sWhiteLumParam;
+
+
+static CGparameter sColorsTexInitialParam;
+static CGparameter sColorsTexToneParam;
+static CGparameter sIntensityTexDownSampleParam;
+
 
 //#define USE_3D_SSAO
@@ -1097 +1108 @@
 
 
+void DeferredRenderer::ComputeToneParameters(FrameBufferObject *fbo)
+{
+        ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
+
+        GLuint colorsTex = colorBuffer->GetTexture();
+        
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        cgGLEnableProfile(RenderState::sCgFragmentProfile);
+        cgGLBindProgram(sCgInitialIntensityProgram);
+        
+        cgGLSetTextureParameter(sColorsTexInitialParam, colorsTex);
+        cgGLEnableTextureParameter(sColorsTexInitialParam);
+
+        // first pass: create high res intensity texture
+        glColor3f(1.0f, 1.0f, 1.0f);
+
+        float offs2 = 0.5f;
+
+        glBegin(GL_QUADS);
+
+        // the neighbouring texels
+        float x_offs = 1.0f / mWidth;
+        float y_offs = 1.0f / mHeight;
+
+        SetVertex(0, 0, x_offs, y_offs);
+        SetVertex(1, 0, x_offs, y_offs);
+        SetVertex(1, 1, x_offs, y_offs);
+        SetVertex(0, 1, x_offs, y_offs);
+
+        glEnd();
+
+        cgGLDisableTextureParameter(sColorsTexToneParam);
+
+        
+        ////////////
+        //-- second phase: down sample the texture in order to compute the average
+        
+        // q: required passes for computing 1x1 texture?
+        int passes = 32;
+
+        for (int i = 0; i < 32; ++ i)
+        {
+                DownSample(fbo);
+        }
+
+        PrintGLerror("antialiasing");
+}
+
+
+void DeferredRenderer::DownSample(FrameBufferObject *fbo)
+{
+        GLuint intensityTex;
+        
+        cgGLEnableProfile(RenderState::sCgFragmentProfile);
+        cgGLBindProgram(sCgDownSampleProgram);
+        
+        cgGLSetTextureParameter(sIntensityTexDownSampleParam, intensityTex);
+        cgGLEnableTextureParameter(sIntensityTexDownSampleParam);
+}
+
+
+void DeferredRenderer::ToneMap(FrameBufferObject *fbo, DirectionalLight *light)
+{
+        ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
+
+        // we assume that we have a floating point rgba texture
+        float *pixels = (float *)colorBuffer->ReadTexture();
+
+        const int w = colorBuffer->GetHeight();
+        const int h = colorBuffer->GetWidth();
+
+        const float imageKey = ToneMapper().CalcImageKey(pixels, w, h);
+        const float whiteLum = 1.0f * ToneMapper().CalcMaxLuminance(pixels, w, h);
+
+        //const float minKey = 0.18f;
+        //const float maxKey = 0.72f;
+
+        //const float minKey = 0.0045f;
+        const float minKey = 0.09f;
+        const float maxKey = 0.5f;
+
+        const float lightIntensity = DotProd(-light->GetDirection(), Vector3::UNIT_Z());
+        const float middleGrey = lightIntensity * maxKey + (1.0f - lightIntensity) * minKey;
+
+        //cout << "middlegrey: " << middleGrey << endl;
+        delete [] pixels;
+
+        GLuint colorsTex = colorBuffer->GetTexture();
+        
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        cgGLEnableProfile(RenderState::sCgFragmentProfile);
+        cgGLBindProgram(sCgToneProgram);
+        
+        cgGLSetTextureParameter(sColorsTexToneParam, colorsTex);
+        cgGLEnableTextureParameter(sColorsTexToneParam);
+
+        cgGLSetParameter1f(sImageKeyParam, imageKey);
+        cgGLSetParameter1f(sWhiteLumParam, whiteLum);
+        cgGLSetParameter1f(sMiddleGreyParam, middleGrey);
+
+        glColor3f(1.0f, 1.0f, 1.0f);
+
+        float offs2 = 0.5f;
+
+        glBegin(GL_QUADS);
+
+        // the neighbouring texels
+        float x_offs = 1.0f / mWidth;
+        float y_offs = 1.0f / mHeight;
+
+        SetVertex(0, 0, x_offs, y_offs);
+        SetVertex(1, 0, x_offs, y_offs);
+        SetVertex(1, 1, x_offs, y_offs);
+        SetVertex(0, 1, x_offs, y_offs);
+
+        glEnd();
+
+        cgGLDisableTextureParameter(sColorsTexToneParam);
+
+        PrintGLerror("antialiasing");
+}
+
 
 

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

@@ -75 +75 @@
         void FirstPassShadow(FrameBufferObject *fbo, DirectionalLight *light, ShadowMap *shadowMap);
 
+        void ComputeToneParameters(FrameBufferObject *fbo);
+        void ToneMap(FrameBufferObject *fbo, DirectionalLight *light);
+
+
         void CombineSsao(FrameBufferObject *fbo);
         void CombineIllum(FrameBufferObject *fbo);
@@ -83 +87 @@
         void ComputeViewVectors(Vector3 &tl, Vector3 &tr, Vector3 &bl, Vector3 &br);
         
+        void DownSample(FrameBufferObject *fbo);
+
+
 
         ////////////