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

Timestamp:

08/29/08 15:46:36 (16 years ago)

Author:

mattausch

Message:

found bug with lod levels
made env file for shaders

Location:

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

Files:

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

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

@@ -11 +11 @@
 
 // the barrier for detecting a discontinuity
-uniform float4 e_barrier = float4(5e-4, 5e-4, 0, 0); // x = normal, y = depth
+uniform float4 e_barrier = float4(5e-5, 5e-5, 0, 0); // x = normal, y = depth
 // the weights for normal / depth discontinuity
+//uniform float4 e_weights = float4(10.0f, 0.1f, 1.0f, 1.0f); // x = normal, y = depth
 uniform float4 e_weights = float4(1.0f, 1.0f, 1.0f, 1.0f); // x = normal, y = depth
 uniform float4 e_kernel = float4(0.35f, 1.0f, 1.0f, 1.0f); 
@@ -23 +24 @@
 {
         //return tex2D(colors, IN.c.xy);
+
         // normal discontinuity filter
         float3 nc = (float3)tex2D(normals, IN.c.xy);
@@ -37 +39 @@
         float ne = saturate(dot(nd, e_weights.x));
 
-        // opposite coordinates
+        // construct opposite coordinates
         float4 lrr = IN.lr.wzyx;
         float4 tbr = IN.tb.wzyx;
@@ -66 +68 @@
 
         dd = abs(2.0f * dc - dd) - e_barrier.y;
-        dd = step(dd, 0.0f);
+        dd = step(dd, (float4)0.0f);
 
         float de = saturate(dot(dd, e_weights.y));
@@ -77 +79 @@
         float2 offset = IN.c.xy * (1.0f - w);
 
-        float4 s0 = tex2D(colors, offset + IN.lt.xy * w);
-        float4 s1 = tex2D(colors, offset + IN.rb.xy * w);
-        float4 s2 = tex2D(colors, offset + IN.rt.xy * w);
-        float4 s3 = tex2D(colors, offset + IN.lb.xy * w);
+        float4 s0 = tex2Dlod(colors, float4(offset + IN.lt.xy * w, 0, 0));
+        float4 s1 = tex2Dlod(colors, float4(offset + IN.rb.xy * w, 0, 0));
+        float4 s2 = tex2Dlod(colors, float4(offset + IN.rt.xy * w, 0, 0));
+        float4 s3 = tex2Dlod(colors, float4(offset + IN.lb.xy * w, 0, 0));
 
-        return (s0 + s1 + s2 + s3) / 4.0f;
+        float4 sx = tex2D(colors, IN.c.xy);
+
+        //return (sx + sx) * 0.5f;
+
+        return (s0 + s1 + s2 + s3) * 0.25f;
+        //return (s0 + s1 + s2 + s3) * 0.25f;
+
         //return float4(w);
 }

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

@@ -54 +54 @@
 
         float4 norm = tex2D(normals, IN.texCoord.xy);
-        float4 color = tex2D(colors, IN.texCoord.xy);
+        float4 color = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
         float4 position = tex2D(positions, IN.texCoord.xy);
 

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

@@ -1 +1 @@
 ////////////////////
-// Screen Spaced Ambient Occlusion shader
+// SSAO + color bleeding shader
 // based on shader of Alexander Kusternig
 
-#define NUM_SAMPLES 10
-//#define NUM_SAMPLES 16
-
-// rule of thumb: approx 1 / NUM_SAMPLES
-//#define SAMPLE_INTENSITY 0.15f
-#define SAMPLE_INTENSITY 0.22f
-
-#define AREA_SIZE 7e-1f
-//#define AREA_SIZE 3e-1f
-#define VIEW_CORRECTION_SCALE 0.3f
-//#define VIEW_CORRECTION_SCALE 0.5f
-#define DISTANCE_SCALE 1e-6f
-
-#define ILLUM_INTENSITY 5e-1f;
+#include "../shaderenv.h"
 
 
@@ -83 +70 @@
 
                 //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;
 
@@ -210 +198 @@
         
         OUT.illum_col = (col + illum) * ao;
+        OUT.illum_col.w = col.w;
 
         return OUT;

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

@@ +1 @@
+#include "../shaderenv.h"
+
 ////////////////////
 // Screen Spaced Ambient Occlusion shader
 // based on shader of Alexander Kusternig
 
-#define NUM_SAMPLES 10
-//#define NUM_SAMPLES 16
-
-// rule of thumb: approx 1 / NUM_SAMPLES
-//#define SAMPLE_INTENSITY 0.15f
-#define SAMPLE_INTENSITY 0.22f
-
-#define AREA_SIZE 7e-1f
-//#define AREA_SIZE 3e-1f
-#define VIEW_CORRECTION_SCALE 0.3f
-//#define VIEW_CORRECTION_SCALE 0.5f
-#define DISTANCE_SCALE 1e-6f
 
 
@@ -66 +56 @@
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
-                float2 offset = samples[i];
+                const float2 offset = samples[i];
 
                 ////////////////////
                 // add random noise: r stores costheta, g stores sintheta
 
-                //float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
+                //const float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy * 2.0f - 1.0f;
                 float2 mynoise = tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier).xy;
 
-                float2 offsetTransformed = reflect(offset, mynoise);
+                const float2 offsetTransformed = reflect(offset, mynoise);
 
                 // weight with projected coordinate to reach similar kernel size for near and far
@@ -165 +155 @@
                 (abs(depthDif) < 1e-3f))
         {
-                OUT.illum_col.x = ao * expFactor + oldCol.x * (1.0f - expFactor);
+                OUT.illum_col = (float4)ao * expFactor + oldCol.x * (1.0f - expFactor);
         }
         else
         {
-                OUT.illum_col.x = ao;
+                OUT.illum_col = (float4)ao;
         }
 
@@ -178 +168 @@
 
 
-
 pixel combine(fragment IN, 
                           uniform sampler2D colors,
@@ -185 +174 @@
         pixel OUT;
 
-        float4 col = tex2D(colors, IN.texCoord.xy);
+        float4 col = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
         float4 ao = tex2D(ssaoTex, IN.texCoord.xy);
 
         OUT.illum_col = col * ao.x;
+        OUT.illum_col.w = ao.w;
 
         return OUT;