Changeset 3156

Timestamp:

11/24/08 17:33:53 (16 years ago)

Author:

mattausch

Message:

pixel check working better now

Location:

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

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• shaders/combineSsao.cg (modified) (1 diff)
• shaders/deferred.cg (modified) (7 diffs)
• shaders/ssao.cg (modified) (4 diffs)

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

@@ -445 +445 @@
         
         string prepareSsaoParams[] = 
-                {"colorsTex", "oldTex", "modelViewProj", "oldModelViewProj", "oldEyePos", 
+                {"colorsTex", "oldTex", "oldEyePos", "modelViewProj", "oldModelViewProj",
                  "oldbl", "oldbr", "oldtl", "oldtr", "diffVals"};
 
@@ -968 +968 @@
         //sCgSsaoProgram->SetTexture(i ++, normalsTex);
         sCgPrepareSsaoProgram->SetTexture(i ++, oldTex);
-        
-        sCgPrepareSsaoProgram->SetMatrix(i ++, mProjViewMatrix);
-        sCgPrepareSsaoProgram->SetMatrix(i ++, mOldProjViewMatrix);
-
-        for (int j = 0; j < 4; ++ j, ++ i)
-                sCgPrepareSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
 
         Vector3 de;
@@ -981 +975 @@
 
         sCgPrepareSsaoProgram->SetValue3f(i ++, de.x, de.y, de.z);
+
+        sCgPrepareSsaoProgram->SetMatrix(i ++, mProjViewMatrix);
+        sCgPrepareSsaoProgram->SetMatrix(i ++, mOldProjViewMatrix);
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+                sCgPrepareSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
 
         sCgPrepareSsaoProgram->SetTexture(i ++, diffVals);

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

@@ -106 +106 @@
                 const float scale =     adaptFactor * scaleFactor * ao.z  / (adaptFactor + ao.y);
 
-                //ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, scale);
+                ao.x = DiscontinuityFilter(IN.texCoord, ao, col, ssaoTex, normalsTex, colorsTex, filterOffs, filterWeights, scale);
         }
 
         OUT.illum_col.xyz = col.xyz * ao.x;
-        
-        OUT.illum_col.xyz = float3(0, ao.x, 0);
-
+        //OUT.illum_col.xyz = float3(0, ao.x, 0);
         //OUT.illum_col.xyz = float3(0, clamp(1.0f - ao.y * 1e-2f, 0, 1), 1);
         OUT.illum_col.w = col.w;

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

@@ -251 +251 @@
 
         // compute position from old frame for dynamic objects + translational portion
-        //const float3 translatedPos = diffVec - oldEyePos + worldPos.xyz;
-        const float3 translatedPos = worldPos.xyz;
+        const float3 translatedPos = diffVec - oldEyePos + worldPos.xyz;
 
 
@@ -259 +258 @@
 
         // note: the old model view matrix only holds the view orientation part
-        //float4 backProjPos = mul(oldModelViewProj, float4(translatedPos, 1.0f));
-        float4 backProjPos = mul(modelViewProj, float4(translatedPos, 1.0f));
+        float4 backProjPos = mul(oldModelViewProj, float4(translatedPos, 1.0f));
         backProjPos /= backProjPos.w;
         
         // fit from unit cube into 0 .. 1
-        //const float2 oldTexCoords = backProjPos.xy * 0.5f + 0.5f;
-        const float2 oldTexCoords = texCoord;
+        const float2 oldTexCoords = backProjPos.xy * 0.5f + 0.5f;
+        //const float2 oldTexCoords = texCoord;
         // retrieve the sample from the last frame
         const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
@@ -273 +271 @@
 
         // vector from eye pos to old sample 
-        const float3 oldViewDir = viewDir;//Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
+        const float3 oldViewDir = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
         const float invLen = 1.0f / length(oldViewDir);
         const float projectedEyeSpaceDepth = invLen * length(translatedPos);
@@ -280 +278 @@
 
         const float squaredLen = diffVec.x * diffVec.x + diffVec.y * diffVec.y + diffVec.z * diffVec.z;
-
         //if (squaredLen < 1e-8f) // object not dynamic
         //{}
@@ -289 +286 @@
                 && (oldTexCoords.x >= 0.0f) && (oldTexCoords.x < 1.0f)
                 && (oldTexCoords.y >= 0.0f) && (oldTexCoords.y < 1.0f)
-                //&& (depthDif <= MIN_DEPTH_DIFF) 
-                && (depthDif <= 9e-1f) 
+                && (depthDif <= MIN_DEPTH_DIFF) 
+                //&& (depthDif <= 9e-1f) 
                 )
         {
@@ -297 +294 @@
         else
         {       
-                validPixel = 1.5f;
+                validPixel = 10.5f;
         }
 
-        return depthDif;
-        //return validPixel;
+        //return depthDif;
+        return validPixel;
 }
 
@@ -310 +307 @@
                                    uniform float4x4 modelViewProj,
                                    uniform float4x4 oldModelViewProj,
-                                   uniform float3 oldEyePos,
                                    uniform float3 oldbl,
                                    uniform float3 oldbr,
                                    uniform float3 oldtl,
                                    uniform float3 oldtr,
+                                   uniform float3 oldEyePos,
                                    uniform sampler2D diffVals
                                    ): COLOR

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

@@ -183 +183 @@
 #endif
 
-        //float pixelValid = 0.5f;
-        float overallDepth = 0;
-
-#if 0
         const float squaredLen = diffVec.x * diffVec.x + diffVec.y * diffVec.y + diffVec.z * diffVec.z;
-
-        if (squaredLen < 1e-8f) // object not dynamic
-        {
-                for (int i = 0; i < NUM_SAMPLES; ++ i) 
-                {
-                        float sampleDif = ComputeDifference(samples[i],
-                                                                                                oldTex,
-                                                                                                oldModelViewProj,
-                                                                                                colors,
-                                                                                                noiseTex,
-                                                                                                scaleFactor,
-                                                                                                bl, br, tl, tr, 
-                                                                                                texcoord0,
-                                                                                                oldEyePos,
-                                                                                                oldbl, oldbr, oldtl, oldtr,
-                                                                                                eyeSpaceDepth
-                                                                                                );
-                        //overallDepth += sampleDif;
-                        if (sampleDif >= MIN_DEPTH_DIFF) ++ notValid;
-                }
-        }
-#endif
 
         const float oldWeight = clamp(oldPixel.y, .0f, temporalCoherence);
@@ -227 +201 @@
                 // increase the weight for convergence
                 newWeight = oldWeight + 1.0f;
-                if (pixelValid > 1.0f) newWeight = 4.0f;
+                if ((pixelValid > 1.0f) && (squaredLen < 1e-8f)) newWeight = 4.0f;
                 //if (pixelValid > 1.0f) newWeight = max(15.0f - notValid * 2.0f, 1.0f);
         }
@@ -461 +435 @@
         }
 
+
         /////////////////
         //-- compute temporal reprojection
@@ -482 +457 @@
 
 
-        OUT.illum_col.x = ao.y;//(ao.x + oldSsao * (newWeight - 1.0f)) / newWeight;
+        OUT.illum_col.x = (ao.x + oldSsao * (newWeight - 1.0f)) / newWeight;
         OUT.illum_col.y = newWeight;
         OUT.illum_col.z = invw;