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

Timestamp:

02/11/09 15:52:01 (15 years ago)

Author:

mattausch

Message:

working on seperable filtering

File:

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

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

@@ -396 +396 @@
         sCgCombineIllumProgram = sm->CreateFragmentProgram("globillum", "combine", "CombineGi");
         //sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoHalfRes", "CombineSsao");
-        sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsao", "CombineSsaoFullRes", "CombineSsao");
+        sCgCombineSsaoProgram = sm->CreateFragmentProgram("combineSsaoSep", "CombineSsaoFullRes", "CombineSsao");
         sCgAntiAliasingProgram = sm->CreateFragmentProgram("antialiasing", "main", "AntiAliasing");
         sCgToneProgram = sm->CreateFragmentProgram("tonemap", "ToneMap", "ToneMap");
@@ -443 +443 @@
         ////////////////
 
-        string combineSsaoParams[] = 
+        /*string combineSsaoParams[] = 
                 {"colorsTex", "normalsTex", "ssaoTex", "filterOffs", "filterWeights", 
                 "ssaoFilterRadius", "modelViewProj", "bl", "br", "tl", 
                 "tr", "w", "h"};
-
-        sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 13);
+        */
+        string combineSsaoParams[] = 
+                {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "xyStep"};
+
+        //sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 13);
+        sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 7);
+
 
         //////////////
@@ -1033 +1038 @@
 
         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);
+        //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)
@@ -1047 +1051 @@
         }
 
-        sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetWidth());
-        sCgCombineSsaoProgram->SetValue1f(i ++, mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetHeight());
+        //sCgCombineSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 1.0f / (float)mHeight);
+        sCgCombineSsaoProgram->SetValue2f(i ++, 1.0f / (float)mWidth, 0);
 
         DrawQuad(sCgCombineSsaoProgram);