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

Timestamp:

08/31/08 13:15:30 (16 years ago)

Author:

mattausch

Message:

made changes to view transformation but still not working

Location:

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

Files:

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

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

@@ -84 +84 @@
         float4 s3 = tex2Dlod(colors, float4(offset + IN.lb.xy * w, 0, 0));
 
-        float4 sx = tex2D(colors, IN.c.xy);
-
-        //return (sx + sx) * 0.5f;
+        //float4 sx = tex2D(colors, IN.c.xy);
 
         return (s0 + s1 + s2 + s3) * 0.25f;
-        //return (s0 + s1 + s2 + s3) * 0.25f;
-
         //return float4(w);
 }

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

@@ -24 +24 @@
 {
         float4 lightDir = float4(0.8f, -1.0f, 0.7f, 0.0f);
+        //float4 lightDir = float4(0.0f, 1.0f, 0.0f, 0.0f);
         float4 lightDir2 = float4(-0.5f, 0.5f, 0.4f, 0.0f);
 

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

@@ -96 +96 @@
 
                 // if normal perpenticular to view dir, only half of the samples count
-                const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
-
-                total_color.w -= cos_angle * distance_intensity * view_correction;
-
-                total_color.xyz += cos_angle * distance_intensity * view_correction * sample_color * ILLUM_INTENSITY;
+                //const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
+                //total_color.w -= cos_angle * distance_intensity * view_correction;
+                //total_color.xyz += cos_angle * distance_intensity * view_correction * sample_color * ILLUM_INTENSITY;
+
+                total_color.w -= cos_angle * distance_intensity;
+                total_color.xyz += cos_angle * distance_intensity * sample_color * ILLUM_INTENSITY;
         }
 

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

@@ -88 +88 @@
                 // if surface normal perpenticular to view dir, approx. half of the samples will not count
                 // => compensate for this (on the other hand, projected sampling area could be larger!)
-                const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
+                //const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
+                //total_ao += cos_angle * distance_intensity * view_correction;
 
-                total_ao += cos_angle * distance_intensity * view_correction;
+                total_ao += cos_angle * distance_intensity;
         }
 
-        return max(0.0f, 1.0f - total_ao);
+        //return max(0.0f, 1.0f - total_ao);
+        return saturate(dot(currentViewDir, currentNormal));
 }
 
@@ -178 +180 @@
         float4 ao = tex2D(ssaoTex, IN.texCoord.xy);
 
-        OUT.illum_col = col * ao.x;
-        //OUT.illum_col = ao;
+        //OUT.illum_col = col * ao.x;
+        OUT.illum_col = ao;
+
         OUT.illum_col.w = ao.w;