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

Timestamp:

11/20/08 13:09:15 (16 years ago)

Author:

mattausch

Message:

done a little cleanup

File:

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

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

@@ -57 +57 @@
 static ShaderProgram *sCgToneProgram = NULL;
 static ShaderProgram *sCgDownSampleProgram = NULL;
-static ShaderProgram *sCgSmoothSsaoProgram = NULL;
 static ShaderProgram *sCgScaleDepthProgram = NULL;
 
@@ -374 +373 @@
         sCgScaleDepthProgram = sm->CreateFragmentProgram("deferred", "ScaleDepth", "ScaleDepth");
         sCgLogLumProgram = sm->CreateFragmentProgram("tonemap", "CalcAvgLogLum", "avgLogLum");
-        sCgSmoothSsaoProgram = sm->CreateFragmentProgram("combineSsao", "smoothSsao", "smoothSsao");
 
 
@@ -441 +439 @@
         ////////////////
 
-        string smoothSsaoParams[] = {"normalsTex", "ssaoTex", "filterOffs", "filterWeights"};
-        sCgSmoothSsaoProgram->AddParameters(smoothSsaoParams, 0, 4);
-        
-        
-        ///////////
 
         const float filterWidth = 100.0f;
@@ -526 +519 @@
         case SSAO:
                 ComputeSsao(fbo, tempCohFactor);
-                //SmoothSsao(fbo);
                 CombineSsao(fbo);
                 break;
@@ -810 +802 @@
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        //GLuint ssaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
         GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
         
@@ -816 +807 @@
 
         int i = 0;
+
         sCgCombineSsaoProgram->SetTexture(i ++, colorsTex);
         sCgCombineSsaoProgram->SetTexture(i ++, normalsTex);
@@ -827 +819 @@
         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);
 
 
@@ -1117 +1104 @@
 
 
-void DeferredRenderer::SmoothSsao(FrameBufferObject *fbo)
-{
-        mIllumFbo->Bind();
-
-        GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
-
-        // overwrite old ssao texture
-        glDrawBuffers(1, mrt + 2 - mIllumFboIndex);
-
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());
-
-        int i = 0;
-        sCgSmoothSsaoProgram->SetTexture(i ++, normalsTex);
-        sCgSmoothSsaoProgram->SetTexture(i ++, ssaoTex);
-
-        sCgSmoothSsaoProgram->SetArray2f(i ++, (float *)ssaoFilterOffsets, NUM_SSAO_FILTERSAMPLES);
-        sCgSmoothSsaoProgram->SetArray1f(i ++, (float *)ssaoFilterWeights, NUM_SSAO_FILTERSAMPLES);
-        
-        DrawQuad(sCgSmoothSsaoProgram);
-
-        glPopAttrib();
-
-        PrintGLerror("combine ssao");
-}
-
-
 } // namespace