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

Timestamp:

11/13/08 13:14:55 (16 years ago)

Author:

mattausch

Message:

changed tm so no values out of bounds, somehow occlusion error missing again

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/tonemap.cg (modified) (4 diffs)

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

@@ -19 +19 @@
 };
 
-
-/*float4 DownSample(frag IN,
-                                  uniform sampler2D colors,
-                                  uniform float2 downSampleOffs[9]): COLOR
-{    
-    float4 average = .0f;
-
-        const float4 avgColor = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
-
-        float j = 0;
-        float4 color;
-
-    for (int i = 0; i < 9; ++ i)
-    {
-                color = tex2Dlod(colors, float4(IN.texCoord + downSampleOffs[i], 0, 0));
-                if (abs(color.w - avgColor.w) < 1e-3f)
-                {
-                        average += color;
-                        ++ j;
-                }
-    }
-        
-    //average *= 1.0f / 9.0f;
-    average *= 1.0f / j;
-
-    return average;
-}*/
  
 
-// let bilinear filtering do its work
 float4 DownSample(frag IN,
                                   uniform sampler2D colors,
                                   uniform float2 downSampleOffs[NUM_DOWNSAMPLES]): COLOR
 {    
+        // let bilinear filtering do its work
         return tex2Dlod(colors, float4(IN.texCoord, 0, 0));
 /*
@@ -71 +44 @@
         intensity.
 */
-
 float4 GreyScaleDownSample(frag IN,
                                                    uniform sampler2D colors,
@@ -148 +120 @@
         float logLum = logLumScaled * LOGLUM_RANGE + MINLOGLUM;
 
-        float newImageKey = exp(logLum);
+        float newImageKey = max(exp(logLum), 1e-6f);
 
         // adjust to middle gray
@@ -184 +156 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
+        const float expFactor = 0.1f;
         // exponential smoothing of tone mapping over time
-        if (oldLogLum > 1e-5f) // loglum from last frame too bright
-                OUT.col.w = lerp(oldLogLum, logLumScaled, 0.1f);
+        if (oldLogLum > 1e-5f) // check if loglum from last frame too small (=> tm too bright)
+                OUT.col.w = lerp(oldLogLum, logLumScaled, expFactor);
         else
                 OUT.col.w = logLumScaled;