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

Timestamp:

11/25/08 18:14:48 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -71 +71 @@
 
 
-static float ssaoFilterOffsets[NUM_SSAO_FILTERSAMPLES * 2];
-static float ssaoFilterWeights[NUM_SSAO_FILTERSAMPLES];
+static float ssaoFilterOffsets[NUM_SSAO_FILTER_SAMPLES * 2];
+static float ssaoFilterWeights[NUM_SSAO_FILTER_SAMPLES];
 
 
@@ -445 +445 @@
         
         string prepareSsaoParams[] = 
-                {"colorsTex", "oldTex", "oldEyePos", "modelViewProj", "oldModelViewProj",
-                 "oldbl", "oldbr", "oldtl", "oldtr", "diffVals"};
-
-        sCgPrepareSsaoProgram->AddParameters(prepareSsaoParams, 0, 10);
+                {"colorsTex", "normalsTex", "diffVals", "oldTex", 
+                 "oldEyePos", "modelViewProj", "oldModelViewProj",
+                 "oldbl", "oldbr", "oldtl", "oldtr"};
+
+        sCgPrepareSsaoProgram->AddParameters(prepareSsaoParams, 0, 11);
 
 
         ////////////////
 
-
-        //const float filterWidth = 100.0f;
-        const float filterWidth = 30.0f;
-        //const float filterWidth = 15.0f;
-
-        PoissonDiscSampleGenerator2 poisson(NUM_SSAO_FILTERSAMPLES, 1.0f);
+        const float filterWidth = 1.0f;
+
+        PoissonDiscSampleGenerator2 poisson(NUM_SSAO_FILTER_SAMPLES, 1.0f);
         poisson.Generate((float *)ssaoFilterOffsets);
 
@@ -464 +462 @@
         const float yoffs = (float)filterWidth / mHeight;
 
-        for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
+        for (int i = 0; i < NUM_SSAO_FILTER_SAMPLES; ++ i)
         {
                 float x = ssaoFilterOffsets[2 * i + 0];
@@ -516 +514 @@
                 //DownSample(fbo, colorBufferIdx, mDownSampleFbo, 0, sCgScaleDepthProgram);
                 PrepareSsao(fbo);
-                DownSample(fbo, 1, mDownSampleFbo, 1, sCgDownSampleProgram); // normals
-                DownSample(fbo, 2, mDownSampleFbo, 2, sCgDownSampleProgram); // offsets
+                //DownSample(fbo, 1, mDownSampleFbo, 1, sCgDownSampleProgram); // normals
+                //DownSample(fbo, 2, mDownSampleFbo, 2, sCgDownSampleProgram); // offsets
         }
 
@@ -570 +568 @@
 
 
+
+static inline float SqrMag(const Sample2 &s)
+{
+        return (s.x * s.x + s.y * s.y);
+}
+
+
+static inline float SqrDist(const Sample2 &a, const Sample2 &b)
+{
+        float x = a.x - b.x;
+        float y = a.y - b.y;
+        
+        return x * x + y * y;
+}
+
+
+static inline bool lt(const Sample2 &a, const Sample2 &b)
+{
+        return SqrMag(a) < SqrMag(b);
+}
+
+
+void DeferredRenderer::SortSamples()
+{
+        //for (int i = 0; i < NUM_SAMPLES; ++ i)cout << SqrDist(samples2[i-1], samples2[i]) << "|";
+        float dist = 0;
+        for (int i = 1; i < NUM_SAMPLES; ++ i)
+                dist += SqrDist(samples2[i-1], samples2[i]);
+                //cout << samples2[i].x << " " << samples2[i].y 
+
+        //cout << "\nbefore: " << dist << endl;
+
+        //sort(samples2, samples2 + sizeof(samples2) / sizeof(Sample2), lt2);
+
+
+        static Sample2 tempSamples[NUM_SAMPLES];
+        static bool checked[NUM_SAMPLES];
+
+        for (int i = 0; i < NUM_SAMPLES; ++ i)
+                checked[i] = false;
+
+        Sample2 currentSample;
+        currentSample.x = 0; currentSample.y = 0;
+        int ns = 0; // the next sample index
+
+        for (int i = 0; i < NUM_SAMPLES; ++ i)
+        {
+                float minLen = 1e20f;
+
+                for (int j = 0; j < NUM_SAMPLES; ++ j)
+                {
+                        if (checked[j]) continue;
+
+                        Sample2 s = samples2[j];
+                        const float len = SqrDist(s, currentSample);
+
+                        if (len < minLen) 
+                        {
+                                minLen = len;
+                                ns = j;
+                        }
+                }
+
+                tempSamples[i] = samples2[ns];
+                currentSample = samples2[ns];
+                checked[ns] = true;
+        }
+
+        for (int i = 0; i < NUM_SAMPLES; ++ i)
+                samples2[i] = tempSamples[i];
+
+        dist = 0;
+        for (int i = 1; i < NUM_SAMPLES; ++ i)
+                dist += SqrDist(samples2[i-1], samples2[i]);
+                //cout << samples2[i].x << " " << samples2[i].y << " " << SqrDist(samples2[i-1], samples2[i]) << "|";
+
+        //cout << "after:  " << dist << endl;
+}
+
+
 void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, 
                                                                    float tempCohFactor)
@@ -616 +694 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod);
+
+                SortSamples();
                 sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
         }
@@ -821 +901 @@
         sCgCombineSsaoProgram->SetTexture(i ++, ssaoTex);
 
-        sCgCombineSsaoProgram->SetArray2f(i ++, (float *)ssaoFilterOffsets, NUM_SSAO_FILTERSAMPLES);
-        sCgCombineSsaoProgram->SetArray1f(i ++, (float *)ssaoFilterWeights, NUM_SSAO_FILTERSAMPLES);
+        sCgCombineSsaoProgram->SetArray2f(i ++, (float *)ssaoFilterOffsets, NUM_SSAO_FILTER_SAMPLES);
+        sCgCombineSsaoProgram->SetArray1f(i ++, (float *)ssaoFilterWeights, NUM_SSAO_FILTER_SAMPLES);
         
         sCgCombineSsaoProgram->SetMatrix(i++, mProjViewMatrix);
@@ -957 +1037 @@
 void DeferredRenderer::PrepareSsao(FrameBufferObject *fbo)
 {
-        GLuint colorsTex, diffVals, oldTex;
+        GLuint colorsTex, normalsTex, diffVals, oldTex;
 
         colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
-        //normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+        normalsTex = fbo->GetColorBuffer(1)->GetTexture();
         diffVals = fbo->GetColorBuffer(2)->GetTexture();
         //diffVals = mDownSampleFbo->GetColorBuffer(2)->GetTexture();
@@ -970 +1050 @@
 
         sCgPrepareSsaoProgram->SetTexture(i ++, colorsTex);
-        //sCgSsaoProgram->SetTexture(i ++, normalsTex);
+        sCgPrepareSsaoProgram->SetTexture(i ++, normalsTex);
+        sCgPrepareSsaoProgram->SetTexture(i ++, diffVals);
         sCgPrepareSsaoProgram->SetTexture(i ++, oldTex);
 
@@ -986 +1067 @@
                 sCgPrepareSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
 
-        sCgPrepareSsaoProgram->SetTexture(i ++, diffVals);
-
-
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(0, 0, mDownSampleFbo->GetWidth(), mDownSampleFbo->GetHeight());
@@ -994 +1072 @@
         mDownSampleFbo->Bind();
 
-        glDrawBuffers(1, mrt + 0);
+        glDrawBuffers(3, mrt + 0);
 
         DrawQuad(sCgPrepareSsaoProgram);