Changeset 2989 for GTP/trunk

Timestamp:

10/02/08 12:22:32 (16 years ago)

Author:

mattausch

Message:

was able to make eye space depth working ...

Location:

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

Files:

• chcdemo.cpp (modified) (1 diff)
• shaders/mrt.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (3 diffs)

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

@@ -947 +947 @@
         cgGLBindProgram(RenderState::sCgMrtFragmentProgram);
 
-        Vector3 pos = camera->GetPosition();
+        const Vector3 pos = camera->GetPosition();
         cgGLSetParameter3f(sCurrentPosParam, pos.x, pos.y, pos.z);
         cgGLSetParameter3f(sCurrentPosParamTex, pos.x, pos.y, pos.z);

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

@@ -95 +95 @@
         // hack: squeeze some information about ambient into the texture
         //pix.col.w = glstate.material.emission.x;
-        pix.col.w = length((currentPos - IN.worldPos) * maxDepth);
+        pix.col.w = length(currentPos - IN.worldPos) * maxDepth;
 
         return pix;
@@ -118 +118 @@
         // 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(currentPos - IN.worldPos) * maxDepth;
 
         return pix;

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

@@ -91 +91 @@
                    uniform float3 viewDir,
                    uniform float3 eyePos,
-                   uniform sampler2D positions,
                    uniform float3 bl,
                    uniform float3 br,
@@ -127 +126 @@
                 // sample downsampled texture in order to speed up texture accesses
                 float eyeSpaceDepth = tex2Dlod(colors, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).w;
-
-                float2 newOffs = 0.5f + offsetTransformed * 0.5f;
-
-                float3 rotView = normalize(Interpol(newOffs, bl, br, tl, tr));
+                
+                // reconstruct world space position
+                float3 rotView = normalize(Interpol(texcoord, bl, br, tl, tr));
                 float3 sample_position = eyePos - rotView * eyeSpaceDepth;
+
                 //float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, SSAO_MIPMAP_LEVEL)).xyz;
 
@@ -191 +190 @@
         // the current world position
         const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
-
-        const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
-        float3 view2 = normalize(Interpol(IN.texCoord.xy, bl, br, tl, tr));
-        
+        /// the current view direction
+        float3 viewDir = normalize(IN.view);
+
+        /*const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
         float4 centerPosition2;
         centerPosition2.xyz = eyePos - view2 * eyeDepth;
+*/
+
         // the current depth
         const float currentDepth = centerPosition.w;
 
-        /// the current view direction
-        float3 viewDir = normalize(IN.view);
-
         //const float2 ao = ssao(IN, positions, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos);
-        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition2, w, viewDir, eyePos, positions,
-                bl, br, tl, tr);
+        const float2 ao = ssao(IN, colors, noiseTexture, samples, normal, centerPosition, w, viewDir, eyePos, bl, br, tl, tr);