Changeset 3231

Timestamp:

12/22/08 18:42:52 (16 years ago)

Author:

mattausch

Message:

worked on sampling pattern

Location:

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

Files:

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

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

@@ -71 +71 @@
 
 // ssao random spherical samples
-static Sample2 samples2[NUM_SAMPLES];
+//static Sample2 samples2[NUM_SAMPLES];
+#define NUM_PRECOMPUTED_SAMPLES 240
+static Sample2 samples2[NUM_PRECOMPUTED_SAMPLES];
 // number of pcf tabs
 static Sample2 pcfSamples[NUM_PCF_TABS];
@@ -204 +206 @@
         case DeferredRenderer::SAMPLING_QUADRATIC:
                 {
-                        static QuadraticDiscSampleGenerator2D g(NUM_SAMPLES, 1.0f);
+                        static QuadraticDiscSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);
                 }
@@ -704 +706 @@
         sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
         
+        static int currentPos = 0;
+
         if (mUseTemporalCoherence || mRegenerateSamples)
         {
@@ -711 +715 @@
                 // in the first case, the sample patterns look nicer, but the kernel
                 // needs longer to converge
-                GenerateSamples(mSamplingMethod);
+                if (currentPos + NUM_SAMPLES >= NUM_PRECOMPUTED_SAMPLES)
+                {
+                        currentPos = 0;
+                        GenerateSamples(mSamplingMethod);
+                }
 
                 //if (mSortSamples) { SortSamples(); }
-                sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
+                sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_SAMPLES);
+
+                currentPos += NUM_SAMPLES;
         }
         

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

@@ -245 +245 @@
                 //-- (affects performance for some reason!)
 
-                if (convergence < 700)
+                if (1)//convergence < 700)
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;