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

Timestamp:

12/07/08 23:26:00 (16 years ago)

Author:

mattausch

Message:

made ssao parameters more flexible
started to implement lense flare

Location:

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

Files:

• combineSsao.cg (modified) (3 diffs)
• deferred.cg (modified) (2 diffs)
• globillum.cg (modified) (5 diffs)
• lenseFlare.cg (added)
• ssao.cg (modified) (11 diffs)

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

@@ -125 +125 @@
 
                 aoSample = tex2Dlod(ssaoTex, sampleTexCoord);
-                //sampleNorm = tex2Dlod(normalsTex, sampleTexCoord).xyz;
-
+                
                 // check spatial discontinuity
                 // note: using the depth from the color texture is not 100% correct as depth was
@@ -136 +135 @@
                 spatialFactor = 1.0f / max(len, 1e-3f);
 
+                convergenceFactor = aoSample.y + 1.0f;
+
+                //sampleNorm = tex2Dlod(normalsTex, sampleTexCoord).xyz;
                 //normalFactor = max(step(.2f, dot(sampleNorm, centerNormal)), 1e-2f);
-                convergenceFactor = aoSample.y + 1.0f;
-                
+
                 // combine the weights
                 w = convergenceFactor * convergenceFactor * spatialFactor;// * normalFactor;
@@ -232 +233 @@
         return OUT;
 }
-
-
-/** Function combining image and indirect illumination buffer using a 
-        depth and normal aware discontinuity filter.
-*/
-pixel SmoothSsao(fragment IN, 
-                                 uniform sampler2D ssaoTex)
-{
-        pixel OUT;
-
-        float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
-
-        float4 dummy;
-        const float xoffs = .5f / 1024.0f; const float yoffs = .5f / 768.0f;
-
-        // get positions exactly between old texel centers
-        dummy.x = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(xoffs, 0), 0, 0)).y;
-        dummy.y = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(0, -yoffs), 0, 0)).y;
-        dummy.z = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(-xoffs, 0), 0, 0)).y;
-        dummy.w = tex2Dlod(ssaoTex, float4(IN.texCoord + float2(0, yoffs), 0, 0)).y;
-
-        const float m1 = min(dummy.x, dummy.y);
-        const float m2 = min(dummy.z, dummy.w);
-
-        ao.y = min(ao.y, min(m1, m2));
-
-        return OUT;
-}

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

@@ -261 +261 @@
         const bool oldDynamic = (squaredLen > DYNAMIC_OBJECTS_THRESHOLD);
         const bool newDynamic = (oldPixel.z > DYNAMIC_OBJECTS_THRESHOLD);
-
-        //const float xOffs = 1.0f / 1024.0f;   const float yOffs = 1.0f / 768.0f;
-        //const float eps = 1e-6f;
 
         // actually 0 means pixel is valid
@@ -334 +331 @@
         pix.color = color;
         pix.color.xy = pValid.xy;
+        pix.color.z = color.w;
+
         pix.normal = normal;
 

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

@@ -65 +65 @@
                                    uniform float3 br,
                                    uniform float3 tl,
-                                   uniform float3 tr
-                                   , uniform float3 viewDir
+                                   uniform float3 tr, 
+                                   float3 viewDir,
+                                   float sampleIntensity
                                    )
 {
@@ -125 +126 @@
                 const float denom = (DISTANCE_SCALE + magSample * magSample);
 
-                float2 intensity = float2(SAMPLE_INTENSITY, ILLUM_INTENSITY);
+                float2 intensity = float2(sampleIntensity, ILLUM_INTENSITY);
                 intensity /= denom;
 
@@ -161 +162 @@
                    uniform float3 br,
                    uniform float3 tl,
-                   uniform float3 tr
+                   uniform float3 tr,
+                   uniform float kernelRadius,
+                   uniform float sampleIntensity
                    )
 {
         pixel2 OUT;
 
-        const float3 normal = tex2Dlod(normals, float4(IN.texCoord, 0 ,0));
+        const float3 normal = tex2Dlod(normals, float4(IN.texCoord, 0 ,0)).xyz;
 
         
@@ -180 +183 @@
         float4 currentPos = mul(modelViewProj, eyeSpacePos);
 
-        const float w = SAMPLE_RADIUS / currentPos.w;
+        const float w = kernelRadius / currentPos.w;
         currentPos /= currentPos.w;
         
@@ -188 +191 @@
         //-- compute color bleeding + ao
 
-        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view));
+        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view), sampleIntensity);
         
 

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

