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

Timestamp:

07/09/09 10:21:25 (15 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/deferred.cg (modified) (7 diffs)

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

@@ -39 +39 @@
         float4 outColor;
 
-#if 0
+#if 1
         // hack: prevent to shade the sky
         if (color.w > DEPTH_THRESHOLD)
@@ -47 +47 @@
         else 
         {
-                if (useAO > .5f)
-                        outColor = (ambient * ao + diffuse) * color;
-                else
-                        outColor = (ambient + diffuse) * color;
+                outColor = (useAO > .5f) ? (ambient * ao + diffuse) * color : (ambient + diffuse) * color;
         }
 #else
+        // just output ambient occlusion
         outColor = ao;
 #endif
@@ -81 +79 @@
         
         OUT.color = col;
+
         // store scaled view vector so wie don't have to normalize for later
-        //OUT.color.w = color.w / length(IN.view);
+        if (0) OUT.color.w = color.w / length(IN.view);
+
         OUT.color.w = color.w;
 
@@ -150 +150 @@
                                   uniform float3 br,
                                   uniform float3 tl,
-                                  uniform float3 tr
+                                  uniform float3 tr,
+                                  uniform sampler2D aoTex,
+                                  uniform float useAO
                                   )
 {
         pixel OUT;
+
+        float4 ao = 1;//(useAO > .5f) ? tex2Dlod(aoTex, float4(IN.texCoord, 0, 0)) : 1.0f;
 
         const float3 normal = tex2D(normals, IN.texCoord.xy);
@@ -192 +196 @@
         const float4 ambient = glstate.light[0].ambient;
         // compute shading
-        OUT.color = useShading ? (ambient + diffuse) * color : color;
+        OUT.color = useShading ? (ambient * ao + diffuse) * color : color * ao;
+        
         // store scaled view vector from now on so wie don't have to normalize later (e.g., for ssao)
-        //OUT.color.w = color.w / lenView;
+        if (0) OUT.color.w = color.w / lenView;
+
         OUT.color.w = color.w;
 
@@ -216 +222 @@
         return color;
 }
-
-
-/** This shader computes the reprojection and checks
-        if the reprojected pixel from last frame is still
-        valid in the current frame
-*/
-/*inline float2 ComputeInfo(sampler2D oldTex,
-                                                  float4 color,
-                                                  float3 difVec,
-                                                  float2 texCoord,
-                                                  float3 viewDir,
-                                                  float3 oldEyePos,
-                                                  float4x4 modelViewProj,
-                                                  float4x4 oldModelViewProj,
-                                                  float3 oldbl,
-                                                  float3 oldbr,
-                                                  float3 oldtl,
-                                                  float3 oldtr,
-                                                  sampler2D myTex
-                                                  )
-{
-        // reconstruct position from the eye space depth
-        const float eyeSpaceDepth = color.w;
-        const float4 worldPos = float4(-viewDir * eyeSpaceDepth, 1.0f);
-
-        // compute position from old frame for dynamic objects + translational portion
-        const float3 translatedPos = -oldEyePos + worldPos.xyz + difVec;
-
-
-        /////////////////
-        //-- reproject into old frame and calculate texture position of sample in old frame
-
-        // note: the old model view matrix only holds the view orientation part
-        float4 backProjPos = mul(oldModelViewProj, float4(translatedPos, 1.0f));
-        backProjPos /= backProjPos.w;
-        
-        // fit from unit cube into 0 .. 1
-        const float2 oldTexCoords = backProjPos.xy * .5f + .5f;
-        
-        // retrieve the sample from the last frame
-        const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
-        const float oldDiff = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).x;
-
-        // calculate eye space position of sample in old frame
-        const float oldEyeSpaceDepth = oldPixel.w;
-
-        // vector from eye pos to old sample 
-        const float3 oldViewDir = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
-        const float invLen = 1.0f / length(oldViewDir);
-        
-
-        // check if the pixel was outside of the frame buffer
-        if ((oldTexCoords.x <= .0f) || (oldTexCoords.x >= 1.0f) || 
-                (oldTexCoords.y <= .0f) || (oldTexCoords.y >= 1.0f)
-                )
-        {
-                isPixelValid = pixelIsNotValid;
-        }
-        else if (// check if changed from dynamic to not dynamic object
-                 (
-                         // (oldDynamic && !newDynamic) || (!oldDynamic && newDynamic) ||
-                         (
-                          (oldEyeSpaceDepth < DEPTH_THRESHOLD) && (projectedEyeSpaceDepth < DEPTH_THRESHOLD) &&
-                          //(oldDynamic || newDynamic) &&  // check if we have a dynamic object 
-                          (depthDif > 5e-2f)))//MIN_DEPTH_DIFF)))
-                          ) // and there is a depth discontinuity
-        {       
-                isPixelValid = pixelCouldBeValid;
-        }
-        else 
-        {
-                isPixelValid = pixelIsValid;
-        }
-        
-        //isPixelValid = depthDif;
-
-        return float3(isPixelValid, abs(oldEyeSpaceDepth - projectedEyeSpaceDepth));
-}
-*/
 
 
@@ -365 +292 @@
         const float3 normal = normalize(tex2Dlod(normalsTex, float4(IN.texCoord, 0, 0)).xyz);
 
-        // do reprojection and filter out the pixels that are not save
-/*      const float2 pValid = PixelValid(oldTex,
-                                             color, 
-                                                                         difVec.xyz,
-                                                                         IN.texCoord,
-                                                                         IN.view,
-                                                                         oldEyePos,
-                                                                         modelViewProj,                                                   
-                                                                         oldModelViewProj,
-                                                                         oldbl, oldbr, oldtl, oldtr,
-                                                                         myTex
-                                                                         );
-
-        pix.color = color;
-        pix.color.xy = pValid.xy;
-        pix.color.z = color.w;
-*/
         const float3 translatedPos = 
                 ComputeTranslatedPos(color, difVec.xyz, IN.view, oldEyePos, oldModelViewProj);