Changeset 2970

Timestamp:

09/24/08 14:59:35 (16 years ago)

Author:

mattausch

Message:

tone mapper working better

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• DeferredRenderer.cpp (modified) (7 diffs)
• DeferredRenderer.h (modified) (1 diff)
• SkyPreetham.cpp (modified) (2 diffs)
• ToneMapper.cpp (modified) (1 diff)
• shaderenv.h (modified) (1 diff)
• shaders/antialiasing.cg (modified) (4 diffs)

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

@@ -98 +98 @@
 static CGparameter sLightDirShadowParam;
 static CGparameter sImageKeyParam;
+static CGparameter sMiddleGreyParam;
 static CGparameter sWhiteLumParam;
 
@@ -408 +409 @@
 
                 sImageKeyParam = cgGetNamedParameter(sCgAntiAliasingProgram, "imageKey");
+                sMiddleGreyParam = cgGetNamedParameter(sCgAntiAliasingProgram, "middleGrey");
                 sWhiteLumParam = cgGetNamedParameter(sCgAntiAliasingProgram, "whiteLum");
 
@@ -513 +515 @@
         }
 
-        AntiAliasing(fbo);
+        AntiAliasing(fbo, light);
 
         glEnable(GL_LIGHTING);
@@ -668 +670 @@
 
 
-void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo)
+void DeferredRenderer::AntiAliasing(FrameBufferObject *fbo, DirectionalLight *light)
 {
         ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
@@ -679 +681 @@
 
         const float imageKey = ToneMapper().CalcImageKey(pixels, w, h);
-        const float whiteLum = 0.5f * ToneMapper().CalcMaxLuminance(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;
 
@@ -699 +712 @@
         cgGLSetParameter1f(sImageKeyParam, imageKey);
         cgGLSetParameter1f(sWhiteLumParam, whiteLum);
+        cgGLSetParameter1f(sMiddleGreyParam, middleGrey);
 
 
@@ -889 +903 @@
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
 
-        //GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
-        //GLuint illumTex = mNewFbo->GetColorBuffer(1)->GetTexture();
         GLuint ssaoTex = mFbo->GetColorBuffer(mFboIndex)->GetTexture();
         GLuint illumTex = mFbo->GetColorBuffer(mFboIndex + 1)->GetTexture();

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

@@ -78 +78 @@
         void CombineIllum(FrameBufferObject *fbo);
 
-        void AntiAliasing(FrameBufferObject *fbo);
+        void AntiAliasing(FrameBufferObject *fbo, DirectionalLight *light);
         /** Helper method that computes the view vectors in the corners of the current view frustum.
         */

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

@@ -284 +284 @@
         // downscale ambient color
         //ambient *= 5e-5f;
-        //ambient *= 2e-3f;
+        ambient *= 1e-1f;
 
         // simulate the sun intensity by modulating the ambient term.
-        //ambient *= (1.0f - 0.9f * DotProd(sunDir, Vector3::UNIT_Z()));
+        ambient *= (10.0f - 9.0f * DotProd(sunDir, Vector3::UNIT_Z()));
         //ambient += Vector3(0.2f);
 
@@ -321 +321 @@
 
         // Calculate final sun diffuse color.
-        //diffuse = color * 2e-3f;
-        diffuse = color;
+        diffuse = color * 3e-1f;
+        //diffuse *= (3.0f - 2.0f * DotProd(sunDir, Vector3::UNIT_Z()));
+        //diffuse = color;
+        
 
         //cout << "diffuse: " << Magnitude(diffuse) << " ambient: " << Magnitude(ambient) << endl;

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

@@ -36 +36 @@
 
         static float previousKey = key;
-        const float factor = 1.0f;
+        const float factor = 0.5f;
 
-        const float imageKey = key;// * factor + previousKey * (1.0f - factor);
+        float imageKey;
+
+        if (key > 0)
+                imageKey = key * factor + previousKey * (1.0f - factor);
+        else 
+                imageKey = previousKey;
+
         previousKey = imageKey;
         
-        cout << "key: " << key << endl;
+        //cout << "key: " << key << endl;
 
         return imageKey;

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

@@ -33 +33 @@
 
 /////////
-//-- tone mapping
-
-//#define MIDDLE_GRAY 0.5f
-//#define MIDDLE_GRAY 0.72f
-#define MIDDLE_GRAY 0.36f
-//#define MIDDLE_GRAY 0.18f
-//#define MIDDLE_GRAY 0.18f
-
-
-/////////
 //-- shadowing
 

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

@@ -21 +21 @@
 
 
-float3 ToneMap(float imageKey, float whiteLum, float3 color)
+float3 ToneMap(float imageKey, float whiteLum, float middleGrey, float3 color)
 {
         float3 outCol;
@@ -27 +27 @@
         
         // adjust to middle gray
-        const float lum = MIDDLE_GRAY * pixLum / imageKey;
+        const float lum = middleGrey * pixLum / imageKey;
          
         // map to range and calc burnout
@@ -51 +51 @@
                         uniform sampler2D normals,
                         uniform float imageKey,
-                        uniform float whiteLum
+                        uniform float whiteLum,
+                        uniform float middleGrey
                         ): COLOR
 {
@@ -121 +122 @@
 
         //return float4(w);
-        col.xyz = ToneMap(imageKey, whiteLum, col.xyz);
+        col.xyz = ToneMap(imageKey, whiteLum, middleGrey, col.xyz);
 
         return col;