Changeset 3121

Timestamp:

11/12/08 10:18:15 (16 years ago)

Author:

mattausch

Message:

reordered ssao function to redcude flikering with one kernel but not working yet

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• shaders/ssao.cg (modified) (11 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -535 +535 @@
         sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
         
-        if (mUseTemporalCoherence || mRegenerateSamples)
+        if (//mUseTemporalCoherence || 
+                mRegenerateSamples)
         {
                 mRegenerateSamples = false;

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

@@ -57 +57 @@
 {
         const float eyeSpaceDepth = tex2Dlod(tex, float4(texcoord, 0, 0)).w;
-        //float3 viewVec = normalize(Interpol(texcoord, bl, br, tl, tr));
+        
         float3 viewVec = Interpol(texcoord, bl, br, tl, tr);
         float3 samplePos = -viewVec * eyeSpaceDepth;
@@ -120 +120 @@
         reprojected color / depth values as well as a boolean that 
 */
-inline float4 temporalSmoothing(float4 worldPos,
+inline float3 temporalSmoothing(float4 worldPos,
                                                                 float eyeSpaceDepth,
-                                                                float2 ao,
                                                                 float2 texcoord0,
                                                                 float3 oldEyePos,
@@ -145 +144 @@
                                                                 )
 {
-        float4 illum_col;
-
         // compute position from old frame for dynamic objects + translational portion
         const float3 translatedPos = worldPos.xyz - oldEyePos + diffVec;
@@ -162 +159 @@
         // retrieve the sample from the last frame
         const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
-
 
 #if USE_EYESPACE_DEPTH
@@ -211 +207 @@
         }
 #endif
-        const float oldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
+
+        //const float oldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
+        float oldWeight = oldPixel.y;
+
         float newWeight;
 
@@ -225 +224 @@
                 // increase the weight for convergence
                 newWeight = oldWeight + 1.0f;
-                illum_col.x = (ao.x + oldPixel.x * oldWeight) / newWeight;
                 if (notValid > 1.0f) newWeight = 2.0f;
         }
         else
         {       
-                illum_col.x = ao.x;
-                newWeight = .0f;
-        }
-
-        illum_col.y = newWeight;
-
-#if USE_EYESPACE_DEPTH
-        illum_col.w = eyeSpaceDepth;
-#else
-        illum_col.w = projectedDepth;
-#endif
-        //overallDepth = clamp(overallDepth*1e3, 0, 1);
-        illum_col.z = invW;
-        //illum_col.x = overallDepth;
-
-        return illum_col;
+                newWeight = 1.0f;
+        }
+
+        if (oldPixel.y >= temporalCoherence)
+                newWeight = min(temporalCoherence+1, max(oldPixel.y - 70, 50));
+
+        return float3(oldPixel.x, newWeight, eyeSpaceDepth);
 }
 
@@ -263 +252 @@
                         float3 tr, 
                         float3 viewDir
-                        //,float2 noiseOffs
+                        , float2 noiseOffs
                         )
 {
@@ -282 +271 @@
                 //-- add random noise: reflect around random normal vector (rather slow!)
 
-                //float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f + noiseOffs, 0, 0)).xy;
-                float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
+                float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f + noiseOffs, 0, 0)).xy;
+                //float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
                 const float2 offsetTransformed = myreflect(offset, mynoise);
 #else
@@ -325 +314 @@
         return float2(max(0.0f, 1.0f - total_ao), numSamples);
 }
+
 
 /** The mrt shader for screen space ambient occlusion
@@ -354 +344 @@
 
         // reconstruct position from the eye space depth
-        //const float3 viewDir = normalize(IN.view);
         const float3 viewDir = IN.view;
         const float eyeSpaceDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
         const float4 eyeSpacePos = float4(-viewDir * eyeSpaceDepth, 1.0f);
 
+        //float3 id = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
+        float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
+        
 
         ////////////////
@@ -367 +359 @@
         projPos *= invw;
         float scaleFactor = SAMPLE_RADIUS * invw;
-        
-        float2 ao = float2(1.0f, 0);
+
+        
+        /////////////////
+        //-- compute temporal reprojection
+
+        float3 temporalVals = temporalSmoothing(eyeSpacePos, eyeSpaceDepth, IN.texCoord, oldEyePos,
+                                                oldTex, oldModelViewProj, temporalCoherence,
+                                                                                        colors, 
+                                                                                        bl, br, tl, tr, 
+                                                                                        projPos.xyz, 
+                                                                                        invw, 
+                                                                                        noiseTex, 
+                                                                                        samples, 
+                                                                                        scaleFactor, 
+                                                                                        oldbl, oldbr, oldtl, oldtr,
+                                                                                        diffVec);
+
+        const float oldSsao = temporalVals.x;
+        const float newWeight = temporalVals.y;
+
+        float2 noiseOffs = float2(newWeight / 256.0f, (newWeight - 256.0f) / 192.0f);
+
+        float2 ao;
         // note: this should be done with the stencil buffer
         if (eyeSpaceDepth < 1e10f)
         {
                 ao = ssao(IN, colors, noiseTex, samples, normal, 
-                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));//, noiseOffs);
-        }
-
-        //float3 id = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
-        float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
-
-
-        /////////////////
-        //-- compute temporal reprojection
-
-        OUT.illum_col = temporalSmoothing(eyeSpacePos, eyeSpaceDepth, ao, IN.texCoord, oldEyePos,
-                                              oldTex, oldModelViewProj, temporalCoherence,
-                                              colors, 
-                                                                          bl, br, tl, tr, 
-                                                                          projPos.xyz, 
-                                                                          invw, 
-                                                                          noiseTex, 
-                                                                          samples, 
-                                                                          scaleFactor, 
-                                                                          oldbl, oldbr, oldtl, oldtr,
-                                                                          diffVec);
+                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), noiseOffs);
+        }
+        else
+        {
+                 ao = float2(1.0f, 0);
+        }
+
+
+        OUT.illum_col.x = (ao.x + oldSsao * (newWeight - 1.0f)) / newWeight;
+        OUT.illum_col.y = newWeight;
+        OUT.illum_col.z = invw;
+        OUT.illum_col.w = temporalVals.z;
 
         return OUT;