Changeset 3309 for GTP

Timestamp:

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

Author:

mattausch

Message:

working on changed sampling scheme for temporal coherence

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• sibenik.env (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (3 diffs)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/deferred.cg (modified) (1 diff)
• src/shaders/ssao.cg (modified) (8 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/sibenik.env

@@ -106 +106 @@
 ssaoSampleIntensity=0.8f
 # ssao temporal coherence factor
-tempCohFactor=2000.0f
+tempCohFactor=150.0f
 # ssao filter radius
 ssaoFilterRadius=12.0f

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

@@ -73 +73 @@
 
 
+
+static Sample2 samples2[NUM_PRECOMPUTED_SAMPLES];
 // ssao random spherical samples
 //static Sample2 samples2[NUM_SAMPLES];
-#define NUM_PRECOMPUTED_SAMPLES 2001
-
-static Sample2 samples2[NUM_PRECOMPUTED_SAMPLES];
+
 // pcf samples
 static Sample2 pcfSamples[NUM_PCF_TABS];
@@ -743 +743 @@
         sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
         
-        static int currentPos = 0;
-
         if (/*mUseTemporalCoherence || */mRegenerateSamples)
         {
@@ -752 +750 @@
                 // in the first case, the sample patterns look nicer, but the kernel
                 // needs longer to converge
-                //if (currentPos + NUM_SAMPLES >= NUM_PRECOMPUTED_SAMPLES)      {
-                        currentPos = 0;
-                        GenerateSamples(mSamplingMethod);
-                //}
+                GenerateSamples(mSamplingMethod);
 
                 //if (mSortSamples) { SortSamples(); }
-                //sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_SAMPLES);
-                sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_PRECOMPUTED_SAMPLES);
-
-                currentPos += NUM_SAMPLES;
-        }
-        
+                //sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
+                sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_PRECOMPUTED_SAMPLES);
+        }
+        
+
         ++ i;
 
         for (int j = 0; j < 4; ++ j, ++ i)
+        {
                 sCgSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
+        }
 
         sCgSsaoProgram->SetMatrix(i ++, mProjViewMatrix);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -5 +5 @@
 ////////////
 //-- ssao + gi parameters
-
+#define NUM_PRECOMPUTED_SAMPLES 200
 //#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16

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

@@ -269 +269 @@
         const float pixelIsValid = 0.0f;
         // means that we only use slight temporal coherence over some frames
-        // so that there si no noticeable drag
+        // so that there is no noticeable drag
         const float pixelCouldBeValid = 2.0f;
         // this pixel information has to be discarded in order to not create artifacts
         const float pixelIsNotValid = 100.0f;
 
-        const float xOffs = 0;// 0.5f / 1024.0f;
-        const float yOffs = 0;// 0.5f / 768.0f;
-
-        if ((oldTexCoords.x < xOffs) || (oldTexCoords.x > (1.0f - xOffs)) || 
-                (oldTexCoords.y < yOffs) || (oldTexCoords.y > (1.0f - yOffs))
+        // check if the pixel was outside of the frame buffer
+        if ((oldTexCoords.x <= 0) || (oldTexCoords.x >= 1.0f) || 
+                (oldTexCoords.y <= 0) || (oldTexCoords.y >= 1.0f)
                 )
         {

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);
         }