Changeset 3328

Timestamp:

02/25/09 17:41:00 (16 years ago)

Author:

mattausch

Message:

found error, working ok

Location:

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

Files:

• shaderenv.h (modified) (2 diffs)
• shaders/combineSsaoSep.cg (modified) (3 diffs)
• shaders/deferred.cg (modified) (3 diffs)
• shaders/ssao.cg (modified) (10 diffs)

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

@@ -5 +5 @@
 ////////////
 //-- ssao + gi parameters
-#define NUM_PRECOMPUTED_SAMPLES 100
+#define NUM_PRECOMPUTED_SAMPLES 4096
 //#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 8
+#define NUM_SAMPLES 48
 
 //#define MIN_SAMPLES 48
@@ -61 +61 @@
 #define NUM_DOF_TABS 16
 
-//#define USE_GTX
+#define USE_GTX
 
 #define SSAO_FILTER_RADIUS 5

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

@@ -192 +192 @@
         {
                 // the filtered ssao value
-                //OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -232 +232 @@
         {
                 // the filtered ssao value
-                //ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -241 +241 @@
         if (depth < DEPTH_THRESHOLD)
         {
-                //OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
-                OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
+                OUT.illum_col.xyz = col.xyz * max(minAO, 1.0f - ao.x);
+                //OUT.illum_col.xyz = max(minAO, 1.0f - ao.x);
         }
         else

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

@@ -253 +253 @@
         
         // retrieve the sample from the last frame
-        const float4 oldPixel = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f));
-        const float oldDiff = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f)).x;
+        const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
+        const float oldDiff = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).x;
 
         // calculate eye space position of sample in old frame
@@ -272 +272 @@
 
         // check if the pixel belonged to a dynamic object in the last frame
-        const bool newDynamic = (squaredLen > 100000);//DYNAMIC_OBJECTS_THRESHOLD);
-        const bool oldDynamic = (oldDiff > 1000000);//DYNAMIC_OBJECTS_THRESHOLD);
+        const bool newDynamic = (squaredLen > DYNAMIC_OBJECTS_THRESHOLD);
+        const bool oldDynamic = (oldDiff > DYNAMIC_OBJECTS_THRESHOLD);
 
 
@@ -306 +306 @@
         }
         
-        //isPixelValid = 2e20f;
         return float2(isPixelValid, abs(oldEyeSpaceDepth - projectedEyeSpaceDepth));
 }

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

@@ -179 +179 @@
                          sampler2D colors,
                          sampler2D noiseTex,
-                         //float2 samples[NUM_PRECOMPUTED_SAMPLES],
                          sampler2D samples,
                          float3 normal,
@@ -211 +210 @@
                 //-- (affects performance for some reason!)
 
-                if (1)//convergence < SSAO_CONVERGENCE_THRESHOLD)
+                if (convergence < SSAO_CONVERGENCE_THRESHOLD)
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
@@ -274 +273 @@
                 // to the current pixel or if the angle is small enough
                 // to have any influence in the current or last frame
-#if 0
+#if 1
                 const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
 
                 const float partlyResetThres = 1.0f;
-                if (0)//pixelValid <= partlyResetThres)
+                if (pixelValid <= partlyResetThres)
                         validSamples = max(validSamples, pixelValid * (1.0f - tooFarAway) * step(-0.1f, cosAngle));
                 else
@@ -295 +294 @@
                         // (=> there was no discontinuity recently)
                         //else if (isMovingObject && (convergence > SSAO_CONVERGENCE_THRESHOLD)) break;
-                        //else if (isMovingObject && (convergence > NUM_SAMPLES * 5)) break;
+                        else if (isMovingObject && (convergence > NUM_SAMPLES * 5)) break;
                 }
 #endif
@@ -407 +406 @@
                 // or if the angle is small enough
                 // to have any influence in the current or last frame
-#if 0
+#if 1
                 const float partlyResetThres = 1.0f;
 
@@ -456 +455 @@
                         uniform sampler2D noiseTex,
                         uniform sampler2D samples,
-                        //uniform float2 samples[NUM_PRECOMPUTED_SAMPLES],
                         uniform sampler2D oldTex,
                         uniform float4x4 modelViewProj,
@@ -513 +511 @@
 
         const float oldSsao = temporalVals.x;
-        const float oldWeight = temporalVals.y;
-        const float oldIdx = 0;//temporalVals.z;
+        
+        float oldWeight = temporalVals.y;
+        float oldIdx = temporalVals.z;
 
         float3 ao;
@@ -551 +550 @@
         
         // don't check for moving objects, otherwise almost no coherence
-        /*if (!isMovingObject)
+        if (!isMovingObject)
         {
                 if (ao.y > completelyResetThres) 
@@ -560 +559 @@
                 else if (ao.y > partlyResetThres)
                 {
-                        //oldWeight = min(oldWeight, 4.0f * newWeight);
-                        oldWeight = .0f; 
-                        oldIdx = .0f;
-                }
-        }*/
+                        oldWeight = min(oldWeight, 4.0f * newWeight);
+                        //oldWeight = .0f; 
+                        //oldIdx = .0f;
+                }
+        }
 
 
@@ -586 +585 @@
         //OUT.illum_col.z = SqrLen(diffVec);
 
-        //OUT.illum_col.xyz = normal.xyz;
         return OUT;
 }