Changeset 3097

Timestamp:

11/05/08 01:09:27 (16 years ago)

Author:

mattausch

Message:

still problems with ssao on edges

Location:

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

Files:

• deferred.cg (modified) (1 diff)
• ssao.cg (modified) (7 diffs)

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

@@ -74 +74 @@
 
         // store scaled view vector so wie don't have to normalize for e.g., ssao
-        OUT.color.w = color.w;// / length(IN.view);
+        OUT.color.w = color.w / length(IN.view);
+        //OUT.color.w = color.w;
 
         return OUT;

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

@@ -55 +55 @@
 {
         const float eyeSpaceDepth = tex2Dlod(tex, float4(texcoord, 0, 0)).w;
-        float3 viewVec = normalize(Interpol(texcoord, bl, br, tl, tr));
+        //float3 viewVec = normalize(Interpol(texcoord, bl, br, tl, tr));
+        float3 viewVec = Interpol(texcoord, bl, br, tl, tr);
         float3 samplePos = -viewVec * eyeSpaceDepth;
 
@@ -146 +147 @@
         //else trafo = inverseModelTrafo * oldModelViewProj;
 
-        float4 dummyPt = worldPos - float4(oldEyePos,0);
+        float4 dummyPt = worldPos - float4(oldEyePos, 0);
 
         // reproject into old frame and calculate texture position of sample in old frame
@@ -161 +162 @@
 
         // vector from eye pos to old sample 
-        const float3 viewVec = normalize(Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr));
-        const float3 oldWorldPos = oldEyeSpaceDepth * (-viewVec) + oldEyePos;
+        //const float3 viewVec = normalize(Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr));
+        const float3 viewVec = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
+        const float3 oldWorldPos = oldEyePos - oldEyeSpaceDepth * viewVec;
         //const float3 oldWorldPos = - viewVec * eyeSpaceDepth;
         //const float3 dummy14 = Interpol(texcoord0, bl, br, tl, tr);
@@ -232 +234 @@
                         uniform sampler2D noiseTex,
                         uniform float2 samples[NUM_SAMPLES],
-                        uniform float3 currentNormal,
+                        uniform float3 normal,
                         uniform float3 centerPosition,
                         uniform float scaleFactor,
@@ -279 +281 @@
 
                 // angle between current normal and direction to sample controls AO intensity.
-                const float cosAngle = max(dot(dirSample, currentNormal), 0.0f);
+                const float cosAngle = max(dot(dirSample, normal), .0f);
 
                 // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
@@ -290 +292 @@
                 // => compensate for this (on the other hand, projected sampling area could be larger!)
 
-                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * dot(viewDir, currentNormal);
+                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * dot(viewDir, normal);
                 total_ao += cosAngle * aoContrib * viewCorrection;
 #else
@@ -327 +329 @@
 
         // reconstruct position from the eye space depth
-        const float3 viewDir = normalize(IN.view);
+        //const float3 viewDir = normalize(IN.view);
+        const float3 viewDir = IN.view;
         const float eyeSpaceDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
-        const float4 eyeSpacePos = float4(eyeSpaceDepth * (-viewDir), 1.0f);
+        const float4 eyeSpacePos = float4(-viewDir * eyeSpaceDepth, 1.0f);