Changeset 3313 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

02/16/09 17:08:51 (15 years ago)

Author:

mattausch

Message:

reverted back to before poisson sampling scheme

File:

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

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

@@ -71 +71 @@
 static GLuint noiseTex2D = 0;
 static GLuint noiseTex1D = 0;
-static GLuint sampleTex2D = 0;
-
-
-static Sample2 samples2[NUM_PRECOMPUTED_SAMPLES];
+
+
 // 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];
 // pcf samples
 static Sample2 pcfSamples[NUM_PCF_TABS];
@@ -92 +91 @@
 /** Helper method that computes the view vectors in the corners of the current view frustum.
 */
-static void ComputeViewVectors(PerspectiveCamera *cam, 
-                                                           Vector3 &bl,
-                                                           Vector3 &br, 
-                                                           Vector3 &tl,
-                                                           Vector3 &tr)
+static void ComputeViewVectors(PerspectiveCamera *cam, Vector3 &bl, Vector3 &br, Vector3 &tl, Vector3 &tr)
 {
         Vector3 ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr;
@@ -212 +207 @@
         case DeferredRenderer::SAMPLING_QUADRATIC:
                 {
-                        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);
                 }
@@ -262 +257 @@
 
         cout << "created noise texture" << endl;
-
-        PrintGLerror("noisetexture");
-}
-
-
-static void CreateSampleTex(Sample2 *samples, int numSamples)
-{
-        glEnable(GL_TEXTURE_2D);
-        glGenTextures(1, &sampleTex2D);
-        glBindTexture(GL_TEXTURE_2D, sampleTex2D);
-                
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-        int w = numSamples;
-        int h = 1;
-
-        float *tempBuffer = new float[numSamples * 3];
-
-        for (int i = 0; i < numSamples; ++ i)
-        {
-                tempBuffer[i * 3 + 0] = samples[i].x;
-                tempBuffer[i * 3 + 1] = samples[i].y;
-                tempBuffer[i * 3 + 2] = 0;
-                
-        }
-
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F_ARB, w, h, 0, GL_RGB, GL_FLOAT, (float *)tempBuffer);
-
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_2D);
-
-        cout << "created sample texture" << endl;
-
-        delete [] tempBuffer;
 
         PrintGLerror("noisetexture");
@@ -469 +427 @@
 
         string ssaoParams[] = 
-            {"colors", "normals", "oldTex", "noiseTex", "temporalCoherence", 
+                {"colors", "normals", "oldTex", "noiseTex", "temporalCoherence", 
                  "samples", "bl", "br", "tl", "tr", 
                  "modelViewProj", "oldModelViewProj", "oldEyePos", "oldbl", "oldbr", 
                  "oldtl", "oldtr", "attribsTex", "kernelRadius", "sampleIntensity"};
-        
         sCgSsaoProgram->AddParameters(ssaoParams, 0, 20);
         
@@ -783 +740 @@
         sCgSsaoProgram->SetTexture(i ++, noiseTex2D);
 
-        sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : .0f);
-        
-        if (/*mUseTemporalCoherence || */mRegenerateSamples)
+        sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
+        
+        static int currentPos = 0;
+
+        if (mUseTemporalCoherence || mRegenerateSamples)
         {
                 mRegenerateSamples = false;
@@ -792 +751 @@
                 // in the first case, the sample patterns look nicer, but the kernel
                 // needs longer to converge
-                GenerateSamples(mSamplingMethod);
-                CreateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+                //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, NUM_PRECOMPUTED_SAMPLES);
-                sCgSsaoProgram->SetTexture(i, sampleTex2D);
-        }
-        
-
+                sCgSsaoProgram->SetArray2f(i, (float *)samples2 + currentPos, NUM_SAMPLES);
+
+                currentPos += NUM_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);
@@ -815 +774 @@
         de.y = mOldEyePos.y - mEyePos.y; 
         de.z = mOldEyePos.z - mEyePos.z;
-
 
         sCgSsaoProgram->SetValue3f(i ++, de.x, de.y, de.z);