Changeset 3340 for GTP/trunk/App/Demos

Timestamp:

04/10/09 17:22:56 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• src/DeferredRenderer.cpp (modified) (4 diffs)
• src/shaderenv.h (modified) (2 diffs)
• src/shaders/deferred.cg (modified) (1 diff)
• src/shaders/ssao.cg (modified) (4 diffs)
• toto.txt (modified) (1 diff)

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

@@ -796 +796 @@
 void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, float tempCohFactor)
 {
-        PrintGLerror("here5");
-
         GLuint colorsTex, normalsTex, attribsTex;
 
@@ -813 +811 @@
         attribsTex = fbo->GetColorBuffer(2)->GetTexture();
 
-        PrintGLerror("here6");
-
         /////////
         //-- flip flop between illumination buffers
@@ -820 +816 @@
         GLuint oldSsaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
 
-        PrintGLerror("here809");
-
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(0, 0, mIllumFbo->GetWidth(), mIllumFbo->GetHeight());
-
-        PrintGLerror("here45");
 
         // read the second buffer, write to the first buffer
         mIllumFbo->Bind();
         glDrawBuffers(2, mrt + mIllumFboIndex);
-
-        PrintGLerror("here8");
 
         int i = 0;
@@ -1093 +1083 @@
 
         DrawQuad(sCgFilterSsaoProgram);
-        PrintGLerror("combine ssao");
+        PrintGLerror("filter ssao");
 }
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -5 +5 @@
 ////////////
 //-- ssao + gi parameters
+
 #define NUM_PRECOMPUTED_SAMPLES 4096
 
@@ -68 +69 @@
 #define DEPTH_THRESHOLD 1e10f
 
+#define PERFORMANCE_TEST 1
 
 #endif // __SHADERENV_H

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

@@ -353 +353 @@
                                                                          );
 #else
+
         const float2 pValid = float2(0,0);
+
 #endif
 

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

@@ -393 +393 @@
 
                 ++ numSamples;
+
 #ifdef PERFORMANCE_TEST
                 // check if the samples have been valid in the last frame
@@ -497 +498 @@
         //const float radiusMult = kernelRadius * invw;
         
-#ifdef PERFORMANCE_TEST 
+#if 1
+//#ifdef PERFORMANCE_TEST       
 
         float3 diffVec = tex2Dlod(attribsTex, float4(IN.texCoord, 0, 0)).xyz;
@@ -537 +539 @@
         if (eyeSpaceDepth < DEPTH_THRESHOLD)
         {
-                if (0)
+                if (1)
                 {
                         ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, 
@@ -555 +557 @@
         }
 
-#ifdef PERFORMANCE_TEST
+#if 1
+//#ifdef PERFORMANCE_TEST
 
         ///////////

GTP/trunk/App/Demos/Vis/FriendlyCulling/toto.txt

@@ -210 +210 @@
 
 fix normals!!
+
+
+test against old version
+index + Q in same channel
+
+make ambient first then ao then diffuse!!