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

Timestamp:

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

Author:

mattausch

Message:

what todo with tone mapping: manually donwsample??
or manually downsample ssao?? or use smaller rendertarget for ssao solution??

Location:

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

Files:

• deferred.cg (modified) (8 diffs)
• globillum.cg (modified) (1 diff)
• ssao.cg (modified) (6 diffs)
• tonemap.cg (modified) (1 diff)

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

@@ -64 +64 @@
                    uniform sampler2D positions,
                    uniform sampler2D normals,
-                   uniform float3 lightDir,
-                   uniform sampler2D oldColors
+                   uniform float3 lightDir
+                  //, uniform sampler2D oldColors
                    )
 {
@@ -83 +83 @@
         OUT.color = col;
         
-#if 1
+#if 0
 
         OUT.color.w = color.w;
@@ -92 +92 @@
         //-- write out logaritmic luminance for tone mapping
 
-        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
+        // the old loglum is stored in the hightest mipmap-level
+        float oldLogLum = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL)).w;
 
         const float3 w = float3(0.299f, 0.587f, 0.114f);
@@ -102 +103 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        if (oldColor.w > 0)
-                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.1f);
+        if (oldLogLum > 0)
+                OUT.color.w = lerp(oldLogLum, logLumScaled, 0.1f);
         else
                 OUT.color.w = logLumScaled;
@@ -164 +165 @@
                                   uniform sampler2D noiseTexture,
                                   uniform float2 samples[NUM_PCF_TABS],
-                                  uniform float3 lightDir,
-                                  uniform sampler2D oldColors
+                                  uniform float3 lightDir
+                                  //, uniform sampler2D oldColors
                                   )
 {
@@ -190 +191 @@
         //if ((emmisive < 1.5f) // hack: prevent shadowing the sky      
         if (
-                (position.w > 1e19f)
+                (position.w < 1e19f)
                 && (angle > 1e-3f) // shadow only if diffuse color has some minimum intensity
                 )
@@ -216 +217 @@
         //-- write out logaritmic luminance for tone mapping
 
-        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
+#if 0
+
+        OUT.color.w = color.w;
+
+#else
+
+        float oldLogLum = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL)).w;
 
         const float3 w = float3(0.299f, 0.587f, 0.114f);
@@ -226 +233 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        if (oldColor.w > 0)
-                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.1f);
+        if (oldLogLum > 0)
+                OUT.color.w = lerp(oldLogLum, logLumScaled, 0.1f);
         else
                 OUT.color.w = logLumScaled;
-        
+#endif  
         return OUT;
 }

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

@@ -44 +44 @@
 
 
-float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
-{
-        //float3 x1 = lerp(oldColor.w, logLumScaled, 0.1f);
-        float3 x1 = lerp(bl, tl, w.y); //bl * (1.0f - w.x) + br * w.x;
-        float3 x2 = lerp(br, tr, w.y); //tl * (1.0f - w.x) + tr * w.x;
-
-        float3 v = lerp(x1, x2, w.x); //x1 * (1.0f - w.y) + x2 * w.y;
+
+inline float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
+{
+        float3 x1 = lerp(bl, tl, w.y);
+        float3 x2 = lerp(br, tr, w.y); 
+        float3 v = lerp(x1, x2, w.x); 
 
         return v;

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

@@ -34 +34 @@
 inline float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
 {
-        //float3 x1 = lerp(oldColor.w, logLumScaled, 0.1f);
-        float3 x1 = lerp(bl, tl, w.y); //bl * (1.0f - w.x) + br * w.x;
-        float3 x2 = lerp(br, tr, w.y); //tl * (1.0f - w.x) + tr * w.x;
-
-        float3 v = lerp(x1, x2, w.x); //x1 * (1.0f - w.y) + x2 * w.y;
+        float3 x1 = lerp(bl, tl, w.y);
+        float3 x2 = lerp(br, tr, w.y); 
+        float3 v = lerp(x1, x2, w.x); 
 
         return v;
@@ -44 +42 @@
 
 
-inline float3 ReconstructSamplePosition(uniform sampler2D colors, float2 texcoord, float3 bl, float3 br, float3 tl, float3 tr)
+inline float3 ReconstructSamplePosition(float3 eyePos, 
+                                                                                uniform sampler2D colors,
+                                                                                float2 texcoord, 
+                                                                                float3 bl, float3 br, float3 tl, float3 tr)
 {
         /*float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
@@ -50 +51 @@
         // reconstruct world space position
         float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
-        float3 sample_position = eyePos - rotView * eyeSpaceDepth;
-        */
+        float3 sample_position = eyePos - rotView * eyeSpaceDepth;*/
         float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
 
@@ -102 +102 @@
                         ++ numSamples;
 
-                float3 sample_position = ReconstructSamplePosition(colors, texcoord, bl, br, tl, tr);
+                float3 sample_position = ReconstructSamplePosition(eyePos, colors, texcoord, bl, br, tl, tr);
 
                 float3 vector_to_sample = sample_position - centerPosition.xyz;
@@ -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, /*viewDir, */eyePos, bl, br, tl, tr);
+        const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
                 
 
@@ -208 +208 @@
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
                 (abs(depthDif) < 1e-4f) 
-                // check if visibility changed in the surrounding area:
-                // then we have to recompute
-                && ((newWeight < 10) || (oldNumSamples > 0.9f * newNumSamples))
+                // if visibility changed in the surrounding area we have to recompute
+                && (oldNumSamples > 0.8f * newNumSamples)
                 //&& (oldAvgDepth / newAvgDepth > 0.99)
                 )

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

@@ -105 +105 @@
         return OUT;
 }
+
+
+pixel CalcAvgLogLum(frag IN, uniform sampler2D colors)
+{
+        ////////////
+        //-- write out logaritmic luminance for tone mapping
+
+        pixel OUT;
+
+        // 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;
+
+        // the intensity weights
+        const float3 w = float3(0.299f, 0.587f, 0.114f);
+
+        float lum = dot(color.rgb, w);
+        float logLum = log(1e-5f + lum);
+
+        float logLumOffset = MINLOGLUM * INV_LOGLUM_RANGE;
+        float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
+
+        OUT.color = color;
+
+        if (oldLogLum > 0)
+                OUT.color.w = lerp(oldLogLum, logLumScaled, 0.1f);
+        else
+                OUT.color.w = logLumScaled;
+}