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

Timestamp:

08/26/08 20:45:40 (16 years ago)

Author:

mattausch

Message:

working with 50 frames

File:

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

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

@@ -87 +87 @@
         // the diffuse color buffer
         mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
+        mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         
         mOldFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         // the diffuse color buffer
+        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);
         
@@ -140 +142 @@
 
 
-        sCgCombineProgram = 
+        /*sCgCombineProgram = 
                 cgCreateProgramFromFile(context, 
                                                                 CG_SOURCE,
@@ -158 +160 @@
         else
                 cerr << "combined program failed to load" << endl;
-
+*/
 
         ///////////////
@@ -257 +259 @@
         FirstPass(fbo);
         ComputeSsao(fbo, expFactor);
-        Combine(fbo);
+        //Combine(fbo);
         AntiAliasing(fbo);
 
@@ -291 +293 @@
         // read the second buffer, write to the first buffer
         mNewFbo->Bind();
-        glDrawBuffers(1, mymrt);
+        glDrawBuffers(2, mymrt);
 
         GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
@@ -443 +445 @@
 void SsaoShader::AntiAliasing(FrameBufferObject *fbo)
 {
-        GLuint colorsTex = mFbo4->GetColorBuffer(0)->GetTexture();
-        //GLuint colorsTex = mNewFbo->GetColorBuffer(0)->GetTexture();
+        //GLuint colorsTex = mFbo4->GetColorBuffer(0)->GetTexture();
+        GLuint colorsTex = mNewFbo->GetColorBuffer(1)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();