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

Timestamp:

11/18/08 11:28:38 (16 years ago)

Author:

mattausch

Message:

filtering working more nicely now

File:

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

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

@@ -112 +112 @@
 }
 
-static void ComputeSampleOffsets(float *sampleOffsets, int w, int h)
-{
-        /*
-        const float xoffs = 0.5f / w;
-        const float yoffs = 0.5f / h;
-
-        sampleOffsets[0] =  xoffs; sampleOffsets[1] =  yoffs;
-        sampleOffsets[2] =  xoffs; sampleOffsets[3] = -yoffs;
-        sampleOffsets[4] = -xoffs; sampleOffsets[5] = -yoffs;
-        sampleOffsets[6] = -xoffs; sampleOffsets[7] =  yoffs;
-        */
-        //const float xoffs = .5f / w;
-        //const float yoffs = .5f / h;
-        
-        const float xoffs = 1.0f / w;
-        const float yoffs = 1.0f / h;
-
-        int idx  = 0;
-
-        for (int x = -1; x <= 1; ++ x)
-        {
-                for (int y = -1; y <= 1; ++ y)
+
+static void ComputeSampleOffsets(float *sampleOffsets, 
+                                                                 int imageW, int imageH,
+                                                                 float width, 
+                                                                 int samples)
+{
+        const float xoffs = width / (float)imageW;
+        const float yoffs = width / (float)imageH;
+        
+        const int numSamples = (int)sqrt((float)samples);
+        const int startSamples = -numSamples / 2;
+        const int endSamples = numSamples + startSamples - 1;
+        //cout << startSamples << " " << endSamples << endl;
+
+        int idx = 0;
+
+        for (int x = startSamples; x <= endSamples; ++ x)
+        {
+                for (int y = startSamples; y <= endSamples; ++ y)
                 {
-                        sampleOffsets[idx + 0] = x * xoffs;
-                        sampleOffsets[idx + 1] = y * yoffs;
-
+                        sampleOffsets[idx + 0] = (float)x * xoffs;
+                        sampleOffsets[idx + 1] = (float)y * yoffs;
                         idx += 2;
-                }
-        }
-}
-
-
-static void ComputeSampleOffsets2(float *sampleOffsets, int w, int h, float width, int samples)
-{
-        const float xoffs = width / (float)w;
-        const float yoffs = width / (float)h;
-        
-        const int numSamples = (int)sqrt((float)samples);
-
-        for (int x = 0; x < numSamples; ++ x)
-        {
-                for (int y = 0; y < numSamples; ++ y)
-                {
-                        int idx = (y * numSamples + x) * 2;
-                        sampleOffsets[idx + 0] = ((float)x - 0.5f * numSamples) * xoffs;
-                        sampleOffsets[idx + 1] = ((float)y - 0.5f * numSamples) * yoffs;
                 }
         }
@@ -434 +411 @@
         ////////////////
 
-        string combineSsaoParams[] = {"colorsTex", "normalsTex", "ssaoTex", "filterOffs", "filterWeights"};
-        sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 5);
+        string combineSsaoParams[] = {"colorsTex", "normalsTex", "ssaoTex", "filterOffs", "filterWeights", "bl", "br", "tl", "tr"};
+        sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 9);
 
         //////////////
@@ -464 +441 @@
         ///////////
 
-#if 0
+        const float filterWidth = 10.0f;
+
+#if 1
         PoissonDiscSampleGenerator2 poisson(NUM_SSAO_FILTERSAMPLES, 1.0f);
         poisson.Generate((float *)ssaoFilterOffsets);
 
-        const float filterWidth = 10.0f;
         const float xoffs = (float)filterWidth / mWidth;
         const float yoffs = (float)filterWidth / mHeight;
@@ -484 +462 @@
         }
 #else
-        //ComputeSampleOffsets(ssaoFilterOffsets, 1024, 768, sqrt(NUM_SSAO_FILTERSAMPLES), NUM_SSAO_FILTERSAMPLES); 
-        ComputeSampleOffsets2(ssaoFilterOffsets, 1024, 768, 5, NUM_SSAO_FILTERSAMPLES); 
-
+        //ComputeSampleOffsets(ssaoFilterOffsets, mWidth, mHeight, sqrt(NUM_SSAO_FILTERSAMPLES), NUM_SSAO_FILTERSAMPLES); 
+        ComputeSampleOffsets(ssaoFilterOffsets, mWidth, mHeight, filterWidth, NUM_SSAO_FILTERSAMPLES); 
+        //cout<<"ssao filter size: " << NUM_SSAO_FILTERSAMPLES << endl;
         for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
                 ssaoFilterWeights[i] = 1.0f;
@@ -829 +807 @@
         sCgCombineSsaoProgram->SetArray1f(i ++, (float *)ssaoFilterWeights, NUM_SSAO_FILTERSAMPLES);
         
+        Vector3 bl = mCornersView[0];
+        Vector3 br = mCornersView[1];
+        Vector3 tl = mCornersView[2];
+        Vector3 tr = mCornersView[3];
+
+        sCgCombineSsaoProgram->SetValue3f(i ++, bl.x, bl.y, bl.z);
+        sCgCombineSsaoProgram->SetValue3f(i ++, br.x, br.y, br.z);
+        sCgCombineSsaoProgram->SetValue3f(i ++, tl.x, tl.y, tl.z);
+        sCgCombineSsaoProgram->SetValue3f(i ++, tr.x, tr.y, tr.z);
+
+
         DrawQuad(sCgCombineSsaoProgram);
         
@@ -968 +957 @@
         sCgDownSampleProgram->SetTexture(0, colorsTex);
 
+        const float filterWidth = 1.0f;
         float downSampleOffsets[NUM_DOWNSAMPLES * 2];
-        ComputeSampleOffsets(downSampleOffsets, fbo->GetWidth(), fbo->GetHeight());
-
+        //ComputeSampleOffsets(downSampleOffsets, fbo->GetWidth(), fbo->GetHeight(), filterWidth, NUM_DOWNSAMPLES);
+        
         sCgDownSampleProgram->SetArray2f(1, (float *)downSampleOffsets, NUM_DOWNSAMPLES);
 
@@ -979 +969 @@
         
         glPopAttrib();
-        
         PrintGLerror("downsample");
 }
@@ -1019 +1008 @@
         DrawQuad(sCgDownSampleProgram);
 
-        PrintGLerror("OUTPUT");
+        PrintGLerror("output");
 }