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

Timestamp:

10/02/08 17:34:10 (16 years ago)

Author:

mattausch

Message:

tone mapping working with using reconstructed depth

File:

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

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

@@ -114 +114 @@
         pixel OUT;
 
+        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
+
+        OUT.col = color;
+
         // the old loglum is stored in the hightest mipmap-level
-        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
         float oldLogLum = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL)).w;
 
@@ -127 +130 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        OUT.color = color;
+        if (oldLogLum > 0)
+                OUT.col.w = lerp(oldLogLum, logLumScaled, 0.1f);
+        else
+                OUT.col.w = logLumScaled;
 
-        if (oldLogLum > 0)
-                OUT.color.w = lerp(oldLogLum, logLumScaled, 0.1f);
-        else
-                OUT.color.w = logLumScaled;
+        return OUT;
 }