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

Timestamp:

09/26/08 18:31:24 (16 years ago)

Author:

mattausch

Message:

cannot read mipmap, but stayed on gpu

Location:

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

Files:

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

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

@@ -87 +87 @@
         float4 s3 = tex2Dlod(colors, float4(offset + IN.lb.xy * w, 0, 0));
 
-        float4 sc = tex2Dlod(colors, float4(IN.c.xy, 0, 0));
+        float4 centerColor = tex2Dlod(colors, float4(IN.c.xy, 0, 0));
 
-        float4 col = (s0 + s1 + s2 + s3 + sc) * 0.2f;
+        float4 col = (s0 + s1 + s2 + s3 + centerColor) * 0.2f;
         //return (s0 + s1 + s2 + s3) * 0.25f;
+
+        col.w = centerColor.w;
 
         return col;

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

@@ -64 +64 @@
                    uniform sampler2D positions,
                    uniform sampler2D normals,
-                   uniform float3 lightDir
+                   uniform float3 lightDir,
+                   uniform sampler2D oldColors
                    )
 {
@@ -86 +87 @@
         //-- write out logaritmic luminance for tone mapping
 
+        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 99));
+
         const float3 w = float3(0.299f, 0.587f, 0.114f);
 
@@ -94 +97 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        OUT.color.w = logLumScaled;
+        const static float factor = 0.2f;
+        
+        OUT.color.w = lerp(oldColor.w, logLumScaled, factor);
 
         return OUT;

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

@@ -189 +189 @@
                 // check if something changed in the surrounding area
                 && (oldNumSamples > 0.2 * gi.ao.y)
-                && (oldAvgDepth / newAvgDepth > 0.99)
+                //&& (oldAvgDepth / newAvgDepth > 0.99)
                 )
         {