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

Timestamp:

10/01/08 17:39:41 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -53 +53 @@
 
         return r;
+}
+
+float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
+{
+        //float3 x1 = lerp(oldColor.w, logLumScaled, 0.1f);
+        float3 x1 = bl * (1.0f - w.x) + br * w.x;
+        float3 x2 = tl * (1.0f - w.x) + tr * w.x;
+
+        float3 v = x1 * (1.0f - w.y) + x2 * w.y;
+
+        return v;
 }
 
@@ -70 +81 @@
                    uniform float3 br,
                    uniform float3 tl,
-                   uniform float3 tr
+                   uniform float3 tr,
+                   uniform float maxDepth
                    )
 {
@@ -105 +117 @@
                 float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
 
-                float rotx = offsetTransformed.x * -x_angle;
-                float roty = offsetTransformed.y * -y_angle;
-
-                float3 rotView_x = RotateY(viewDir, x_angle);
-                float3 rotView = RotateX(rotView_x, y_angle);
-
-                float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+                float newOffs = 0.5f + offsetTransformed * 0.5f;
+
+                float3 rotView = normalize(Interpol(newOffs, bl, br, tl, tr));
+                float3 sample_position = (eyePos - rotView * eyeSpaceDepth) / maxDepth;
                 //float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
 
@@ -177 +186 @@
         float3 viewDir = normalize(IN.view);
 
-        /*const float eyeSpaceDepth = tex2D(colors, IN.texCoord.xy).w;
+/*      const float eyeSpaceDepth = tex2D(colors, IN.texCoord.xy).w;
 
         float3 sample_position = eyePos - viewDir * eyeSpaceDepth; 
 
-        OUT.illum_col.xyz = centerPosition.xyz - sample_position;
+        OUT.illum_col.xyz = centerPosition.xyz * maxDepth -  sample_position;
         OUT.illum_col.w = currentDepth;
-        return OUT;*/
-
+        return OUT;
+*/
         //const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
         const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos, positions,
-                uniform float3 bl,
-                uniform float3 br,
-                uniform float3 tl,
-                uniform float3 tr);
+                bl, br, tl, tr, maxDepth);