Changeset 3104 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

11/06/08 13:31:58 (16 years ago)

Author:

mattausch

Message:

updated shader programs

Location:

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

Files:

• deferred.cg (modified) (1 diff)
• globillum.cg (modified) (2 diffs)
• ssao.cg (modified) (1 diff)

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

@@ -231 +231 @@
         const float currentDepth = currentPos.z * precisionScale;
 
-        const float2 ao = ssao(IN, colors, noise, samples, normal, 
+        const float2 ao = ssao(IN, colors, noiseTex, samples, normal, 
                                    eyeSpacePos, w, bl, br, tl, tr, normalize(viewDir));
 

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

@@ -254 +254 @@
 
 pixel combine(fragment IN, 
-                          uniform sampler2D colors,
+                          uniform sampler2D colorsTex,
                           uniform sampler2D ssaoTex,
                           uniform sampler2D illumTex
@@ -261 +261 @@
         pixel OUT;
 
-        float4 col = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
+        float4 col = tex2Dlod(colorsTex, float4(IN.texCoord, 0, 0));
         float ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0)).x;
 

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

@@ -354 +354 @@
         return OUT;
 }
+
+float Filter(float2 texCoord, 
+                         uniform sampler2D ssaoTex,
+                         uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
+                         uniform float filterWeights[NUM_SSAO_FILTERSAMPLES])
+{
+        float average = .0f;
+        float w = .0f;
+
+        for (int i = 0; i < NUM_SSAO_FILTERSAMPLES; ++ i)
+        {
+                average += filterWeights[i] * tex2Dlod(ssaoTex, float4(texCoord + filterOffs[i], 0, 0)).x;
+                w += filterWeights[i];
+        }
+
+        average *= 1.0f / (float)w;
+
+        return average;
+}
+
+
+pixel combine(fragment IN, 
+                          uniform sampler2D colorsTex,
+                          uniform sampler2D ssaoTex,
+                          uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
+                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
+                          )
+{
+        pixel OUT;
+
+        float4 col = tex2Dlod(colorsTex, float4(IN.texCoord, 0, 0));
+        float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
+
+        //if (ao.y < 10.0f) ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
+
+        //OUT.illum_col = col * ao.x;
+        //OUT.illum_col = float4(ao.y, ao.y, ao.y, col.w);
+        //OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
+        OUT.illum_col.xyz = float3(1.0f - ao.x, 1.0f - ao.y * 1e-2f, 1);
+        //OUT.illum_col.xyz = float3(1.0f - ao.x, ao.y, 0);
+        OUT.illum_col.w = col.w;
+
+        return OUT;
+}