Changeset 2870

Timestamp:

08/26/08 18:17:06 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -181 +181 @@
         return float4(total_color, 1.0f - total_ao);
 }
-
-
-float ComputeSmoothedColor(float4 centerPosition, 
-                                                   uniform sampler2D oldTex,
-                                                   uniform float maxDepth,  
-                                                   uniform float expFactor,
-                                                   const uniform float4x4 oldModelViewProj,
-                                                   float4 currentCol
-                                                   )
-{
-        float4 realPos = centerPosition * maxDepth;
-        realPos.w = 1.0f;
-
-        float4 oldPos = mul(oldModelViewProj, realPos);
-
-        float newDepth = oldPos.z / oldPos.w;
-
-        float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
-        float4 oldCol = tex2D(oldTex, tex);
-
-        float oldDepth = oldCol.w;
-        float depthDif = 1.0f - newDepth / oldDepth;
-
-        float4 col;
-
-        if ((tex.x >= 0.0f) && (tex.x < 1.0f) && 
-                (tex.y >= 0.0f) && (tex.y < 1.0f) && 
-                (abs(depthDif)  < 1e-4f))
-        {
-                col = currentCol * expFactor + oldCol * float4(1.0f - expFactor);
-        }
-        else
-        {
-                col = currentCol;
-        }
-
-        return col;
- }
 
 
@@ -251 +213 @@
         float4 centerPosition = tex2D(positions, IN.texCoord.xy);
         
-        float4 col = tex2D(colors, IN.texCoord.xy);
-        float currentDepth = col.w;
+        // the current color
+        float4 currentCol = tex2D(colors, IN.texCoord.xy);
+        float currentDepth = currentCol.w;
 
         float ao = ssao(IN, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition);
-        //float4 attenuated_color = ao * col;
-        //float4 attenuated_color = ao;
 
         //float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition); 
-        //float4 attenuated_color = ao * col + new_col;
         
         // compute temporally smoothed color
-        OUT.color = ComputeSmoothedColor(centerPosition, oldTex, maxDepth, expFactor, oldModelViewProj, float4(ao));
+        float4 realPos = centerPosition * maxDepth;
+        realPos.w = 1.0f;
+
+        float4 oldPos = mul(oldModelViewProj, realPos);
+
+        float newDepth = oldPos.z / oldPos.w;
+
+        float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
+        float4 oldCol = tex2D(oldTex, tex);
+
+        float oldDepth = oldCol.w;
+        float depthDif = 1.0f - newDepth / oldDepth;
+
+        if ((tex.x >= 0.0f) && (tex.x < 1.0f) && 
+                (tex.y >= 0.0f) && (tex.y < 1.0f) && 
+                (abs(depthDif)  < 1e-4f))
+        {
+                OUT.color = float4(ao * expFactor + oldCol * float4(1.0f - expFactor));
+        }
+        else
+        {
+                OUT.color = (float4)ao;
+        }
+
 
         //OUT.color.xyz = viewDir;