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

Timestamp:

11/06/08 10:41:02 (16 years ago)

Author:

mattausch

Message:

still some error with ssao on edges
bilateral filter slow

Location:

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

Files:

• globillum.cg (modified) (1 diff)
• ssao.cg (modified) (10 diffs)
• tonemap.cg (modified) (5 diffs)

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

@@ -104 +104 @@
                 //-- reconstruct world space position from sample
 
-                //const float4 sample = tex2Dlod(colors, float4(texcoord, 0, 0));
-                const float4 sample = tex2D(colors, texcoord);
+                const float4 sample = tex2Dlod(colors, float4(texcoord, 0, 0));
+                //const float4 sample = tex2D(colors, texcoord);
 
                 const float eyeSpaceDepth = sample.w;

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

@@ -4 +4 @@
 // Screen Spaced Ambient Occlusion shader
 // based on shader of Alexander Kusternig
-
-
-#define USE_EYE_SPACE_DEPTH 1
-
 
 struct fragment
@@ -82 +78 @@
                                                            )
 {
-        const float2 mynoise = tex2D(noiseTex, texcoord0).xy;
+        const float2 mynoise = tex2Dlod(noiseTex, texcoord0).xy;
 
         const float2 offsetTransformed = myreflect(offset, mynoise);
@@ -151 +147 @@
         //else trafo = inverseModelTrafo * oldModelViewProj;
 
-        float3 dummyPt = worldPos.xyz - oldEyePos;
+        float3 translatedPt = worldPos.xyz - oldEyePos;
 
         // reproject into old frame and calculate texture position of sample in old frame
-        float4 backProjPos = mul(oldModelViewProj, float4(dummyPt, 1.0f));
+        float4 backProjPos = mul(oldModelViewProj, float4(translatedPt, 1.0f));
         backProjPos /= backProjPos.w;
         // fit from unit cube into 0 .. 1
@@ -169 +165 @@
         
         const float invlen = 1.0f / length(viewVec);
-        const float projectedEyeSpaceDepth = length(dummyPt) * invlen;
+        const float projectedEyeSpaceDepth = length(translatedPt) * invlen;
         
         const float depthDif = abs(oldEyeSpaceDepth - projectedEyeSpaceDepth);
+        //const float depthDif = abs(oldEyeSpaceDepth - projectedEyeSpaceDepth) / projectedEyeSpaceDepth;
         
         float notValid = 0.5f;
 
+        /*
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
@@ -191 +189 @@
                 if (sampleDif >= 5e-2f) ++ notValid;
         }
+        */
 
         // the number of valid samples in this frame
@@ -202 +201 @@
                 && (oldTexCoords.x >= 0.0f) && (oldTexCoords.x < 1.0f)
                 && (oldTexCoords.y >= 0.0f) && (oldTexCoords.y < 1.0f)
-                && (abs(depthDif) <= MIN_DEPTH_DIFF) 
+                && (depthDif <= MIN_DEPTH_DIFF) 
                 // if visibility changed in the surrounding area we have to recompute
                 //&& (oldNumSamples > 0.8f * newNumSamples)
@@ -259 +258 @@
                 //-- add random noise: reflect around random normal vector (rather slow!)
 
-                float2 mynoise = tex2D(noiseTex, IN.texCoord).xy;
+                float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
                 const float2 offsetTransformed = myreflect(offset, mynoise);
 #else
@@ -275 +274 @@
 
                 float3 dirSample = samplePos - centerPosition;
-                const float lengthToSample = length(dirSample);
+                const float lengthToSample = max(length(dirSample), 1e-6f);
 
                 dirSample /= lengthToSample; // normalize
 
                 // angle between current normal and direction to sample controls AO intensity.
-                const float cosAngle = max(dot(dirSample, normal), .0f);
-
+                float cosAngle = max(dot(dirSample, normal), .0f);
+        
                 // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
                 // the distance to a sample approaches zero
@@ -291 +290 @@
                 // => compensate for this (on the other hand, projected sampling area could be larger!)
 
-                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * dot(viewDir, normal);
+                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * max(dot(viewDir, normal), 0.0f);
                 total_ao += cosAngle * aoContrib * viewCorrection;
 #else
@@ -352 +351 @@
                                                                           oldbl, oldbr, oldtl, oldtr);
 
+        //OUT.illum_col.xyz = normal * 0.5f + 0.5f;
         return OUT;
 }
-
-
-float Filter(float2 texCoord, 
-                         uniform sampler2D ssaoTex,
-                         uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                         uniform float filterWeights[NUM_SSAO_FILTERSAMPLES])
-{
-        float average = .0f;
-        float w = .0f;
-
-        for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
-        {
-                average += filterWeights[i] * tex2Dlod(ssaoTex, float4(texCoord + filterOffs[i], 0, 0)).x;
-                w += filterWeights[i];
-        }
-
-        average *= 1.0f / (float)w;
-
-        return average;
-}
-
-
-pixel combine(fragment IN, 
-                          uniform sampler2D colors,
-                          uniform sampler2D ssaoTex,
-                          uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
-                          )
-{
-        pixel OUT;
-
-        float4 col = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
-        float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
-
-        if (ao.y < 10.0f) ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
-
-        OUT.illum_col = col * ao.x;
-        //OUT.illum_col = float4(ao.y, ao.y, ao.y, col.w);
-        //OUT.illum_col.xyz = float3(1.0f - ao.x, 1.0f - ao.y * 1e-2f, 1);
-        //OUT.illum_col.xyz = float3(1.0f - ao.x, ao.y, 0);
-        OUT.illum_col.w = col.w;
-
-        return OUT;
-}

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

@@ -91 +91 @@
         {
                 color = tex2D(colors, downSampleOffs[i]);
-
                 const float intensity = dot(cols[i].rgb, w);
 
@@ -146 +145 @@
         
         // obtain new image key from highest mipmap level
-        float logLumScaled = tex2Dlod(colors, float4(.5f, .5f, 0, 99)).w;
+        float logLumScaled = tex2Dlod(colors, float4(.5f, .5f, 0, MAX_LOD_LEVEL)).w;
         float logLum = logLumScaled * LOGLUM_RANGE + MINLOGLUM;
 
@@ -153 +152 @@
         // adjust to middle gray
         const float lum = middleGrey * pixLum / newImageKey;
-         
         // map to range and calc burnout
         const float scaleLum = lum * (1.0f + lum / whiteLum * whiteLum) / (1.0f + lum);
@@ -170 +168 @@
 
         pixel OUT;
-        
+
         const float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
-
         OUT.col = color;
 
@@ -187 +184 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        if (oldLogLum > 1e-5f) // too bright
+        // 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);
         else