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

Timestamp:

08/29/08 00:00:59 (16 years ago)

Author:

mattausch

Message:

working quite well

File:

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

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

@@ -112 +112 @@
 static void CreateNoiseTex2D(int w, int h)
 {
-        // hack: should be able to recalc noise texture
-        //if (noiseTex > 0) return;
-
         //GLubyte *randomNormals = new GLubyte[mWidth * mHeight * 3];
         float *randomNormals = new float[w * h * 3];
@@ -167 +164 @@
         //-- the flip-flop fbos
 
-        w = 256; h = 256;
+        //w = 512; h = 512;
         mNewFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         
@@ -173 +170 @@
         mNewFbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, false);
         
+
+        ///////////////////////
+
         mOldFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         
@@ -457 +457 @@
         glDrawBuffers(1, mymrt);
 
-        glPushAttrib(GL_VIEWPORT_BIT);
-        glViewport(0, 0, 256, 256);
-
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadIdentity();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        const float offs = 0.5f;
-        glOrtho(-offs, offs, -offs, offs, 0, 1);
-
 
         GLuint oldTex = mOldFbo->GetColorBuffer(0)->GetTexture();
@@ -537 +523 @@
         cgGLDisableTextureParameter(sOldTexParam);
 
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        glPopAttrib();
 
         FrameBufferObject::Release();
@@ -805 +784 @@
         glDrawBuffers(1, mymrt);
 
+        cgGLEnableProfile(RenderState::sCgFragmentProfile);
+
+        cgGLBindProgram(sCgCombinedIllumProgram);
+
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         
-        cgGLEnableProfile(RenderState::sCgFragmentProfile);
-
-        cgGLBindProgram(sCgCombinedIllumProgram);
 
         cgGLSetTextureParameter(sColorsTexCombinedIllumParam, colorsTex);