Changeset 3308 for GTP/trunk/App

Timestamp:

02/12/09 18:51:36 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (4 diffs)

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

@@ -74 +74 @@
 
 // ssao random spherical samples
-static Sample2 samples2[NUM_SAMPLES];
-//#define NUM_PRECOMPUTED_SAMPLES 240
-//static Sample2 samples2[NUM_PRECOMPUTED_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];
@@ -207 +208 @@
         case DeferredRenderer::SAMPLING_QUADRATIC:
                 {
-                        //static QuadraticDiscSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
-                        static QuadraticDiscSampleGenerator2D g(NUM_SAMPLES, 1.0f);
+                        static QuadraticDiscSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
+                        //static QuadraticDiscSampleGenerator2D g(NUM_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);
                 }
@@ -744 +745 @@
         static int currentPos = 0;
 
-        if (mUseTemporalCoherence || mRegenerateSamples)
+        if (/*mUseTemporalCoherence || */mRegenerateSamples)
         {
                 mRegenerateSamples = false;
@@ -757 +758 @@
 
                 //if (mSortSamples) { SortSamples(); }
-                sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_SAMPLES);
+                //sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_SAMPLES);
+                sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_PRECOMPUTED_SAMPLES);
 
                 currentPos += NUM_SAMPLES;