Changeset 3205

Timestamp:

12/02/08 17:32:17 (16 years ago)

Author:

mattausch

Message:

as good as i cab do it right now but flickering when dynamic object enters + if dynamic object stops

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• shaders/combineSsao.cg (modified) (4 diffs)
• shaders/ssao.cg (modified) (2 diffs)

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

@@ -305 +305 @@
         //-- the flip-flop fbos
 
-        //const int dsw = w / 2; const int dsh = h / 2;
-        //const int dsw = 128; const int dsh = 96;
-        const int dsw = 16; const int dsh = 12;
+        const int dsw = w / 2; const int dsh = h / 2;
         //const int dsw = w; const int dsh = h;
 
@@ -435 +433 @@
         string combineSsaoParams[] = 
                 {"colorsTex", "normalsTex", "ssaoTex", "filterOffs", 
-                 "filterWeights", "modelViewProj", "bl", "br", "tl", "tr"};
-        sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 10);
+                 "filterWeights", "modelViewProj", "bl", "br", "tl", "tr", "w", "h"};
+        sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 12);
 
         //////////////
@@ -906 +904 @@
                 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);
         

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

@@ -165 +165 @@
                           uniform float3 br,
                           uniform float3 tl,
-                          uniform float3 tr
+                          uniform float3 tr,
+                          uniform float3 w,
+                          uniform float3 h
                           )
 {
@@ -177 +179 @@
         // will be interpolated when upsampling and filter size does not match!
         float4 texelCenterConv;
-        //const float w = 512.0f; const float h = 384.0f;
-        //const float w = 128.0f; const float h = 96.0f;
-        const float w = 16.0f; const float h = 12.0f;
         const float xoffs = .5f / w; const float yoffs = .5f / h;
 
@@ -186 +185 @@
         center.x = (floor(IN.texCoord.x * w - .5f) + 1.0f) / w;
         center.y = (floor(IN.texCoord.y * h - .5f) + 1.0f) / h;
-//center=IN.texCoord;
+
         texelCenterConv.x = tex2Dlod(ssaoTex, float4(center + float2( xoffs,  yoffs), 0, 0)).y;
         texelCenterConv.y = tex2Dlod(ssaoTex, float4(center + float2( xoffs, -yoffs), 0, 0)).y;
@@ -225 +224 @@
 
         //OUT.illum_col.xyz = float3(ao.x, ao.x, step(thres, convergence));
-        OUT.illum_col.xyz = float3(0, convergence, 0);
+        //OUT.illum_col.xyz = float3(0, convergence, 0);
         //OUT.illum_col.xyz = float3(abs(center.x - IN.texCoord.x) * 16.0f, abs(center.y - IN.texCoord.y) * 12.0f, 0);
         

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

@@ -149 +149 @@
         {
                 // pixel valid => retrieve the convergence weight
-                w = 10.0f;//oldPixel.y;
+                w = oldPixel.y;
         }
         else
@@ -416 +416 @@
 
         const float squaredLen = SqrLen(diffVec);
-/*      
+
         if (ao.y > 4.0f) oldWeight = 0;
         else if ((ao.y > 1.0f) && (squaredLen < DYNAMIC_OBJECTS_THRESHOLD))
                 oldWeight = min(oldWeight, 4.0f * NUM_SAMPLES);
-*/      
+        
         const float newWeight = ao.z;
 
         // blend between old and new samples (and avoid division by zero)
         OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight) / max(1e-6f, (newWeight + oldWeight));
-        OUT.illum_col.y = oldWeight;//clamp(newWeight + oldWeight, .0f, temporalCoherence);
+        OUT.illum_col.y = clamp(newWeight + oldWeight, .0f, temporalCoherence);
 
         OUT.illum_col.z = SqrLen(diffVec);