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

Timestamp:

02/25/09 15:51:45 (15 years ago)

Author:

mattausch

Message:

probably found error with texture

File:

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

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,
@@ -204 +205 @@
 
                 const float2 ssaoOffset = tex2Dlod(samples, float4((0.5f + i + idx) / NUM_PRECOMPUTED_SAMPLES, 0.5f, .0f, .0f)).xy;
-
+                //const float2 ssaoOffset = samples[i];
 
                 ////////////////////
@@ -455 +456 @@
                         uniform sampler2D noiseTex,
                         uniform sampler2D samples,
+                        //uniform float2 samples[NUM_PRECOMPUTED_SAMPLES],
                         uniform sampler2D oldTex,
                         uniform float4x4 modelViewProj,
@@ -511 +513 @@
 
         const float oldSsao = temporalVals.x;
-        float oldWeight = temporalVals.y;
-        float oldIdx = temporalVals.z;
+        const float oldWeight = temporalVals.y;
+        const float oldIdx = 0;//temporalVals.z;
 
         float3 ao;
@@ -520 +522 @@
         {
                 if (0)
+                {
                         ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject);
+                }
                 else
+                {
                         ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, 
                                    bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, 
                                            isMovingObject, normals, oldIdx);
+                }
         }
         else
@@ -574 +580 @@
         OUT.illum_col.w = eyeSpaceDepth;
 
+        //if (OUT.illum_col.z > 1000) OUT.illum_col.z = 0;
+
         // this value can be used to check if this pixel belongs to a moving object
         OUT.col.x = SqrLen(diffVec);
         //OUT.illum_col.z = SqrLen(diffVec);
 
-        OUT.illum_col.xyz = normal.xyz;
+        //OUT.illum_col.xyz = normal.xyz;
         return OUT;
 }