Changeset 3084 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg

Timestamp:

10/31/08 15:08:25 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg (modified) (5 diffs)

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

@@ -89 +89 @@
 #if 1
                 ////////////////////
-                // add random noise: reflect around random normal vector (warning: slow!)
+                // add random noiseTex: reflect around random normal vector (warning: slow!)
                 float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy).xy;
                 float2 offsetTransformed = myreflect(offset, mynoise);
@@ -151 +151 @@
                    uniform sampler2D colors,
                    uniform sampler2D normals,
-                   uniform sampler2D noise,
+                   uniform sampler2D noiseTex,
                    uniform float2 samples[NUM_SAMPLES],
                    uniform sampler2D oldSsaoTex,
@@ -187 +187 @@
         currentPos /= currentPos.w;
         
-        const float currentDepth = currentPos.z * 1e-3f;
+        const float currentDepth = currentPos.z * PRECISION_SCALE;
 
         ///////////
         //-- compute color bleeding + ao
 
-        GiStruct gi = globIllum(IN, colors, noise, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view));
+        GiStruct gi = globIllum(IN, colors, noiseTex, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view));
         
 
@@ -204 +204 @@
 
         // the current depth projected into the old frame
-        const float projDepth = projPos.z * 1e-3f;
+        const float projDepth = projPos.z * PRECISION_SCALE;
 
         // fit from unit cube into 0 .. 1
@@ -223 +223 @@
         //const float oldNumSamples = oldSsao.y;
         
-        if (//(temporalCoherence > 0.0f) &&
+        if ((temporalCoherence > 1e-6f) &&
                 (tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) &&