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

Timestamp:

02/10/09 17:43:43 (15 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

@@ -395 +395 @@
         sCgGiProgram = sm->CreateFragmentProgram("globillum", "main", "GiFrag");
         sCgCombineIllumProgram = sm->CreateFragmentProgram("globillum", "combine", "CombineGi");
-        sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoHalfRes", "CombineSsao");
+        //sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoHalfRes", "CombineSsao");
+        sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoFullRes", "CombineSsao");
         sCgAntiAliasingProgram = sm->CreateFragmentProgram("antialiasing", "main", "AntiAliasing");
         sCgToneProgram = sm->CreateFragmentProgram("tonemap", "ToneMap", "ToneMap");
@@ -624 +625 @@
 }
 
+#if 0
 
 void DeferredRenderer::PrepareSsaoFilter()
@@ -647 +649 @@
         }
 }
+
+#else
+
+void DeferredRenderer::PrepareSsaoFilter()
+{
+        const float filterWidth = 1.0f;
+
+        PoissonDiscSampleGenerator2D poisson(NUM_SSAO_FILTER_SAMPLES, 1.0f);
+        poisson.Generate((float *)ssaoFilterOffsets);
+
+        const float xoffs = (float)filterWidth / mWidth;
+        const float yoffs = (float)filterWidth / mHeight;
+
+        for (int i = 0; i < NUM_SSAO_FILTER_SAMPLES / 2; ++ i)
+        {
+                float x = xoffs * (i - NUM_SSAO_FILTER_SAMPLES / 4);
+                float y = 0;
+
+                ssaoFilterWeights[i] = GaussianDistribution(x, y, 1.0f);
+                
+                ssaoFilterOffsets[2 * i + 0] = xoffs;
+                ssaoFilterOffsets[2 * i + 1] = yoffs;
+        }
+
+        for (int i = 0; i < NUM_SSAO_FILTER_SAMPLES / 2; ++ i)
+        {
+                float x = 0;
+                float y = yoffs * (i - NUM_SSAO_FILTER_SAMPLES / 4);
+
+                ssaoFilterWeights[i] = GaussianDistribution(x, y, 1.0f);
+                //ssaoFilterWeights[i] = 1.0f;
+
+                ssaoFilterOffsets[2 * (NUM_SSAO_FILTER_SAMPLES / 2 + i) + 0] *= xoffs;
+                ssaoFilterOffsets[2 * (NUM_SSAO_FILTER_SAMPLES / 2 + i) + 1] *= yoffs;
+        }
+}
+
+#endif
 
 
@@ -983 +1023 @@
 
         for (int j = 0; j < 4; ++ j, ++ i)
+        {
                 sCgCombineSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
+        }
+
+        sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetWidth());
+        sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetHeight());
+
+        DrawQuad(sCgCombineSsaoProgram);
+        
+        PrintGLerror("combine ssao");
+}
+
+
+void DeferredRenderer::CombineSsao2(FrameBufferObject *fbo)
+{
+        GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
+        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+        GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
+        
+        FlipFbos(fbo);
+
+        int i = 0;
+
+        sCgCombineSsaoProgram->SetTexture(i ++, colorsTex);
+        sCgCombineSsaoProgram->SetTexture(i ++, normalsTex);
+        sCgCombineSsaoProgram->SetTexture(i ++, ssaoTex);
+
+        sCgCombineSsaoProgram->SetArray2f(i ++, (float *)ssaoFilterOffsets, NUM_SSAO_FILTER_SAMPLES);
+        sCgCombineSsaoProgram->SetArray1f(i ++, (float *)ssaoFilterWeights, NUM_SSAO_FILTER_SAMPLES);
+        sCgCombineSsaoProgram->SetValue1f(i ++, mSsaoFilterRadius);
+
+        sCgCombineSsaoProgram->SetMatrix(i++, mProjViewMatrix);
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+        {
+                sCgCombineSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
+        }
 
         sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetWidth());