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

Timestamp:

02/12/09 14:38:14 (15 years ago)

Author:

mattausch

Message:

removed filter radius

File:

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

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

@@ -248 +248 @@
         //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_MAG_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -300 +299 @@
 mSortSamples(true),
 mKernelRadius(1e-8f),
-mSsaoFilterRadius(12.0f),
 mSampleIntensity(0.2f),
 mSunVisiblePixels(0),
@@ -309 +307 @@
 mUseToneMapping(false),
 mUseAntiAliasing(false),
-mUseDepthOfField(false)
+mUseDepthOfField(false),
+mSsaoUseFullResolution(ssaoUseFullResolution)
 {
         ///////////
@@ -316 +315 @@
         int downSampledWidth, downSampledHeight;
 
-        if (ssaoUseFullResolution)
+        if (mSsaoUseFullResolution)
         {
                 downSampledWidth = w; downSampledHeight = h;
@@ -327 +326 @@
         }
 
-        ///////
+
+        /////////
         //-- the illumination fbo is either half size or full size
 
         mIllumFbo = new FrameBufferObject(downSampledWidth, downSampledHeight, FrameBufferObject::DEPTH_NONE);
-
         mFBOs.push_back(mIllumFbo);
 
@@ -343 +342 @@
         ///////////////
         //-- the downsampled ssao + color bleeding textures: 
-        //-- as GI is mostly low frequency, we can use lower resolution toimprove performance
+        //-- as GI is mostly low frequency, we can use lower resolution to improve performance
 
         mDownSampleFbo = new FrameBufferObject(downSampledWidth, downSampledHeight, FrameBufferObject::DEPTH_NONE);
@@ -358 +357 @@
 
         mFBOs.push_back(mDownSampleFbo);
+
+
+        /////////
+        //-- temporal buffer
+
+        mTempFbo = new FrameBufferObject(mWidth, mHeight, FrameBufferObject::DEPTH_NONE);
+        mFBOs.push_back(mTempFbo);
+
+        mTempFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
+        FrameBufferObject::InitBuffer(mTempFbo, 0);
+        
 
         // create noise texture for ssao
@@ -397 +407 @@
         sCgGiProgram = sm->CreateFragmentProgram("globillum", "main", "GiFrag");
         sCgCombineIllumProgram = sm->CreateFragmentProgram("globillum", "combine", "CombineGi");
-        //sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoHalfRes", "CombineSsao");
-        sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "CombineSsaoFullRes", "CombineSsao");
-        sCgFilterSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "FilterSsaoFullRes", "FilterSsao");
+
+        if (mSsaoUseFullResolution)
+        {
+                sCgFilterSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "FilterSsaoFullRes", "FilterSsao");
+        }
+        else
+        {
+                sCgFilterSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "FilterSsaoHalfRes", "FilterSsao");
+        }
+        
+        sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "CombineSsao", "CombineSsao");
         sCgAntiAliasingProgram = sm->CreateFragmentProgram("antialiasing", "main", "AntiAliasing");
         sCgToneProgram = sm->CreateFragmentProgram("tonemap", "ToneMap", "ToneMap");
@@ -446 +464 @@
         ////////////////
 
-        /*string combineSsaoParams[] = 
-                {"colorsTex", "normalsTex", "ssaoTex", "filterOffs", "filterWeights", 
-                "ssaoFilterRadius", "modelViewProj", "bl", "br", "tl", 
-                "tr", "w", "h"};
-        */
         string combineSsaoParams[] = 
-                {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "xyStep"};
+        {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "res"};
 
         //sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 13);
@@ -461 +474 @@
 
         string filterSsaoParams[] = 
-                {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "xyStep"};
+                {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "res"};
 
         sCgFilterSsaoProgram->AddParameters(filterSsaoParams, 0, 7);
@@ -515 +528 @@
 
         sCgDOFProgram->AddParameters(dofParams, 0, 4);
-
-
-        ////////////////
-        //-- prepare filter for ssao
-
-        PrepareSsaoFilter();
 
 
@@ -642 +649 @@
 }
 
