Changeset 3299 for GTP/trunk/App

Timestamp:

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

Author:

mattausch

Message:

working on seperable filtering

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• src/DeferredRenderer.cpp (modified) (4 diffs)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/combineSsao.cg (modified) (3 diffs)
• vienna.env (modified) (1 diff)

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);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -66 +66 @@
 #define USE_GTX
 
+#define SSAO_FILTER_RADIUS 3
+
 #endif // __SHADERENV_H

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/combineSsao.cg

@@ -107 +107 @@
                                                  uniform float3 tl,
                                                  uniform float3 tr,
-                                                 uniform float w,
-                                                 uniform float h
+                                                 uniform float2 resolution
                                                  )
 {
@@ -200 +199 @@
                                                  uniform float3 tl,
                                                  uniform float3 tr,
-                                                 uniform float w,
-                                                 uniform float h
+                                                 uniform float2 resolution
                                                  )
 {
@@ -233 +231 @@
         // just apply ssao if we are not in the sky
         if (col.w < 1e10f)
+        {
                 OUT.illum_col.xyz = col.xyz * max(2e-2f, 1.0f - ao.x);
                 //OUT.illum_col.xyz = col.xyz * ao.x;
+        }
         else
+        {
                 OUT.illum_col.xyz = col.xyz;
+        }
 
         OUT.illum_col.w = col.w;

GTP/trunk/App/Demos/Vis/FriendlyCulling/vienna.env

@@ -78 +78 @@
 
 # the used render method (forward, forward + depth pass, deferred, deferred + depth pass
-#renderMethod=2
-renderMethod=0
+renderMethod=2
+#renderMethod=0
 
 #modelPath=data/city/model/