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

Timestamp:

07/15/08 11:35:23 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• deferred.cg (modified) (10 diffs)
• mrt.cg (modified) (1 diff)

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

@@ -5 +5 @@
 //#define NUM_SAMPLES 8
 #define NUM_SAMPLES 16
+
+// rule of thumb: approx 1 / NUM_SAMPLES
+#define SAMPLE_INTENSITY 0.2
 //#define SAMPLE_INTENSITY 0.125f
-// rule of thumb: approx 1 / NUM_SAMPLES
-#define SAMPLE_INTENSITY 0.22 //0.0625f
 
 #define AREA_SIZE 5e-1f
-
+#define VIEW_CORRECTION_SCALE 0.3f
+#define DISTANCE_SCALE 1e-6f
 
 struct fragment
@@ -23 +25 @@
 struct pixel
 {
-  float4 color: COLOR0;
+        float4 color: COLOR0;
 };
 
@@ -96 +98 @@
 
                 // distance between current position and sample position controls AO intensity.
-                const float distanceScale = 1e-6f;
-
                 float distance_intensity = 
-                        (SAMPLE_INTENSITY * distanceScale) / (distanceScale + length_to_sample * length_to_sample);
+                        (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);
 
                 // if normal perpenticular to view dir, only half of the samples count
-                float view_correction = 1.0f + 0.5f * (1.0f - dot(currentViewDir, currentNormal));
+                float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
 
                 total_ao += cos_angle * distance_intensity * view_correction;
@@ -119 +119 @@
                                  uniform float3 currentViewDir,
                                  uniform float noiseMultiplier,
-                                 uniform float4 centerPosition)
+                                 uniform float4 centerPosition
+                                 )
 {
         // the w coordinate from the persp. projection
@@ -158 +159 @@
 
                 // distance between current position and sample position controls AO intensity.
-                const float distanceScale = 1e-6f;
-
                 float distance_intensity = 
-                        (SAMPLE_INTENSITY * distanceScale) / (distanceScale + length_to_sample * length_to_sample);
-
-                const float view_correction_scale = 0.5f;
+                        (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);
+
                 // if normal perpenticular to view dir, only half of the samples count
-                float view_correction = 1.0f + view_correction_scale * (1.0f - dot(currentViewDir, currentNormal));
+                float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
 
                 total_ao += cos_angle * distance_intensity * view_correction;
@@ -213 +211 @@
                                 uniform sampler2D oldTex,
                                 const uniform float4x4 oldModelViewProj,
-                                uniform float maxDepth
+                                uniform float maxDepth,
+                                uniform float expFactor
                                 )
 {
@@ -230 +229 @@
         float4 col = shade(IN, colors, positions, normal.xyz, amb);
 
-        //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); 
-        float ao = new_col.w;
-
-        float4 attenuated_color = ao * col + new_col;
-        //float4 attenuated_color = ao * col;
-
-        //OUT.color = ao;
-        //OUT.color = ao * col;
-        //float4 col1 = attenuated_color;
-
-        const float x = 0.1f;
+        float ao = ssao(IN, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition);
+        float4 attenuated_color = ao * col;
+
+        //float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition); 
+        //float ao = new_col.w;
+        //float4 attenuated_color = ao * col + new_col;
+        
+        const float x = expFactor;
 
         float4 dummy = centerPosition * maxDepth;
@@ -254 +249 @@
 
         float oldDepth = col1.w;
-
-        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);
+        float depthDif = 1.0f - newDepth / oldDepth;
+
+        if ((tex.x >= 0.0f) && (tex.x < 1.0f) && 
+                (tex.y >= 0.0f) && (tex.y < 1.0f) && 
+                (abs(depthDif)  < 9e-4f))
+                OUT.color = attenuated_color * expFactor + col1 * float4(1.0f - expFactor);
         else
                 OUT.color = attenuated_color;
 
-        //OUT.color = float4(centerPosition.w);
-        //OUT.color = float4(oldDepth);
-        //OUT.color = float4(newDepth);
-        //OUT.color = float4(abs(newDepth - oldDepth));
         OUT.color.w = tex2D(colors, IN.texCoord.xy).w;
 
@@ -273 +267 @@
                    uniform sampler2D colors,
                    uniform sampler2D positions,
-                   uniform sampler2D normals,
-                   uniform sampler2D oldTex
+                   uniform sampler2D normals
                    )
 {
@@ -282 +275 @@
         float amb = normal.w;
 
-        //OUT.color.xyz = IN.view;
         // expand normal
         normal = normalize(normal * 2.0f - float4(1.0f));
 
         float4 col = shade(IN, colors, positions, normal.xyz, amb);
-        //OUT.color = col;
-
-        float4 col1 = tex2D(oldTex, IN.texCoord.xy);
-
-        const float x = 0.01f;
-        OUT.color = col * x + col1 * float4(1.0f - x);
+        OUT.color = col;
 
         return OUT;

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

@@ -105 +105 @@
   // hack: squeeze some information about ambient into the texture
   pix.norm.w = ambient.x;
-  pix.pos.w = IN.mypos.w; //IN.projPos.w;
+  pix.pos.w = IN.mypos.w;
   pix.col.w = IN.mypos.z / IN.mypos.w;