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

Timestamp:

10/06/08 03:02:23 (16 years ago)

Author:

mattausch

Message:

tried downsampling

Location:

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

Files:

• globillum.cg (modified) (6 diffs)
• ssao.cg (modified) (8 diffs)
• tonemap.cg (modified) (1 diff)

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

@@ -62 +62 @@
                                    uniform float2 samples[NUM_SAMPLES],
                                    uniform float3 currentNormal,
-                                   uniform float4 centerPosition,
+                                   uniform float3 centerPosition,
                                    float w,
                                    uniform float3 eyePos,
@@ -103 +103 @@
                 //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f)) ++ numSamples;
 
-                // reconstruct world space position from sample
+                //////////
+                //-- reconstruct world space position from sample
+
                 float4 sample = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL));
                 const float eyeSpaceDepth = sample.w;
@@ -118 +120 @@
                 float3 direction_to_sample = vector_to_sample / length_to_sample;
 
-                // Angle between current normal and direction to sample controls AO intensity.
+                // use angle between current normal and direction to sample controls AO intensity.
                 float cos_angle = max(dot(direction_to_sample, currentNormal), 0);
 
@@ -153 +155 @@
                    uniform sampler2D oldIllumTex,
                    const uniform float4x4 oldModelViewProj,
+                   const uniform float4x4 modelViewProj,
                    uniform float maxDepth,
                    uniform float temporalCoherence,
@@ -166 +169 @@
         float4 norm = tex2D(normals, IN.texCoord.xy);
         float3 normal = normalize(norm.xyz);    
-        // something like a constant ambient term
-        const float amb = norm.w;
-        
-        /// the current view direction
-        //float3 viewDir = normalize(IN.view);
 
         // the w coordinate from the persp. projection
         float w = norm.w;
-        // the current world position
-        const float4 centerPosition2 = tex2D(positions, IN.texCoord.xy);
-
-        /// reconstruct position from the eye space depth
-        float3 viewDir = normalize(IN.view);
-        const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
-        
-        float4 centerPosition;
+
+
+        /////////////
+        //-- reconstruct position from the eye space depth
+
+        float3 viewDir = Interpol(IN.texCoord.xy, bl, br, tl, tr);//IN.view;
+        const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0)).w;
+        
+        float3 centerPosition;
         centerPosition.xyz = eyePos - viewDir * eyeDepth;
-
-        centerPosition.w = centerPosition2.w;
-
-        // the current color
-        const float4 currentCol = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
-        // the current depth is stored in the w component
-        const float currentDepth = centerPosition.w;
-
-        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition2, w, eyePos, bl, br, tl, tr);
+        
+        //const float3 centerPosition = tex2D(positions, IN.texCoord.xy).xyz;
+
+
+        ///////////
+        //-- compute color bleeding + ao
+
+        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
         
 
@@ -197 +195 @@
         //-- compute temporally smoothing
 
-        float4 realPos = centerPosition * maxDepth;
-        realPos.w = 1.0f;
-
-        float4 oldPos = mul(oldModelViewProj, realPos);
-
-        const float newDepth = oldPos.z / oldPos.w;
-
-        float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
-
+        float4 realPos = float4(centerPosition * maxDepth, 1.0f);
+
+
+        // calculcate the current projected depth for next frame
+        float4 currentPos = mul(modelViewProj, realPos);
+        currentPos /= currentPos.w;
+        const float currentDepth = currentPos.z;
+        
+
+        ///////////
+        //-- reprojection new frame into old one 
+        
+        // calculate projected depth
+        float4 projPos = mul(oldModelViewProj, realPos);
+        projPos /= projPos.w;
+
+        // the current depth projected into the old frame
+        const float projDepth = projPos.z;
+
+        // fit from unit cube into 0 .. 1
+        float2 tex = (projPos.xy) * 0.5f + 0.5f;
+
+        // retrieve the sample from the last frame
         float4 oldSsao = tex2D(oldSsaoTex, tex);
         float4 oldIllum = tex2D(oldIllumTex, tex);
 
         const float oldDepth = oldSsao.w;
