Changeset 2891 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp

Timestamp:

09/01/08 08:58:38 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp (modified) (12 diffs)

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

@@ -193 +193 @@
 mUseTemporalCoherence(true),
 mUseGlobIllum(false),
-mSampling(POISSON)
+mSampling(POISSON),
+mFboIndex(0)
 {
         // create noise texture for ssao
@@ -201 +202 @@
         //-- the flip-flop fbos
 
-        mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
+        /*mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         
         mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
@@ -212 +213 @@
         
         mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
-        
-        //mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
-        //mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);*/
+        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);*/
+        
+        mFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
+
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
 }
 
@@ -227 +232 @@
         if (sCgAntiAliasingProgram) cgDestroyProgram(sCgAntiAliasingProgram);
 
-        DEL_PTR(mNewFbo);
-        DEL_PTR(mOldFbo);
-        //DEL_PTR(mFbo);
+        //DEL_PTR(mNewFbo);
+        //DEL_PTR(mOldFbo);
+        DEL_PTR(mFbo);
 
         glDeleteTextures(1, &noiseTex);
@@ -418 +423 @@
         // contais the color buffer from the last frame, 
         // the other one will be written
-        swap(mNewFbo, mOldFbo); 
-
+        //swap(mNewFbo, mOldFbo);       
+        mFboIndex = 2 - mFboIndex;
         FrameBufferObject::Release();
 
@@ -492 +497 @@
 
         // read the second buffer, write to the first buffer
-        mNewFbo->Bind();
-        glDrawBuffers(1, mymrt);
-
-
-        GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
+        //mNewFbo->Bind();
+        mFbo->Bind();
+        glDrawBuffers(1, mymrt + mFboIndex);
+
+
+        //GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
+        GLuint oldTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -545 +552 @@
         //const float new_offs = 0.55f;
         const float new_offs = 0.5f;
-        /*
-        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
-        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f( new_offs, -new_offs, -0.5f);
-        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs,  new_offs, -0.5f);
-        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs,  new_offs, -0.5f);
-*/
+        
         glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
         glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs, -new_offs, -0.5f);
@@ -715 +717 @@
 
         // read the second buffer, write to the first buffer
-        mNewFbo->Bind();
-        glDrawBuffers(2, mymrt);
-
-        GLuint oldSsaoTex = mOldFbo->GetColorBuffer(0)->GetTexture();
-        GLuint oldIllumTex = mOldFbo->GetColorBuffer(1)->GetTexture();
+        //mNewFbo->Bind();
+        mFbo->Bind();
+
+        glDrawBuffers(2, mymrt + mFboIndex);
+
+        //GLuint oldSsaoTex = mOldFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint oldIllumTex = mOldFbo->GetColorBuffer(1)->GetTexture();
+        
+        GLuint oldSsaoTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
+        GLuint oldIllumTex = mFbo->GetColorBuffer(2 - mFboIndex + 1)->GetTexture();
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -766 +773 @@
         ComputeViewVectors(tl, tr, bl, br);
 
-        glColor3f(1.0f, 1.0f, 1.0f);
-
         glBegin(GL_QUADS);
 
@@ -773 +778 @@
         //const float new_offs = 0.55f;
         const float new_offs = 0.5f;
-        
-        glColor3f(bl.x, bl.y, bl.z); glTexCoord2f(0, 0); glVertex3f(-new_offs, -new_offs, -0.5f);
-        glColor3f(br.x, br.y, br.z); glTexCoord2f(1, 0); glVertex3f( new_offs, -new_offs, -0.5f);
-        glColor3f(tr.x, tr.y, tr.z); glTexCoord2f(1, 1); glVertex3f( new_offs,  new_offs, -0.5f);
-        glColor3f(tl.x, tl.y, tl.z); glTexCoord2f(0, 1); glVertex3f(-new_offs,  new_offs, -0.5f);
+                
+        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
+        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs, -new_offs, -0.5f);
+        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f( new_offs,  new_offs, -0.5f);
+        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f(-new_offs,  new_offs, -0.5f);
 
         glEnd();
@@ -798 +803 @@
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
 
-        GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
-        GLuint illumTex = mNewFbo->GetColorBuffer(1)->GetTexture();
+        //GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint illumTex = mNewFbo->GetColorBuffer(1)->GetTexture();
+        GLuint ssaoTex = mFbo->GetColorBuffer(mFboIndex)->GetTexture();
+        GLuint illumTex = mFbo->GetColorBuffer(mFboIndex + 1)->GetTexture();
+
 
         fbo->Bind();
@@ -850 +858 @@
 {
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
-        GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint ssaoTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        GLuint ssaoTex = mFbo->GetColorBuffer(mFboIndex)->GetTexture();
 
         fbo->Bind();