Changeset 3323 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

02/20/09 18:47:25 (16 years ago)

Author:

mattausch

Message:

now changing to precomputed sampling version

Location:

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

Files:

• SampleGenerator.cpp (modified) (2 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (3 diffs)

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

@@ -169 +169 @@
                 s[i].y = r * sin(a);
 
-                total1 += x[0];
+                /*total1 += x[0];
                 total2 += x[1];
                 totalSamples ++;
@@ -179 +179 @@
 
                         cout << "here3 " << n1 << " " << n2 << endl;
-                }
+                }*/
         }
 }

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

@@ -9 +9 @@
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 8
+#define NUM_SAMPLES 24
 
 //#define MIN_SAMPLES 48
-#define MIN_SAMPLES 8
+#define MIN_SAMPLES 24
 
 #define DISTANCE_SCALE 1e-2f

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