Changeset 2968 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

09/24/08 11:08:13 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (6 diffs)

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

@@ -97 +97 @@
 static CGparameter sLightDirParam;
 static CGparameter sLightDirShadowParam;
-
 static CGparameter sImageKeyParam;
+static CGparameter sWhiteLumParam;
 
 //#define USE_3D_SSAO
@@ -285 +285 @@
                 sColorsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "colors");  
                 sNormalsTexDeferredParam = cgGetNamedParameter(sCgDeferredProgram, "normals");
+                
                 sLightDirParam = cgGetNamedParameter(sCgDeferredProgram, "lightDir");
         }
@@ -407 +408 @@
 
                 sImageKeyParam = cgGetNamedParameter(sCgAntiAliasingProgram, "imageKey");
+                sWhiteLumParam = cgGetNamedParameter(sCgAntiAliasingProgram, "whiteLum");
 
                 sColorsTexAntiAliasingParam = cgGetNamedParameter(sCgAntiAliasingProgram, "colors");  
@@ -438 +440 @@
                 sNoiseTexShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "noiseTexture");
                 sSamplesShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "samples");
+
                 sLightDirShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "lightDir");
 
@@ -667 +670 @@
 void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo)
 {
-        const float imageKey = ToneMapper().CalcImageKey(fbo->GetColorBuffer(colorBufferIdx));
-
-        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+        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 = 0.5f * ToneMapper().CalcMaxLuminance(pixels, w, h);
+
+        delete [] pixels;
+
+        GLuint colorsTex = colorBuffer->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
         
@@ -684 +698 @@
 
         cgGLSetParameter1f(sImageKeyParam, imageKey);
+        cgGLSetParameter1f(sWhiteLumParam, whiteLum);
+
 
         glColor3f(1.0f, 1.0f, 1.0f);