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

Timestamp:

08/25/08 20:20:42 (16 years ago)

Author:

mattausch

Message:

bug: downsampling of positions does not work

File:

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

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

@@ -78 +78 @@
         mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         // the diffuse color buffer
-        mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false, false);
+        mNewFbo->AddColorBuffer(w, h, ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false, 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, false);
+        mOldFbo->AddColorBuffer(w, h, ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false, false);
         
 
@@ -284 +284 @@
 
 
-/*void SsaoShader::DisplayTexture()
-{
-        glEnable(GL_TEXTURE_2D);
-
-        glBindTexture(GL_TEXTURE_2D, mNewFbo->GetColorBuffer(0)->GetTexture());
-
-        glDisable(GL_LIGHTING);
-        
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        const float offs = 0.5f;
-        glOrtho(-offs, offs, -offs, offs, 0, 1);
-        
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-        glBegin(GL_QUADS);
-
-        glTexCoord2f(0, 0); glVertex3f(-offs, -offs, -0.5f);
-        glTexCoord2f(1, 0); glVertex3f( offs, -offs, -0.5f);
-        glTexCoord2f(1, 1); glVertex3f( offs,  offs, -0.5f);
-        glTexCoord2f(0, 1); glVertex3f(-offs,  offs, -0.5f);
-
-        glEnd();
-
-        glEnable(GL_LIGHTING);
-        glDisable(GL_TEXTURE_2D);
-        
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        PrintGLerror("ssao second pass");
-}*/
-
-
 void SsaoShader::ComputeViewVectors(Vector3 &tl, Vector3 &tr, Vector3 &bl, Vector3 &br)
 {
@@ -364 +320 @@
         for (int i = 0; i < mWidth * mHeight * 3; i += 3)
         {
-                // create random samples over sphere
+                // create random samples on a circle
                 const float rx = RandomValue(0, 1);
                 const float theta = 2.0f * acos(sqrt(1.0f - rx));