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

Timestamp:

10/12/08 15:43:22 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -12 +12 @@
 };
 
-// the barrier for detecting a discontinuity
-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(0.5f, 0.5f, 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
+// the barrier for detecting a discontinuity (x = normal, y = depth)
+uniform float4 e_barrier = float4(5e-5, 5e-5, 0, 0); 
+// the weights for normal / depth discontinuity (x = normal, y = depth)
+uniform float4 e_weights = float4(0.5f, 0.5f, 1.0f, 1.0f); 
+//uniform float4 e_weights = float4(1.0f, 1.0f, 1.0f, 1.0f);
 uniform float4 e_kernel = float4(0.5f, 1.0f, 1.0f, 1.0f); 
 

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

@@ -61 +61 @@
 pixel main(fragment IN, 
                    uniform sampler2D colors,
-                   uniform sampler2D positions,
                    uniform sampler2D normals,
                    uniform float3 lightDir
@@ -151 +150 @@
                                   uniform float4x4 shadowMatrix,
                                   uniform float sampleWidth,
-                                  uniform sampler2D noiseTexture,
+                                  uniform sampler2D noise,
                                   uniform float2 samples[NUM_PCF_TABS],
                                   uniform float weights[NUM_PCF_TABS],
@@ -199 +198 @@
                 lightSpacePos /= lightSpacePos.w;
 
-                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTexture);
-                //float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noiseTexture);
+                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, weights, noise);
+                //float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noise);
 
                 diffuse *= shadowTerm;

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

@@ -61 +61 @@
                                    uniform float3 currentNormal,
                                    uniform float3 centerPosition,
-                                   float w,
+                                   float scaleFactor,
                                    uniform float3 bl,
                                    uniform float3 br,
@@ -96 +96 @@
 #endif
                 // weight with projected coordinate to reach similar kernel size for near and far
-                float2 texcoord = IN.texCoord.xy + offsetTransformed * w;
+                float2 texcoord = IN.texCoord.xy + offsetTransformed * scaleFactor;
 
                 //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f)) ++ numSamples;
@@ -151 +151 @@
                    uniform sampler2D colors,
                    uniform sampler2D normals,
-                   uniform sampler2D noiseTexture,
+                   uniform sampler2D noise,
                    uniform float2 samples[NUM_SAMPLES],
                    uniform sampler2D oldSsaoTex,
@@ -191 +191 @@
         //-- compute color bleeding + ao
 
-        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view));
+        GiStruct gi = globIllum(IN, colors, noise, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(IN.view));
         
 

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

@@ -137 +137 @@
                    uniform sampler2D colors,
                    uniform sampler2D normals,
-                   uniform sampler2D noiseTexture,
+                   uniform sampler2D noise,
                    uniform float2 samples[NUM_SAMPLES],
                    uniform sampler2D oldTex,
@@ -161 +161 @@
         const float3 centerPosition = eyePos + eyeSpacePos;
 
-        float4 realPos = float4(centerPosition, 1.0f);
+        const float4 realPos = float4(centerPosition, 1.0f);
 
 
@@ -174 +174 @@
         const float currentDepth = currentPos.z * 1e-3f;
 
-        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(viewDir));
+        const float2 ao = ssao(IN, colors, noise, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(viewDir));
 
 
@@ -202 +202 @@
 
         //const float oldNumSamples = oldCol.y;
-        const float oldWeight = clamp(oldCol.y, 0, temporalCoherence);
+        const float oldWeight = 50;//clamp(oldCol.y, 0, temporalCoherence);
 
         float newWeight;
@@ -209 +209 @@
         //const float newNumSamples = ao.y;
 
-        if (//(temporalCoherence > 0) &&
+        if ((temporalCoherence > 0) &&
                 (tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
@@ -228 +228 @@
         }
 
-        //OUT.illum_col.y=depthDif;
         OUT.illum_col.y = newWeight;
         OUT.illum_col.z = currentDepth;
@@ -269 +268 @@
         float3 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        if (ao.y < 2000.0f)
-                ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
+        //if (ao.y < 2000.0f) 
+        //      ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
 
         OUT.illum_col = col * ao.x;