Changeset 3095 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

11/05/08 00:35:08 (16 years ago)

Author:

mattausch

Message:

probably improved temporal coherence but strange ssao

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (5 diffs)

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

@@ -422 +422 @@
         InitFrame();
 
-        // switch roles of old and new fbo
-        // the algorihm uses two input fbos, where the one
-        // contais the color buffer from the last frame, 
-        // the other one will be written
-
-        mIllumFboIndex = 2 - mIllumFboIndex;
-        
-        // enable fragment shading
-        ShaderManager::GetSingleton()->EnableFragmentProfile();
-
-        glDisable(GL_ALPHA_TEST);
-        glDisable(GL_TEXTURE_2D);
-        glDisable(GL_LIGHTING);
-        glDisable(GL_BLEND);
-        glDisable(GL_DEPTH_TEST);
-
-        glPolygonMode(GL_FRONT, GL_FILL);
-
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-
-        const float offs = 0.5f;
-        //glOrtho(-offs, offs, -offs, offs, 0, 1);
-        //glOrtho(0, 1, 0, 1, 0, 1);
-        gluOrtho2D(0, 1, 0, 1);
-
-
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, mWidth, mHeight);
-
         if (shadowMap)
                 FirstPassShadow(fbo, light, shadowMap);
@@ -534 +498 @@
         glDrawBuffers(1, mrt + mIllumFboIndex);
 
-        sCgSsaoProgram->SetTexture(0, colorsTex);
-        sCgSsaoProgram->SetTexture(1, normalsTex);
-        sCgSsaoProgram->SetTexture(2, oldTex);
-        sCgSsaoProgram->SetTexture(3, noiseTex);
-
-        sCgSsaoProgram->SetValue1f(4, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
+        int i = 0;
+
+        sCgSsaoProgram->SetTexture(i ++, colorsTex);
+        sCgSsaoProgram->SetTexture(i ++, normalsTex);
+        sCgSsaoProgram->SetTexture(i ++, oldTex);
+        sCgSsaoProgram->SetTexture(i ++, noiseTex);
+
+        sCgSsaoProgram->SetValue1f(i ++, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
         
         if (mUseTemporalCoherence || mRegenerateSamples)
@@ -549 +515 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod); 
-                sCgSsaoProgram->SetArray2f(5, (float *)samples2, NUM_SAMPLES);
-        }
-        
-        Vector3 bl = mCornersView[0];
-        Vector3 br = mCornersView[1];
-        Vector3 tl = mCornersView[2];
-        Vector3 tr = mCornersView[3];
-
-        sCgSsaoProgram->SetValue3f(6, bl.x, bl.y, bl.z);
-        sCgSsaoProgram->SetValue3f(7, br.x, br.y, br.z);
-        sCgSsaoProgram->SetValue3f(8, tl.x, tl.y, tl.z);
-        sCgSsaoProgram->SetValue3f(9, tr.x, tr.y, tr.z);
-
-        sCgSsaoProgram->SetMatrix(10, mProjViewMatrix);
-        sCgSsaoProgram->SetMatrix(11, mOldProjViewMatrix);
-
-        bl = mOldCornersView[0];
-        br = mOldCornersView[1];
-        tl = mOldCornersView[2];
-        tr = mOldCornersView[3];
-
-        Vector3 d = mOldEyePos - mEyePos;
-        //Vector3 d = mEyePos - mOldEyePos;
-
-        sCgSsaoProgram->SetValue3f(12, d.x, d.y, d.z);
-        sCgSsaoProgram->SetValue3f(13, bl.x, bl.y, bl.z);
-        sCgSsaoProgram->SetValue3f(14, br.x, br.y, br.z);
-        sCgSsaoProgram->SetValue3f(15, tl.x, tl.y, tl.z);
-        sCgSsaoProgram->SetValue3f(16, tr.x, tr.y, tr.z);
+                sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
+        }
+        
+        ++ i;
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+                sCgSsaoProgram->SetValue3f(i, mCornersView[j].x, mCornersView[j].y, mCornersView[j].z);
+
+        sCgSsaoProgram->SetMatrix(i ++, mProjViewMatrix);
+        sCgSsaoProgram->SetMatrix(i ++, mOldProjViewMatrix);
+
+        Vector3 de = mOldEyePos - mEyePos;
+        //Vector3 de = mEyePos - mOldEyePos;
+
+        sCgSsaoProgram->SetValue3f(i ++, de.x, de.y, de.z);
+
+        for (int j = 0; j < 4; ++ j, ++ i)
+                sCgSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
 
         DrawQuad(sCgSsaoProgram);
@@ -1001 +956 @@
 void DeferredRenderer::InitFrame()
 {
+        for (int i = 0; i < 4; ++ i)
+                mOldCornersView[i] = mCornersView[i];
+
         mOldProjViewMatrix = mProjViewMatrix;
+        mOldEyePos = mEyePos;
+
+
+        ///////////////////
 
         Matrix4x4 matViewing, matProjection;
@@ -1010 +972 @@
 
         mProjViewMatrix = matViewing * matProjection;
-
-        for (int i = 0; i < 4; ++ i)
-        {
-                mOldCornersView[i] = mCornersView[i];
-        }
-
         ComputeViewVectors(mCamera, mCornersView[0], mCornersView[1], mCornersView[2], mCornersView[3]);
-
-        mOldEyePos = mEyePos;
         mEyePos = mCamera->GetPosition();
+
+
+        // switch roles of old and new fbo
+        // the algorihm uses two input fbos, where the one
+        // contais the color buffer from the last frame, 
+        // the other one will be written
+
+        mIllumFboIndex = 2 - mIllumFboIndex;
+        
+        // enable fragment shading
+        ShaderManager::GetSingleton()->EnableFragmentProfile();
+
+        glDisable(GL_ALPHA_TEST);
+        glDisable(GL_TEXTURE_2D);
+        glDisable(GL_LIGHTING);
+        glDisable(GL_BLEND);
+        glDisable(GL_DEPTH_TEST);
+
+        glPolygonMode(GL_FRONT, GL_FILL);
+
+        glMatrixMode(GL_PROJECTION);
+        glPushMatrix();
+        glLoadIdentity();
+
+        gluOrtho2D(0, 1, 0, 1);
+
+
+        glMatrixMode(GL_MODELVIEW);
+        glPushMatrix();
+        glLoadIdentity();
+
+        
+        glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, mWidth, mHeight);
 }