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

Timestamp:

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

Author:

mattausch

Message:

tone mapping working with using reconstructed depth

Location:

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

Files:

• deferred.cg (modified) (2 diffs)
• ssao.cg (modified) (3 diffs)
• tonemap.cg (modified) (2 diffs)

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

@@ -76 +76 @@
         // an ambient color term
         float amb = color.w;
-
         float3 normal = normalize(norm.xyz);
-
         float4 col = shade(IN, color, position, normal, amb, lightDir);
         
         OUT.color = col;
         
-#if 0
+#if 1
 
         OUT.color.w = color.w;
@@ -217 +215 @@
         //-- write out logaritmic luminance for tone mapping
 
-#if 0
-
+#if 1
         OUT.color.w = color.w;
-
 #else
 

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

@@ -42 +42 @@
 
 
+// reconstruct world space position
 inline float3 ReconstructSamplePosition(float3 eyePos, 
                                                                                 uniform sampler2D colors,
@@ -47 +48 @@
                                                                                 float3 bl, float3 br, float3 tl, float3 tr)
 {
-        /*float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
-                
-        // reconstruct world space position
+        float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
         float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
-        float3 sample_position = eyePos - rotView * eyeSpaceDepth;*/
-        float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
+        
+        float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+        //float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
 
         return sample_position;
@@ -174 +174 @@
 
         //const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
-        const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
                 
 

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;
 }