@@ -108 +108 @@
         const float ssao = oldPixel.x;
 
-#if USE_EYESPACE_DEPTH
-
         // calculate eye space position of sample in old frame
         const float oldEyeSpaceDepth = oldPixel.w;
@@ -120 +118 @@
         
         const float depthDif = abs(1.0f - oldEyeSpaceDepth / projectedEyeSpaceDepth);
-
-#else
-
-        // calculate eye space position of sample in old frame
-        const float oldDepth = oldPixel.w;
-        // the depth projected into the old frame
-        const float projectedDepth = projPos.z;
-        // calculate depth difference 
-        const float depthDif = abs(projectedDepth - oldDepth);
-
-#endif
 
         const float xOffs = 1.0f / 1024.0f;
@@ -176 +163 @@
                          float3 tr, 
                          float3 viewDir,
-                         sampler2D normalTex
+                         sampler2D normalTex,
+                         float sampleIntensity
                          )
 {
@@ -224 +212 @@
                 cosAngle *= step(0.0f, dot(dirSample, normal));
         
-                const float aoContrib = SAMPLE_INTENSITY / sqrLen;
+                const float aoContrib = sampleIntensity / sqrLen;
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
 
@@ -270 +258 @@
                         float3 viewDir,
                         float newWeight,
-                        bool isMovingObject
+                        float sampleIntensity
                         )
 {
@@ -310 +298 @@
                 // angle between current normal and direction to sample controls AO intensity.
                 const float cosAngle = max(dot(dirSample, normal), .0f);
-                const float aoContrib = SAMPLE_INTENSITY / sqrLen;
+                const float aoContrib = sampleIntensity / sqrLen;
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
 
@@ -338 +326 @@
 
                 //if ((validSamples < 1.0f) && (newWeight > 200) && (numSamples >= 8)) break;
-                if ((validSamples < 1.0f) && (numSamples >= 8) && !isMovingObject 
-                        || (newWeight > NUM_SAMPLES * 5) && (numSamples >= 8) && isMovingObject
-                        )
-                {
-                        break;
-                }
+                //if ((validSamples < 1.0f) && (numSamples >= 8)) break;
         }
 
         total_ao /= numSamples;
 
-        //return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
-        return float3(total_ao, validSamples, numSamples);
+        return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
 }
 
@@ -374 +356 @@
                    uniform float3 oldtl,
                    uniform float3 oldtr,
-                   uniform sampler2D attribsTex
+                   uniform sampler2D attribsTex,
+                   uniform float kernelRadius,
+                   uniform float sampleIntensity
                    )
 {
@@ -396 +380 @@
         const float invw = 1.0f / projPos.w;
         projPos *= invw;
-        float scaleFactor = SAMPLE_RADIUS * invw;
-
-        const float sqrMoveSpeed = SqrLen(diffVec);
-        const bool isMovingObject = (sqrMoveSpeed > DYNAMIC_OBJECTS_THRESHOLD);
+        float scaleFactor = kernelRadius * invw;
 
         
@@ -422 +403 @@
         if (eyeSpaceDepth < 1e10f)
         {
-                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, isMovingObject);
-                //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals);
+                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity);
+                //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals, sampleIntensity);
         }
         else
@@ -430 +411 @@
         }
 
-        // equals the number of sampled shot in this pass
-        const float newWeight = ao.z;
+        const float squaredLen = SqrLen(diffVec);
 
         // check if we have to reset pixel because one of the sample points was invalid
-        if (!isMovingObject)
-    //if (sqrMoveSpeed <= DYNAMIC_OBJECTS_THRESHOLD)
+        if (squaredLen < DYNAMIC_OBJECTS_THRESHOLD)
         {
                 if (ao.y > 4.0f) 
                         oldWeight = 0; 
                 else if (ao.y > 1.0f)
-                        oldWeight = min(oldWeight, 4.0f * newWeight);
-        }
-
+                        oldWeight = min(oldWeight, 4.0f * NUM_SAMPLES);
+        }
+
+        const float newWeight = ao.z;
         const float combinedWeight = clamp(newWeight + oldWeight, .0f, temporalCoherence);