-#if 0
-
-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; ++ i)
-        {
-                float x = ssaoFilterOffsets[2 * i + 0];
-                float y = ssaoFilterOffsets[2 * i + 1];
-
-                ssaoFilterWeights[i] = GaussianDistribution(x, y, 1.0f);
-                //ssaoFilterWeights[i] = 1.0f;
-
-                ssaoFilterOffsets[2 * i + 0] *= xoffs;
-                ssaoFilterOffsets[2 * i + 1] *= yoffs;
-        }
-}
-
-#else
-
-/** star filter
-*/
-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;
-
-        const int n = NUM_SSAO_FILTER_SAMPLES / 2 + 1;
-
-        for (int i = 0; i < n; ++ i)
-        {
-                const int idx = i - NUM_SSAO_FILTER_SAMPLES / 4;
-
-                const float x = xoffs * (float)idx;
-                const float y = 0;
-
-                ssaoFilterWeights[i] = GaussianDistribution(x, y, 1.0f);
-                
-                ssaoFilterOffsets[2 * i + 0] = x;
-                ssaoFilterOffsets[2 * i + 1] = y;
-        }
-
-        int j = 2 * n;
-
-        for (int i = 0; i < n; ++ i)
-        { 
-                const int idx = i - NUM_SSAO_FILTER_SAMPLES / 4;
-
-                if (idx)
-                {
-                        const float x = 0;
-                        const float y = yoffs * (float)idx;
-
-                        ssaoFilterWeights[i] = GaussianDistribution(x, y, 1.0f);
-                        //ssaoFilterWeights[i] = 1.0f;
-                        
-                        ssaoFilterOffsets[j + 0] = x;
-                        ssaoFilterOffsets[j + 1] = y;
-
-                        j += 2;
-                }
-        }
-
-        for (int i = 0; i < NUM_SSAO_FILTER_SAMPLES; ++ i)
-        {
-                cout << "samples " << i << ": " << ssaoFilterOffsets[i * 2] << " " << ssaoFilterOffsets[i * 2 + 1] << endl;
-        }
-}
-
-#endif
-
 
 static inline float SqrMag(const Sample2 &s)
@@ -1045 +969 @@
         GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
         
-        mIllumFbo->Bind();
-        glDrawBuffers(1, mrt + mIllumFboIndex + 1);
-        
-
+        //mIllumFbo->Bind();
+        //glDrawBuffers(1, mrt + mIllumFboIndex + 1);
+        mTempFbo->Bind();
+        glDrawBuffers(1, mrt);
+        
         int i = 0;
 
@@ -1059 +984 @@
         }
 
-        sCgFilterSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 0);
+        sCgFilterSsaoProgram->SetValue2f(i ++, (float)mWidth, (float)mHeight);
 
         DrawQuad(sCgFilterSsaoProgram);
-        
         PrintGLerror("combine ssao");
 }
@@ -1071 +995 @@
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex + 1)->GetTexture();
+        //GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex + 1)->GetTexture();
+        GLuint ssaoTex = mTempFbo->GetColorBuffer(0)->GetTexture();
         
         FlipFbos(fbo);
@@ -1080 +1005 @@
         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)
         {
@@ -1090 +1010 @@
         }
 
-        //float xOffs, yOffs;
-
-        //sCgCombineSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 1.0f / (float)mHeight);
-        sCgCombineSsaoProgram->SetValue2f(i ++, 0, 1.0f / (float)mHeight);
+        sCgCombineSsaoProgram->SetValue2f(i ++, mWidth, mHeight);
 
         DrawQuad(sCgCombineSsaoProgram);
@@ -1545 +1462 @@
 
 
-void DeferredRenderer::SetSsaoFilterRadius(float ssaoFilterRadius)
-{
-        mSsaoFilterRadius = ssaoFilterRadius;
-        mRegenerateSamples = true;
-}
-
-
 /*void DeferredRenderer::SetSortSamples(bool sortSamples) 
 {