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

Timestamp:

02/13/09 11:49:44 (15 years ago)

Author:

mattausch

Message:

working on changed sampling scheme for temporal coherence

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg (modified) (8 diffs)

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

@@ -142 +142 @@
         float validSamples = .0f;
 
-        for (int i = 0; i < NUM_SAMPLES; ++ i) 
+        for (int i = 0; i < NUM_PRECOMPUTED_SAMPLES; ++ i) 
         {
                 const float2 offset = samples[i];
@@ -220 +220 @@
                         sampler2D colors,
                         sampler2D noiseTex,
-                        float2 samples[NUM_SAMPLES],
+                        float2 samples[NUM_PRECOMPUTED_SAMPLES],
                         float3 normal,
                         float3 centerPosition,
@@ -231 +231 @@
                         float convergence,
                         float sampleIntensity,
-                        bool isMovingObject
+                        bool isMovingObject,
+                        int idx
                         )
 {
@@ -237 +238 @@
         float validSamples = .0f;
         float numSamples = .0f;
-
+        
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
@@ -250 +251 @@
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
                         //offset = myreflect(samples[i], mynoise);
-                        offset = myrotate(samples[i + (int)convergence], mynoise.x);
+                        offset = myrotate(samples[i + idx], mynoise.x);
                 }
                 else
                 {
-                        offset = samples[i];
+                        offset = samples[i + idx];
                 }
                 
@@ -334 +335 @@
                    uniform sampler2D normals,
                    uniform sampler2D noiseTex,
-                   uniform float2 samples[NUM_SAMPLES],
+                   uniform float2 samples[NUM_PRECOMPUTED_SAMPLES],
                    uniform sampler2D oldTex,
                    uniform float4x4 modelViewProj,
@@ -394 +395 @@
 
         float usedWeight = min(temporalCoherence, abs(oldWeight));
+        int idx = (int)oldWeight % (int)temporalCoherence;
 
         float3 ao;
@@ -400 +402 @@
         if (eyeSpaceDepth < DEPTH_THRESHOLD)
         {
-                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), usedWeight, sampleIntensity, isMovingObject);
+                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), usedWeight, sampleIntensity, isMovingObject, idx);
                 //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals, sampleIntensity);
         }