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

Timestamp:

07/14/08 17:20:08 (16 years ago)

Author:

mattausch

Message:

removed ambient occlusion bugs

File:

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

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

@@ -7 +7 @@
 //#define SAMPLE_INTENSITY 0.125f
 // rule of thumb: approx 1 / NUM_SAMPLES
-#define SAMPLE_INTENSITY 0.2 //0.0625f
+#define SAMPLE_INTENSITY 0.16 //0.0625f
 
 #define AREA_SIZE 5e-1f
@@ -76 +76 @@
 
                 //sample noisetex; r stores costheta, g stores sintheta
-                float2 noise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
+                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
 
                 // rotation
                 //float2 offsetTransformed = offset;
-                float2 offsetTransformed = rotate(offset, noise);
+                float2 offsetTransformed = rotate(offset, mynoise);
                 //float2 offsetTransformed = reflect(offset, noise);
 
@@ -95 +95 @@
                 float cos_angle = dot(direction_to_sample, currentNormal);
                 cos_angle = max(cos_angle, 0.0f);
-                // take quadratic influence to sharpen contrast
-                //cos_angle *= cos_angle;
 
                 // distance between current position and sample position controls AO intensity.
-                //const float maxdist = 2e-1f;
-                //const float maxdist = 5e-1f;
                 const float distanceScale = 1e-6f;
 
@@ -107 +103 @@
 
                 // if normal perpenticular to view dir, only half of the samples count
-                float view_correction = (2.0f - dot(currentViewDir, currentNormal));
-                view_correction *= view_correction;
+                float view_correction = 1.0f + 0.5f * (1.0f - dot(currentViewDir, currentNormal));
 
                 total_ao += cos_angle * distance_intensity * view_correction;
@@ -144 +139 @@
 
                 //sample noisetex; r stores costheta, g stores sintheta
-                float2 noise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
+                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
 
                 // rotation
-                float2 offsetTransformed = rotate(offset, noise);
+                float2 offsetTransformed = rotate(offset, mynoise);
 
                 // weight with projected coordinate to reach similar kernel size for near and far
@@ -171 +166 @@
                 // if normal perpenticular to view dir, only half of the samples count
                 float view_correction = 1.0f + 0.5f * (1.0f - dot(currentViewDir, currentNormal));
-                //view_correction *= view_correction;
 
                 total_ao += cos_angle * distance_intensity * view_correction;
@@ -218 +212 @@
                                 uniform float noiseMultiplier,
                                 uniform sampler2D oldTex,
-                                const uniform float4x4 oldModelViewProj
+                                const uniform float4x4 oldModelViewProj,
+                                uniform float maxDepth
                                 )
 {
@@ -236 +231 @@
 
         //float ao = ssao(IN, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition);
-        float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition);
+        float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition); 
         float ao = new_col.w;
 
@@ -244 +239 @@
         //OUT.color = ao;
         //OUT.color = ao * col; 
-        float4 dummy = centerPosition / 0.000487676f;
+        float4 dummy = centerPosition * maxDepth;
         dummy.w = 1.0f;
         float4 oldPos = mul(oldModelViewProj, dummy);
@@ -250 +245 @@
         float newDepth = oldPos.z / oldPos.w;
  
-        const float x = 0.05f;
+        const float x = 0.1f;
 
         float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
@@ -257 +252 @@
         float oldDepth = col1.w;
 
-        if ((tex.x >= 0) && (tex.x <= 1) && (tex.y >= 0) && (tex.y <= 1) && (abs(newDepth - oldDepth) < 5e-4f))
+        if ((tex.x >= 0.0f) && (tex.x < 1.0f) && (tex.y >= 0.0f) && (tex.y < 1.0f) && (abs(newDepth - oldDepth) < 9e-4f))
                 OUT.color = attenuated_color * x + col1 * float4(1.0f - x);
-        else            OUT.color = attenuated_color;// * x + col1 * float4(1.0f - x);
+        else
+                OUT.color = attenuated_color;
 
         //OUT.color = float4(centerPosition.w);
@@ -292 +288 @@
         float4 col1 = tex2D(oldTex, IN.texCoord.xy);
 
-        const float x = 0.1f;
+        const float x = 0.01f;
         OUT.color = col * x + col1 * float4(1.0f - x);