-        const float depthDif = 1.0f - newDepth / oldDepth;
+        const float depthDif = 1.0f - projDepth / oldDepth;
 
         float oldWeight = clamp(oldSsao.z, 0, temporalCoherence);
+
         float newWeight;
 
-        const float oldNumSamples = oldSsao.y;
-        const float oldAvgDepth = oldSsao.z;
+        //const float oldNumSamples = oldSsao.y;
+        //const float oldAvgDepth = oldSsao.z;
 
         if (//(temporalCoherence > 0.0f) &&

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

@@ -6 +6 @@
 
 
-#define USE_EYE_SPACE_DEPTH 0
+#define USE_EYE_SPACE_DEPTH 1
 
 
@@ -71 +71 @@
                    uniform float2 samples[NUM_SAMPLES],
                    uniform float3 currentNormal,
-                   uniform float4 centerPosition,
+                   uniform float3 centerPosition,
                    uniform float scaleFactor,
                    uniform float3 eyePos,
@@ -161 +161 @@
         pixel OUT;
 
-        float4 norm = tex2D(normals, IN.texCoord.xy);
+        float4 norm = tex2Dlod(normals, float4(IN.texCoord, 0 ,0));
         float3 normal = normalize(norm.xyz);
 
-        // a constant ambient term
-        const float amb = norm.w;
         // the w coordinate from the persp. projection
         float w = norm.w;
@@ -173 +171 @@
         /// reconstruct position from the eye space depth
         float3 viewDir = IN.view;
-        const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
-
-        float4 centerPosition;
+        const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
+
+        float3 centerPosition;
         centerPosition.xyz = eyePos - viewDir * eyeDepth;
-        centerPosition.w = centerPosition.w;
 
         const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
@@ -183 +180 @@
 
         // the current world position
-        const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
+        const float3 centerPosition = tex2Dlod(positions, float4(IN.texCoord, 0, 0)).xyz;
 
         const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
@@ -192 +189 @@
         //-- compute temporally smoothing
 
-        float4 realPos = centerPosition * maxDepth;
-        realPos.w = 1.0f;
-
-        // calulcate the current depth
-        //const float currentDepth = centerPosition.w;
-        
-        // apply modelview matrix
+        float4 realPos = float4(centerPosition * maxDepth, 1.0f);
+
+
+        // calculcate the current projected depth for next frame
         float4 currentPos = mul(modelViewProj, realPos);
         currentPos /= currentPos.w;
@@ -217 +211 @@
         float2 tex = (projPos.xy) * 0.5f + 0.5f;
 
-        // optain the sample from the last frame
+        // retrieve the sample from the last frame
         float4 oldCol = tex2D(oldTex, tex);
 
         const float oldDepth = oldCol.w;
+        const float depthDif = 1.0f - projDepth / oldDepth;
+
+
         //const float oldNumSamples = oldCol.y;
         const float oldWeight = clamp(oldCol.z, 0, temporalCoherence);
-
-        const float depthDif = 1.0f - projDepth / oldDepth;
 
         float newWeight;
@@ -264 +259 @@
         pixel OUT;
 
-        float4 col = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
-        float4 ao = tex2D(ssaoTex, IN.texCoord.xy);
+        float4 col = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
+        float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
         OUT.illum_col = col * ao.x;

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

@@ -28 +28 @@
     for(int i = 0; i < 4; ++ i)
     {
-        average += tex2D(colors, IN.texCoord + downSampleOffs[i]);
+        average += tex2Dlod(colors, float4(IN.texCoord + downSampleOffs[i],0,0));
     }
         
     average *= 1.0f / 4.0f;
 
-    return tex2D(colors, IN.texCoord);//average;
+    return average;
 }