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

Timestamp:

10/01/08 00:40:59 (16 years ago)

Author:

mattausch

Message:

problematic: merging

Location:

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

Files:

• deferred.cg (modified) (2 diffs)
• mrt.cg (modified) (1 diff)
• sky_preetham.cg (modified) (2 diffs)
• ssao.cg (modified) (2 diffs)

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

@@ -98 +98 @@
 
         if (oldColor.w > 0)
-                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.2f);
+                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.1f);
         else
                 OUT.color.w = logLumScaled;
@@ -217 +217 @@
 
         if (oldColor.w > 0)
-                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.2f);
+                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.1f);
         else
                 OUT.color.w = logLumScaled;

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

@@ -94 +94 @@
         // hack: squeeze some information about ambient into the texture
         pix.col.w = glstate.material.emission.x;
+        //pix.col.w = length(currentPos - IN.worldPos)
 
         return pix;

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

@@ -63 +63 @@
                                   uniform float3 dColor,
                                   uniform float3 eColor,
-                                  uniform float4x4 ModelView)
+                                  uniform float4x4 ModelView,
+                                  uniform float multiplier)
 {
         vtxout OUT;
@@ -94 +95 @@
         OUT.color = float4(hcol, 1.0);
 
-        //OUT.color.rgb *= 2e-5f; 
+        OUT.color.rgb *= multiplier;
 
         OUT.color2 = OUT.color;

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

@@ -157 +157 @@
         float newWeight;
 
+        float newNumSamples = ao.y;
+
         if (//(temporalCoherence > 0) &&
                 (tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
-                (abs(depthDif) < 1e-3f) 
+                (abs(depthDif) < 1e-4f) 
                 // check if visibility changed in the surrounding area:
                 // then we have to recompute
-                && (oldNumSamples > ao.y - 1.5f) 
+                && ((newWeight < 10) || (oldNumSamples > 0.9f * newNumSamples))
+                //&& (oldAvgDepth / newAvgDepth > 0.99)
                 )
         {
@@ -173 +176 @@
         }
         else
-        {
+        {       
                 OUT.illum_col.xy = ao.xy;
                 newWeight = 0;