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

Timestamp:

09/26/08 22:36:20 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• deferred.cg (modified) (4 diffs)
• ssao.cg (modified) (2 diffs)

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

@@ -87 +87 @@
         //-- write out logaritmic luminance for tone mapping
 
-        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 99));
+        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
 
         const float3 w = float3(0.299f, 0.587f, 0.114f);
@@ -157 +157 @@
                                   uniform sampler2D noiseTexture,
                                   uniform float2 samples[NUM_PCF_TABS],
-                                  uniform float3 lightDir
+                                  uniform float3 lightDir,
+                                  uniform sampler2D oldColors
                                   )
 {
@@ -201 +202 @@
         OUT.color = (emmisive > 1.5f) ? color: (ambient + diffuse) * color;
 
+
         ////////////
         //-- write out logaritmic luminance for tone mapping
 
+        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
+
         const float3 w = float3(0.299f, 0.587f, 0.114f);
 
@@ -212 +216 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        OUT.color.w = logLumScaled;
+        if (oldColor.w > 0)
+                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.2f);
+        else
+                OUT.color.w = logLumScaled;
         
         return OUT;

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

@@ -52 +52 @@
         float numSamples = 0;
 
+        // avoid singularity of 
+        centerPosition.xyz += currentNormal * 1e-4f;
+
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
@@ -82 +85 @@
                 const float cos_angle = max(dot(direction_to_sample, currentNormal), 0.0f);
 
-                // distance between current position and sample position controls AO intensity.
                 const float distance_intensity = 
                         (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);