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

Timestamp:

08/26/08 13:30:31 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -64 +64 @@
 
 
-SsaoShader::SsaoShader(int w, int h, 
-                                           Camera *cam,
-                                           float scaleFactor
-                                           ):
+SsaoShader::SsaoShader(int w, int h, Camera *cam, float scaleFactor):
 mWidth(w), mHeight(h), 
 mCamera(cam),
@@ -78 +75 @@
         mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         // the diffuse color buffer
-        mNewFbo->AddColorBuffer(w, h, ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false, 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(w, h, ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false, false);
+        mOldFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         
 
@@ -167 +164 @@
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
 
+        glPushAttrib(GL_VIEWPORT_BIT);
+        glViewport(0, 0, mWidth, mHeight);
+
+        glDrawBuffers(1, mymrt);
+
+        cgGLEnableProfile(RenderState::sCgFragmentProfile);
+
+        glDisable(GL_ALPHA_TEST);
+        glDisable(GL_TEXTURE_2D);
+        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);
+
         // switch roles of old and new fbo
         // the algorihm uses two input fbos, where the one
@@ -177 +196 @@
         //DisplayTexture();
         AntiAliasing(fbo);
+
+        glEnable(GL_LIGHTING);
+        glDisable(GL_TEXTURE_2D);
+
+        glMatrixMode(GL_PROJECTION);
+        glPopMatrix();
+
+        glMatrixMode(GL_MODELVIEW);
+        glPopMatrix();
+
+        glPopAttrib();
+
+        cgGLDisableProfile(RenderState::sCgFragmentProfile);
 }
 
@@ -186 +218 @@
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
 
+        if (1)
+        {
+                // generate mip map levels for position texture
+                glBindTexture(GL_TEXTURE_2D, positionsTex);
+                glGenerateMipmapEXT(GL_TEXTURE_2D);
+        }
+
+
         // read the second buffer, write to the first buffer
         mNewFbo->Bind();
         GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
 
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, mWidth, mHeight);
-
         glDrawBuffers(1, mymrt);
 
-        glDisable(GL_ALPHA_TEST);
-        glDisable(GL_TEXTURE_2D);
-        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);
-
-        cgGLEnableProfile(RenderState::sCgFragmentProfile);
 
         cgGLBindProgram(sCgSsaoProgram);
@@ -265 +284 @@
         cgGLDisableTextureParameter(sOldTexParam);
 
-        cgGLDisableProfile(RenderState::sCgFragmentProfile);
-
-        glEnable(GL_LIGHTING);
-        glDisable(GL_TEXTURE_2D);
-
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        glPopAttrib();
-
         FrameBufferObject::Release();
 
@@ -316 +322 @@
 void SsaoShader::CreateNoiseTex2D()
 {
-        GLubyte *randomNormals = new GLubyte[mWidth * mHeight * 3];
+        //GLubyte *randomNormals = new GLubyte[mWidth * mHeight * 3];
+        float *randomNormals = new float[mWidth * mHeight * 3];
 
         for (int i = 0; i < mWidth * mHeight * 3; i += 3)
@@ -324 +331 @@
                 const float theta = 2.0f * acos(sqrt(1.0f - rx));
 
-                randomNormals[i + 0] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
-                randomNormals[i + 1] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
+                //randomNormals[i + 0] = (GLubyte)((cos(theta) * 0.5f + 0.5f) * 255.0f);
+                //randomNormals[i + 1] = (GLubyte)((sin(theta) * 0.5f + 0.5f) * 255.0f);
+                randomNormals[i + 0] = cos(theta);
+                randomNormals[i + 1] = sin(theta);
                 randomNormals[i + 2] = 0;
         }
@@ -338 +347 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, mWidth, mHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, randomNormals);
+        //glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, mWidth, mHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, randomNormals);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16F_ARB, mWidth, mHeight, 0, GL_RGB, GL_FLOAT, randomNormals);
 
         glBindTexture(GL_TEXTURE_2D, 0);
@@ -371 +381 @@
         GLuint colorsTex = mNewFbo->GetColorBuffer(0)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(2)->GetTexture();
-
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, mWidth, mHeight);
-
-        glDisable(GL_ALPHA_TEST);
-        glDisable(GL_TEXTURE_2D);
-        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);
 
@@ -422 +414 @@
         cgGLDisableTextureParameter(sNormalsTexAntiAliasingParam);
 
-        cgGLDisableProfile(RenderState::sCgFragmentProfile);
-        
-        glEnable(GL_LIGHTING);
-        glDisable(GL_TEXTURE_2D);
-        
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        glPopAttrib();
-
-        PrintGLerror("deferred shading");
+        PrintGLerror("antialiasing");
 }