Changeset 2881

Timestamp:

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

Author:

mattausch

Message:

working quite well

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• FrameBufferObject.cpp (modified) (1 diff)
• SsaoShader.cpp (modified) (6 diffs)
• chcdemo.cpp (modified) (7 diffs)
• shaders/globillum.cg (modified) (4 diffs)

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

@@ -94 +94 @@
                 magfilterParam = GL_LINEAR; break;
         case FILTER_MIPMAP_LINEAR: 
-                //minfilterParam = GL_LINEAR_MIPMAP_LINEAR;
-                minfilterParam = GL_NEAREST_MIPMAP_NEAREST;
-                //minfilterParam = GL_NEAREST_MIPMAP_LINEAR;
-                magfilterParam = GL_NEAREST; break;
+                //minfilterParam = GL_NEAREST_MIPMAP_NEAREST;
+                //magfilterParam = GL_NEAREST; 
+
+                minfilterParam = GL_NEAREST_MIPMAP_LINEAR;
+                magfilterParam = GL_LINEAR; 
+                break;
         default:
                 minfilterParam = GL_NEAREST;

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);

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

@@ -322 +322 @@
                 //cout << "model path: " << model_path << endl;
 
-                cout << "**** end parameters ****" << endl;
+                cout << "**** end parameters ****" << endl << endl;
         }
 
@@ -537 +537 @@
         // this fbo basicly stores the scene information we get from standard rendering of a frame
         // we store colors, normals, positions (for the ssao)
-        fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_32);
+        fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_24);
 
         // the diffuse color buffer
@@ -879 +879 @@
                 cgGLDisableProfile(RenderState::sCgVertexProfile);
 
-                glDrawBuffers(1, mrt);
-
                 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -901 +899 @@
                 glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 
-                glDrawBuffers(1, mrt);
-
                 break;
         
@@ -980 +976 @@
         if (renderType == RenderState::DEFERRED) 
         {
-                fbo->Release();
+                FrameBufferObject::Release();
 
                 cgGLDisableProfile(RenderState::sCgVertexProfile);
                 cgGLDisableProfile(RenderState::sCgFragmentProfile);
-
-                glDrawBuffers(1, mrt);
 
                 if (useSsao)
@@ -991 +985 @@
                         if (!ssaoShader) ssaoShader = new SsaoShader(texWidth, texHeight, camera, myfar / 10.0f);
                         //DEL_PTR(deferredShader);
-                        
                         ssaoShader->Render(fbo, oldViewProjMatrix, ssaoExpFactor);
 
@@ -999 +992 @@
                         if (!deferredShader) deferredShader = new DeferredShader(texWidth, texHeight);
                         //DEL_PTR(ssaoShader);
-
                         deferredShader->Render(fbo);
                 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg

@@ -29 +29 @@
 
 
-struct pixel
+struct pixel2
 {
         float4 ssao_col: COLOR0;
         float4 illum_col: COLOR1;
+};
+
+
+struct pixel
+{
+        float4 illum_col: COLOR0;
 };
 
@@ -85 +91 @@
                 float2 texcoord = IN.texCoord.xy + offsetTransformed * AREA_SIZE * w;
 
+                // use lower lod level to improve cache coherence
                 float3 sample_position = tex2Dlod(positions, float4(texcoord, 0, 1)).xyz;
                 float3 sample_color = tex2Dlod(colors, float4(texcoord, 0, 2)).xyz;
@@ -114 +121 @@
 /** The mrt shader for screen space ambient occlusion + indirect illumination
 */
-pixel main(fragment IN, 
+pixel2 main(fragment IN, 
                    uniform sampler2D colors,
                    uniform sampler2D positions,
@@ -128 +135 @@
                    )
 {
-        pixel OUT;
+        pixel2 OUT;
 
         float4 norm = tex2D(normals, IN.texCoord.xy);