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

Timestamp:

10/03/08 14:35:07 (16 years ago)

Author:

mattausch

Message:

trying to use smaller fbo

Location:

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

Files:

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

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

@@ -65 +65 @@
                                    uniform float4 centerPosition,
                                    float w,
-                                   // uniform float3 viewDir,
                                    uniform float3 eyePos,
                                    uniform float3 bl,
@@ -71 +70 @@
                                    uniform float3 tl,
                                    uniform float3 tr
+                                   //, uniform float3 viewDir
                                    )
 {
@@ -102 +102 @@
                 float2 texcoord = IN.texCoord.xy + offsetTransformed * AREA_SIZE * w;
 
-                if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f))
-                        ++ numSamples;
+                //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f)) ++ numSamples;
 
                 // reconstruct world space position from sample
                 float4 sample = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL));
                 const float eyeSpaceDepth = sample.w;
-                float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
+                //float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
+                float3 rotView = Interpol(texcoord, bl, br, tl, tr);
                 
                 const float3 sample_position = eyePos - rotView * eyeSpaceDepth;
@@ -213 +213 @@
         const float oldAvgDepth = oldSsao.z;
 
-        if ((temporalCoherence > 0.0f) &&
+        if (//(temporalCoherence > 0.0f) &&
                 (tex.x >= 0.0f) && (tex.x < 1.0f) && 
                 (tex.y >= 0.0f) && (tex.y < 1.0f) && 
                 (abs(depthDif) < 1e-3f)
                 // check if something changed in the surrounding area
-                && (oldNumSamples > 0.2 * gi.ao.y)
-                //&& (oldAvgDepth / newAvgDepth > 0.99)
+                //&& (oldNumSamples > 0.2 * gi.ao.y)
                 )
         {

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

@@ -38 +38 @@
 {
   float4 col: COLOR0;
-  float4 pos: COLOR1;
+  //float4 pos: COLOR1;
+  float2 pos: COLOR1;
   float4 norm: COLOR2;
 };
@@ -65 +66 @@
 
 
+// bilinear interpolation
+inline float3 Interpol(float2 w, float3 bl, float3 br, float3 tl, float3 tr)
+{
+        float3 x1 = lerp(bl, tl, w.y);
+        float3 x2 = lerp(br, tr, w.y); 
+        float3 v = lerp(x1, x2, w.x); 
+
+        return v;
+}
+
+
 pixel fragtex(fragin IN, 
                           uniform sampler2D dirtTex,
                           uniform float maxDepth,
                           uniform sampler2D tex,
-                          uniform float3 currentPos)
+                          uniform float3 eyePos,
+                          uniform float3 bl,
+                          uniform float3 br,
+                          uniform float3 tl,
+                          uniform float3 tr)
 {
+        float4 texColor = tex2D(tex, IN.texCoord.xy);
+
+        // account for alpha blending
+        if (texColor.w < 0.5f) discard;
+
         pixel pix;
-
-        float4 texColor = tex2D(tex, IN.texCoord.xy);
 
         // save color in first render target
         // hack: use combination of emmisive + diffuse (emmisive used as constant ambient term)
         pix.col = (glstate.material.emission + glstate.material.diffuse) * texColor; 
-        
+
         // save world position in second render target
-        pix.pos = IN.worldPos * maxDepth;
+        //pix.pos = IN.worldPos * maxDepth;
         // save world space normal in third rt
         pix.norm.xyz = IN.normal;
@@ -86 +105 @@
         // store projection coordinates with positions (used for ssao)
         pix.norm.w = IN.projPos.w;
-        // write the depth
-        pix.pos.w = IN.mypos.z / IN.mypos.w;
 
-        // account for alpha blending
-        if (pix.col.w < 0.5f)
-                discard;
+        const float4 projPos = IN.mypos / IN.mypos.w;
+        // store the projected depth
+        pix.pos.y = projPos.z;
+
+        float2 screenCoord = projPos.xy * 0.5f + 0.5f;
+        const float magView = length(Interpol(screenCoord, bl, br, tl, tr));
 
         // hack: squeeze some information about ambient into the texture
         //pix.col.w = glstate.material.emission.x;
-        pix.col.w = length(currentPos - IN.worldPos) * maxDepth;
+
+        // eye linear depth
+        pix.col.w = (length(eyePos - IN.worldPos.xyz) * maxDepth) / magView;
+        pix.pos.x = pix.col.x;
 
         return pix;
@@ -101 +124 @@
 
 
-pixel frag(fragin IN, uniform float maxDepth, uniform float3 currentPos)
+pixel frag(fragin IN, 
+                   uniform float maxDepth, 
+                   uniform float3 eyePos,
+                   uniform float3 bl,
+                   uniform float3 br,
+                   uniform float3 tl,
+                   uniform float3 tr)
 {
         pixel pix;
@@ -107 +136 @@
         // hack: use comination of emmisive + diffuse (emmisive used as constant ambient term)
         pix.col = glstate.material.diffuse + glstate.material.emission;
-        pix.pos = IN.worldPos * maxDepth;
+        //pix.pos = IN.worldPos * maxDepth;
 
         pix.norm.xyz = IN.normal;
@@ -113 +142 @@
         // store projection coordinates with positions (used for ssao)
         pix.norm.w = IN.mypos.w;
-        // the projected depth
-        pix.pos.w = IN.mypos.z / IN.mypos.w;
-        
+
+        const float4 projPos = IN.mypos / IN.mypos.w;
+        // store the projected depth
+        pix.pos.y = projPos.z;
+
+        float2 screenCoord = projPos.xy * 0.5f + 0.5f;
+        const float magView = length(Interpol(screenCoord, bl, br, tl, tr));
+
         // hack: squeeze some information about the ambient term into the target
         //pix.col.w = glstate.material.emission.x;
-        pix.col.w = length(currentPos - IN.worldPos) * maxDepth;
+        pix.col.w = (length(eyePos - IN.worldPos.xyz) * maxDepth) / magView;
+        pix.pos.x = pix.col.x;
 
         return pix;

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

@@ -48 +48 @@
                                                                                 float3 bl, float3 br, float3 tl, float3 tr)
 {
-#if 0
+#if 1
         float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
-        float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
-        
-        float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+        //float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
+        float3 rotView = Interpol(texcoord, bl, br, tl, tr);
+        
+        float3 samplePos = eyePos - rotView * eyeSpaceDepth;
 #else
-        float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
-#endif
-        return sample_position;
+        float3 samplePos = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
+#endif
+        return samplePos;
 }
 
@@ -101 +102 @@
                 float2 texcoord = IN.texCoord.xy + offsetTransformed * AREA_SIZE * scaleFactor;
 
-                if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f))
-                        ++ numSamples;
-
-                float3 sample_position = ReconstructSamplePosition(eyePos, colors, texcoord, bl, br, tl, tr);
-
-                float3 vector_to_sample = sample_position - centerPosition.xyz;
-                const float length_to_sample = length(vector_to_sample);
-
-                float3 direction_to_sample = vector_to_sample / length_to_sample;
+                //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f))++ numSamples;
+
+                // get sample world space position
+                float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
+                //float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
+                float3 rotView = Interpol(texcoord, bl, br, tl, tr);
+        
+                float3 samplePos = ReconstructSamplePosition(eyePos, colors, texcoord, bl, br, tl, tr);
+
+
+                ///////
+                //-- compute contribution of current sample taking into account direction and angle
+
+                float3 dirSample = samplePos - centerPosition.xyz;
+                const float lengthSample = length(dirSample);
+
+                float3 nDirSample = dirSample / lengthSample;
 
                 // angle between current normal and direction to sample controls AO intensity.
