Changeset 2993

Timestamp:

10/02/08 17:54:38 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• shaders/ssao.cg (modified) (6 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -666 +666 @@
         // generate mip map levels of position in order to improve texture lookup performance
         //glBindTexture(GL_TEXTURE_2D, positionsTex); glGenerateMipmapEXT(GL_TEXTURE_2D);
-        
+        //glBindTexture(GL_TEXTURE_2D, colorsTex); glGenerateMipmapEXT(GL_TEXTURE_2D);
+
         // read the second buffer, write to the first buffer
         mFbo->Bind();
@@ -1200 +1201 @@
         middleGrey = lightIntensity * maxKey + (1.0f - lightIntensity) * minKey;
 
+
 #if 1
 

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

@@ -48 +48 @@
                                                                                 float3 bl, float3 br, float3 tl, float3 tr)
 {
+#if 0
         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 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
-
+#else
+        float3 sample_position = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
+#endif
         return sample_position;
 }
@@ -67 +69 @@
                    uniform float4 centerPosition,
                    uniform float scaleFactor,
-                   //uniform float3 viewDir,
                    uniform float3 eyePos,
                    uniform float3 bl,
@@ -73 +74 @@
                    uniform float3 tl,
                    uniform float3 tr
+                   //, uniform float3 viewDir
                    )
 {
@@ -159 +161 @@
         // the w coordinate from the persp. projection
         float w = norm.w;
+
+#if 1   
         // the current world position
         const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
-        
-        /*
-        /// the current view direction
+        const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+
+#else
+        /// reconstruct position from the eye space depth
         float3 viewDir = normalize(IN.view);
         const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
-        float4 centerPosition2;
-        centerPosition2.xyz = eyePos - view2 * eyeDepth;
-*/
+        float4 centerPosition;
+        centerPosition.xyz = eyePos - viewDir * eyeDepth;
+
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+
+#endif
 
         // the current depth
         const float currentDepth = centerPosition.w;
-
-        //const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
-        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
-                
+        
 
         /////////////////
@@ -185 +190 @@
 
         ///////////
-        //-- reprojection from new frame into old one
+        //-- reprojection from new frame into old one 
+        
+        // note: could be done using eye space depth values 
+        // by storing the position from last frame and the old model view matrix
 
         float4 oldPos = mul(oldModelViewProj, realPos);
@@ -202 +210 @@
         float newWeight;
 
-        float newNumSamples = ao.y;
+        // the number of valid samples in this frame
+        const float newNumSamples = ao.y;
 
         if (//(temporalCoherence > 0) &&