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

Timestamp:

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

Author:

mattausch

Message:

 

Location:

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

Files:

• antialiasing.cg (modified) (3 diffs)
• deferred.cg (modified) (9 diffs)
• mrt.cg (modified) (2 diffs)

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

@@ -10 +10 @@
 };
 
-//uniform sampler2D s_distort;
-uniform float4 e_barrier = float4(5e-5, 5e-5, 0, 0);
+// the barrier for detecting a discontinuity
+uniform float4 e_barrier = float4(5e-3, 5e-3, 0, 0); // x = normal, y = depth
+// the weights for normal / depth discontinuity
 uniform float4 e_weights = float4(1.0f, 1.0f, 1.0f, 1.0f); // x = normal, y = depth
-uniform float4 e_kernel = float4(0.3f, 1.0f, 1.0f, 1.0f); // x = normal, y = depth
+uniform float4 e_kernel = float4(0.35f, 1.0f, 1.0f, 1.0f); 
 
 
@@ -21 +22 @@
                         ): COLOR
 {
+        //return tex2D(colors, IN.c.xy);
         // normal discontinuity filter
         float3 nc = (float3)tex2D(normals, IN.c.xy);
@@ -81 +83 @@
 
         return (s0 + s1 + s2 + s3) / 4.0f;
-        //return float4(w);
 }

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

@@ -7 +7 @@
 
 // rule of thumb: approx 1 / NUM_SAMPLES
-#define SAMPLE_INTENSITY 0.17
+#define SAMPLE_INTENSITY 0.15
 //#define SAMPLE_INTENSITY 0.125f
 
@@ -37 +37 @@
   float2 rpt = pt - d * 2.0f * n;
 
-  //return pt;
   return rpt;
 }
@@ -80 +79 @@
 
                 //sample noisetex; r stores costheta, g stores sintheta
-                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
+                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
+                float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
 
                 // rotation
                 //float2 offsetTransformed = offset;
-                float2 offsetTransformed = rotate(offset, mynoise);
-                //float2 offsetTransformed = reflect(offset, noise);
+                //float2 offsetTransformed = rotate(offset, mynoise);
+                float2 offsetTransformed = reflect(offset, mynoise);
 
                 // weight with projected coordinate to reach similar kernel size for near and far
                 float2 texcoord = IN.texCoord.xy + offsetTransformed * AREA_SIZE * w;
 
-                float3 sample_position = tex2D(positions, texcoord).xyz;
+                // sample downsampled texture in order to speed up texture accesses
+                float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;
+                //float3 sample_position = tex2D(positions, texcoord).xyz;
 
                 float3 vector_to_sample = sample_position - centerPosition.xyz;
@@ -112 +114 @@
 
         return (1.0f - total_ao);
-        //return float4(dot(currentViewDir, currentNormal));
+        //return dot(currentViewDir, currentNormal);
 }
 
@@ -180 +182 @@
 
 
+/** function for standard deferred shading
+*/
 float4 shade(fragment IN, 
                          uniform sampler2D colors,
@@ -199 +203 @@
         float3 light2 = normalize(lightDir2.xyz);
 
-        float diffuseLight = max(dot(normal, light), 0.0f);
-        float diffuseLight2 = max(dot(normal, light2), 0.0f);
+        float diffuseLight = saturate(dot(normal, light));
+        float diffuseLight2 = saturate(dot(normal, light2));
 
         float diffuse = diffuseLight + diffuseLight2;
-        //float diffuse = diffuseLight;
 
         return (ambient + diffuse) * color * (1.0f - amb) + amb * color;
@@ -227 +230 @@
 
         float4 normal = tex2D(normals, IN.texCoord.xy);
+        
+        // the ambient term
         float amb = normal.w;
 
         // expand normal
-        normal = normalize(normal * 2.0f - 1.0f);
+        normal = normalize(normal);// * 2.0f - 1.0f);
         /// the current view direction
         float3 viewDir = normalize(IN.view * 2.0f - float3(1.0f));
@@ -263 +268 @@
         if ((tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
-                (abs(depthDif)  < 8e-5f))
+                (abs(depthDif)  < 1e-4f))
         {
                 OUT.color = attenuated_color * expFactor + col1 * float4(1.0f - expFactor);
@@ -292 +297 @@
 
         float4 normal = tex2D(normals, IN.texCoord.xy);
+
+        // an ambient color term
         float amb = normal.w;
 
         // expand normal
-        normal = normalize(normal * 2.0f - float4(1.0f));
+        normal = normalize(normal);// * 2.0f - float4(1.0f));
 
         float4 col = shade(IN, colors, positions, normal.xyz, amb);

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

@@ -77 +77 @@
         // save color in first render target
         pix.col = (ambient + diffuse) * tex2D(tex, IN.texCoord.xy);
+        
         // save world position in second rt
         pix.pos = IN.worldPos * maxDepth;
         // save normal in third rt
-        pix.norm.xyz = IN.normal * 0.5f + 0.5f;
+        //pix.norm.xyz = IN.normal * 0.5f + 0.5f;
+        pix.norm.xyz = IN.normal;
 
         // hack: squeeze some information about ambient into the texture
@@ -107 +109 @@
         pix.col = diffuse;
         pix.pos = IN.worldPos * maxDepth;
-        pix.norm.xyz = IN.normal * 0.5f + float3(0.5f);
-        // hack: squeeze some information about ambient into the texture
+        //pix.norm.xyz = IN.normal * 0.5f + float3(0.5f);
+        pix.norm.xyz = IN.normal;
+        // hack: squeeze some information about the ambient term into the target
         pix.norm.w = ambient.x;
         pix.pos.w = IN.mypos.w;