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

Timestamp:

12/26/08 02:44:45 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -7 +7 @@
 
 
-float2 ComputeBlurFactors(float4 color, float sceneRange)
+float2 ComputeBlurFactors(float4 color, float sceneRange, float zFocus)
 {
         float2 result;
 
+        const float m = 1.0f;
+        const float focalLen = 1.0f;
+
+        const float scale = 5e4f;
+
         // Compute blur factor based on the CoC size scaled and normalized to 0..1 range
-        //float pixCoC = abs(Dlens * focalLen * (Zfocus - v.fDepth) / (Zfocus * (v.fDepth - focalLen)));
+        //float blur = abs(dLens * focalLen * (zFocus - color.w)) / (1e-6f + abs(zFocus * (color.w - focalLen)));
+
+        const float dist = abs(zFocus - color.w);
+        const float blur = scale * m * focalLen * dist / (sceneRange * (1e-6f + abs(color.w + dist * step(0, zFocus - color.w))));
         
-        //float blur = saturate(pixCoC * scale / maxCoC);
+        //float blur = saturate(blur * scale / maxCoC);
         
         // Depth/blurriness value scaled to 0..1 range
-        //result = float2(v.fDepth / sceneRange, blur);
+        result = float2(color.w / sceneRange, blur);
 
         return result;
@@ -30 +38 @@
                         )
 {
-        float average = .0f;
+        float4 avgCol = float4(.0f);
         float total_w = .0f;
 
         for (int i = 0; i < NUM_DOF_TABS; ++ i)
         {
-                float2 sampleTexCoord = texCoords + filterOffs[i];
+                float2 sampleTexCoord = texCoords + filterOffs[i] * blurFactors.y;
                 float4 sampleCol = tex2Dlod(colorsTex, float4(sampleTexCoord, 0, 0));
                 
@@ -41 +49 @@
                 float w = 1;
                 
-                average += sampleCol * w;
+                avgCol += sampleCol * w;
                 total_w += w;
         }
 
-        average /= max(total_w, 1e-6f);
+        avgCol /= max(total_w, 1e-6f);
 
-        return saturate(average);
+        return avgCol;
 }
 
@@ -54 +62 @@
                                         uniform sampler2D colorsTex,
                                         uniform float2 filterOffs[NUM_DOF_TABS],
-                                        uniform float sceneRange
+                                        uniform float sceneRange,
+                                        uniform float zFocus
                                          ): COLOR
 {
@@ -60 +69 @@
         const float4 color = tex2Dlod(colorsTex, float4(IN.texCoords, 0, 0));
         
-        float2 blurFactors = ComputeBlurFactors(color, sceneRange);
+        zFocus = min(zFocus, sceneRange * 0.5f);
+        float2 blurFactors = ComputeBlurFactors(color, sceneRange, zFocus);
+
+        //float4 outCol = float4(color.x, color.y, blurFactors.y, color.w);
         float4 outCol = Blur(color, IN.texCoords, blurFactors, colorsTex, filterOffs);