Changeset 3349 for GTP/trunk/App

Timestamp:

04/13/09 22:01:56 (16 years ago)

Author:

mattausch

Message:

changed back to old version

Location:

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

Files:

• DeferredRenderer.cpp (modified) (4 diffs)
• shaders/combineSsaoSep.cg (modified) (1 diff)
• shaders/deferred.cg (modified) (4 diffs)
• shaders/ssao.cg (modified) (10 diffs)

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

@@ -432 +432 @@
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
 
-
         for (int i = 0; i < 2; ++ i)
         {
@@ -822 +821 @@
         // read the second buffer, write to the first buffer
         mIllumFbo->Bind();
-        glDrawBuffers(1, mrt + mIllumFboIndex);
+        glDrawBuffers(2, mrt + mIllumFboIndex);
 
         int i = 0;
@@ -929 +928 @@
 
         // the neighbouring texels
-        const float xOffs = 1.0f / fbo->GetWidth();
-        const float yOffs = 1.0f / fbo->GetHeight();
+        float xOffs = 1.0f / fbo->GetWidth();
+        float yOffs = 1.0f / fbo->GetHeight();
 
         sCgAntiAliasingProgram->SetTexture(0, colorsTex);
@@ -1383 +1382 @@
         gluOrtho2D(0, 1, 0, 1);
 
+
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
         glLoadIdentity();
+
         
         glPushAttrib(GL_VIEWPORT_BIT);

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

@@ -250 +250 @@
 
         //OUT.illum_col.xyz = float3(ao.w * 5e-1f, 0, 0);
-        //OUT.illum_col.xyz = float3(ao.y * 1e-2f);
+        //OUT.illum_col.xyz = float3(ao.z * 1e-1f);
         //OUT.illum_col.xyz = float3(ao.y * 1e-1f);//, 0, 0);
         //OUT.illum_col.xyz = ao.xyz;

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

@@ -254 +254 @@
         // 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;
-        const float oldDiff = oldPixel.z;//tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).z;
+        const float oldDiff = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).x;
 
         // calculate eye space position of sample in old frame
@@ -306 +305 @@
                 isPixelValid = pixelIsValid;
         }
-        //isPixelValid = pixelIsValid;
         
         return float2(isPixelValid, abs(oldEyeSpaceDepth - projectedEyeSpaceDepth));
@@ -340 +338 @@
         const float3 normal = normalize(tex2Dlod(normalsTex, float4(IN.texCoord, 0, 0)).xyz);
 
-#ifdef PERFORMANCE_TEST
+//#ifdef PERFORMANCE_TEST
+#if 1
         // do reprojection and filter out the pixels that are not save
         const float2 pValid = PixelValid(oldTex,
@@ -354 +353 @@
                                                                          );
 #else
-        const float2 pValid = float2(0, 0);
+        const float2 pValid = float2(0,0);
 #endif
 

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

@@ -20 +20 @@
 {
         float4 illum_col: COLOR0;
-        //float4 col: COLOR1;
+        float4 col: COLOR1;
 };
 
@@ -117 +117 @@
         const float oldEyeSpaceDepth = oldPixel.w;
 
-        // vector from eye pos to old sample
+        // vector from eye pos to old sample 
         const float3 viewVec = Interpol(oldTexCoords, oldbl, oldbr, oldtl, oldtr);
         const float invLen = 1.0f / length(viewVec);
@@ -148 +148 @@
                 
                 //w = ComputeConvergence(oldTex, oldTexCoords, float2(1024.0f, 768.0f));
-                //w = floor(oldPixel.y);
-                //w = oldPixel.y;
-                idx = floor(oldPixel.y);
+                w = oldPixel.y;
+                idx = floor(oldPixel.z);
+
         }
         else
         {       
-                w   = .0f;
+                w = 0.0f;
                 idx = .0f;
         }
 
-        return float3(ssao, idx, w);
+        return float3(ssao, w, idx);
 }
 
@@ -201 +201 @@
                         tex2Dlod(samples, float4((0.5f + i + idx) / NUM_PRECOMPUTED_SAMPLES, 0.5f, .0f, .0f)).xy;
 
-
                 ////////////////////
                 //-- add random noise: reflect around random normal vector 
@@ -208 +207 @@
                 if (convergence < SSAO_CONVERGENCE_THRESHOLD)
                 {
-                        float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, .0f, .0f)).xy;
+                        float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
                         //offset = myreflect(samples[i], mynoise);
                         //offset = myrotate(samples[i], mynoise.x);
@@ -502 +501 @@
 #ifdef PERFORMANCE_TEST 
 
-        float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, .0f, .0f)).xyz;
+        float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
 
         const float sqrMoveSpeed = SqrLen(diffVec);
@@ -522 +521 @@
         const float oldSsao = temporalVals.x;
         
-        //float oldIdx = temporalCoherence > 1 ? temporalVals.y : .0f;
-        float oldIdx = temporalVals.y;
-        //float oldWeight = temporalVals.y;
-        float oldWeight = clamp(oldIdx, 0, temporalCoherence);
-
+        float oldWeight = temporalVals.y;
+        float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
+        
 #else
 
         const bool isMovingObject = false;
-        const float oldSsao = .0f;
-        
-        float oldWeight = .0f;
-        float oldIdx = .0f;
+        const float oldSsao = 0;
+        
+        float oldWeight = 0;
+        float oldIdx = 0;
         
 #endif
@@ -585 +582 @@
                 else if (ao.y > partlyResetThres)
                 {
-                        //if (oldIdx > 4.0f * NUM_SAMPLES) oldIdx = 0;
-                        oldWeight = min(oldWeight, 4.0f * NUM_SAMPLES); oldIdx = oldWeight;
-                        //oldWeight = oldIdx;//.0f; oldIdx = .0f;
+                        oldWeight = min(oldWeight, 4.0f * newWeight);
+                        //oldWeight = .0f; 
+                        //oldIdx = .0f;
                 }
         }
@@ -599 +596 @@
 
         // the new weight for the next frame
-        const float newIdx = newWeight + oldIdx;
-        //const float combinedWeight = clamp(newIdx, .0f, temporalCoherence);
-        const float combinedWeight = clamp(newIdx, .0f, min(newWeight + oldWeight, temporalCoherence));
-
-        //OUT.illum_col.y = combinedWeight;
-        OUT.illum_col.y = newIdx; // the new index
+        const float combinedWeight = clamp(newWeight + oldWeight, .0f, temporalCoherence);
+
+        OUT.illum_col.y = combinedWeight;
+        OUT.illum_col.z = oldIdx + newWeight; // the new index
         OUT.illum_col.w = eyeSpaceDepth;
 
@@ -610 +605 @@
 
         // this value can be used to check if this pixel belongs to a moving object
-        //OUT.col.x = SqrLen(diffVec);
-        OUT.illum_col.z = SqrLen(diffVec);
+        OUT.col.x = SqrLen(diffVec);
+        //OUT.illum_col.z = SqrLen(diffVec);
 
 #else