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

Timestamp:

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

Author:

mattausch

Message:

 

File:

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

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

@@ -21 +21 @@
 
 
-float3 ToneMap(const float imageKey, float3 color)
+float3 ToneMap(float imageKey, float whiteLum, float3 color)
 {
         float3 outCol;
@@ -29 +29 @@
         const float lum = MIDDLE_GRAY * pixLum / imageKey;
          
-    // map to range
-        const float scaledLum = lum / (1.0f + lum);
-
-    /*outCol *= MIDDLE_GRAY / (vLum + 1e-3f);
-    outCol *= (1.0f + vColor / LUM_WHITE);
-        outCol /= (1.0f + vColor);*/
+        // map to range and calc burnout
+        const float burnedLum = lum * (1.0f + lum / whiteLum * whiteLum) / (1.0f + lum);
         
-        outCol = color * scaledLum;
+        outCol = color * burnedLum / pixLum;
         //vColor.rgb += 0.6f * vBloom;
         
@@ -42 +38 @@
 }
 
+
 float4 main(v2p IN, 
                         uniform sampler2D colors,
                         uniform sampler2D normals,
-                        uniform float imageKey
+                        uniform float imageKey,
+                        uniform float whiteLum
                         ): COLOR
 {
@@ -115 +113 @@
 
         //return float4(w);
-        col.xyz = ToneMap(imageKey, col.xyz);
+        col.xyz = ToneMap(imageKey, whiteLum, col.xyz);
 
         return col;