Changeset 3135

Timestamp:

11/18/08 12:30:49 (16 years ago)

Author:

mattausch

Message:

working ok (most of the aa is also there for not-ssao mode, so it is probabl a matter of correct aa)

Location:

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

Files:

• DeferredRenderer.cpp (modified) (4 diffs)
• DeferredRenderer.h (modified) (1 diff)
• chcdemo.cpp (modified) (1 diff)
• shaders/combineSsao.cg (modified) (4 diffs)

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

@@ -286 +286 @@
 mSamplingMethod(SAMPLING_POISSON),
 mShadingMethod(DEFAULT),
-mIllumFboIndex(0),
-invTrafo(IdentityMatrix())
+mIllumFboIndex(0)
 {
         ///////////
@@ -441 +440 @@
         ///////////
 
-        const float filterWidth = 10.0f;
+        const float filterWidth = 50.0f;
 
 #if 1
@@ -512 +511 @@
 
         // antialiasing of the color buffer
-        AntiAliasing(fbo, light);
+        //AntiAliasing(fbo, light);
 
         switch (mShadingMethod)
@@ -538 +537 @@
         }
 
+        AntiAliasing(fbo, light);
+
         Output(fbo);
 

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

@@ -60 +60 @@
         static int colorBufferIdx;
 
-        Matrix4x4 invTrafo;
 
 protected:

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

@@ -1132 +1132 @@
                         shadingMethod = DeferredRenderer::DEFAULT;
 
-                deferredShader->invTrafo = invTrafo;
                 deferredShader->SetShadingMethod(shadingMethod);
                 deferredShader->SetSamplingMethod(samplingMethod);

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

@@ -62 +62 @@
 }
 
-#define USE_POSITION
+//#define USE_POSITION
 
 float DiscontinuityFilter(float2 texCoord,
@@ -109 +109 @@
 #endif
                 normalFactor = max(step(0.6f, dot(sampleNorm, norm)), 1e-3f);
-                convergenceFactor = min(60.0f, aoSample.y) * 0.01f;//max(step(18.5f, aoSample.y), 1e-3f);
+                convergenceFactor = min(100.0f, aoSample.y) * 0.01f;//max(step(18.5f, aoSample.y), 1e-3f);
 
                 w = filterWeights[i] * normalFactor * depthFactor * convergenceFactor;
@@ -176 +176 @@
                 //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, adaptFactor * scaleFactor  / (adaptFactor + ao.y), 0);
 
-                if (ao.y < 60.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, scaleFactor, bl, br, tl, tr);
+                if (ao.y < 50.5f) ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, ao.z, bl, br, tl, tr);
                 //ao.x = DiscontinuityFilter(IN.texCoord, ao, ssaoTex, normalsTex, filterOffs, filterWeights, 1, 0);
         }
@@ -189 +189 @@
         //      if (ao.y < 10.5f) OUT.illum_col.xyz = float3(0, 10000, 0);
         //OUT.illum_col = float4(dummy3, dummy3, dummy3, col.w);
-        OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
+        //OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
 
         //OUT.illum_col.xyz = float3(1.0f - ao.x, dummy2, 0);//dummy2);