-                const float cos_angle = max(dot(direction_to_sample, currentNormal), 0.0f);
+                const float cos_angle = max(dot(nDirSample, currentNormal), 0.0f);
 
                 // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
                 // the distance to a sample approaches zero
-                const float distance_intensity = 
-                        (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);
+                const float intensity = 
+                        (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + lengthSample * lengthSample);
 
 #if 0
                 // if surface normal perpenticular to view dir, approx. half of the samples will not count
                 // => compensate for this (on the other hand, projected sampling area could be larger!)
-                const float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
-                total_ao += cos_angle * distance_intensity * view_correction;
-#endif
-                total_ao += cos_angle * distance_intensity;
+                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
+                total_ao += cos_angle * intensity * viewCorrection;
+#endif
+                total_ao += cos_angle * intensity;
         }
 
         return float2(max(0.0f, 1.0f - total_ao), numSamples);
-        //return saturate(dot(currentViewDir, currentNormal));
 }
 
@@ -165 +173 @@
         const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
 
-#if 1   
+#if 0   
         const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
 
@@ -197 +205 @@
         float4 oldPos = mul(oldModelViewProj, realPos);
 
+        const float4 projPos = oldPos / oldPos.w;
+
         // the current depth projected into the old frame
-        const float projDepth = oldPos.z / oldPos.w;
+        const float projDepth = projPos.z;
 
         // fit from unit cube into 0 .. 1
-        float2 tex = (oldPos.xy / oldPos.w) * 0.5f + 0.5f;
+        float2 tex = (projPos.xy) * 0.5f + 0.5f;
 
         // optain the sample from the last frame
@@ -212 +222 @@
         const float depthDif = 1.0f - projDepth / oldDepth;
 
-
         float newWeight;
 
         // the number of valid samples in this frame
-        const float newNumSamples = ao.y;
+        //const float newNumSamples = ao.y;
 
 
@@ -224 +233 @@
                 (abs(depthDif) < 1e-4f) 
                 // if visibility changed in the surrounding area we have to recompute
-                && (oldNumSamples > 0.8f * newNumSamples)
+                //&& (oldNumSamples > 0.8f * newNumSamples)
                 )
         {

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

@@ -130 +130 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        if (oldLogLum > 0)
+        if (oldLogLum > 1e-5f) // too hight log lum
                 OUT.col.w = lerp(oldLogLum, logLumScaled, 0.1f);
         else