Changeset 3327 for GTP/trunk

Timestamp:

02/25/09 15:51:45 (16 years ago)

Author:

mattausch

Message:

probably found error with texture

Location:

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

Files:

• DeferredRenderer.cpp (modified) (5 diffs)
• SceneQuery.cpp (modified) (4 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (6 diffs)

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

@@ -165 +165 @@
                 }
         }
+}
+
+
+static float *GrabTexture(GLuint tex, int w, int h)
+{
+        glBindTexture(GL_TEXTURE_2D, tex);
+
+        float *data = new float[w * h * 3];
+
+        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_FLOAT, data);
+
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+
+        return data;
 }
 
@@ -772 +787 @@
                 tempSamples[i] = samples2[ns];
                 currentSample = samples2[ns];
+
                 checked[ns] = true;
         }
@@ -838 +854 @@
                 }
 
+
                 //if (mSortSamples) { SortSamples(); }
                 //sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
                 //sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_PRECOMPUTED_SAMPLES);
-                sCgSsaoProgram->SetTexture(i, sampleTex2D);
-        }
-        
+        }
+
+        sCgSsaoProgram->SetTexture(i, sampleTex2D);
+
+        static int dummycount = 0;
+
+        if (0)//dummycount ++ % 1000 == 0)
+        {
+                float *data = GrabTexture(sampleTex2D, NUM_PRECOMPUTED_SAMPLES, 1);
+                cout << "********************************" << endl;
+                for (int i = 0; i < NUM_PRECOMPUTED_SAMPLES; ++ i)
+                        cout << data[i] << " ";
+                cout << endl;
+                delete [] data;
+        }
+
         ++ i;
 
@@ -870 +900 @@
         sCgSsaoProgram->SetValue1f(i ++, mSampleIntensity * mKernelRadius);
 
-
         DrawQuad(sCgSsaoProgram);
-
         glPopAttrib();
 
@@ -905 +933 @@
         // read the second buffer, write to the first buffer
         if (!displayFrame)
+        {
                 FlipFbos(fbo);
+        }
         else
+        {
                 // end of the pipeline => just draw image to screen
                 FrameBufferObject::Release();
+        }
 
         // the neighbouring texels

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

@@ -105 +105 @@
 
 SceneQuery::SceneQuery(const AxisAlignedBox3 &sceneBox, 
-                                           RenderTraverser *renderer, RenderState *state): 
-mSceneBox(sceneBox), mDepth(NULL), mRenderState(state)
+                                           RenderTraverser *renderer, 
+                                           RenderState *state): 
+mSceneBox(sceneBox), 
+mDepth(NULL), 
+mRenderState(state)
 {
         Prepare(renderer);
@@ -118 +121 @@
 
         const float d = mDepth[px + py * texHeight];
-
         static float depth = d;
 
@@ -147 +149 @@
 
         FrameBufferObject *fbo = new FrameBufferObject(texWidth, texHeight, FrameBufferObject::DEPTH_32, true);
+
         fbo->AddColorBuffer(ColorBufferObject::RGBA_UBYTE, 
                                 ColorBufferObject::WRAP_CLAMP_TO_EDGE, 
@@ -177 +180 @@
         orthoCam->SetupViewProjection();
 
-        //glOrtho(xlen, -xlen, ylen, -ylen, 0.0f, mSceneBox.Size().z); 
         glMatrixMode(GL_MODELVIEW);
-        //orthoCam->SetupCameraView();
 
         mDepth = new float[texHeight * texWidth];

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

@@ -5 +5 @@
 ////////////
 //-- ssao + gi parameters
-#define NUM_PRECOMPUTED_SAMPLES 4096
+#define NUM_PRECOMPUTED_SAMPLES 100
 //#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16

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

@@ -249 +249 @@
         }
 
-        //OUT.illum_col.xyz = float3(col.w * 5e-3f, 0, 0);
-        OUT.illum_col.xyz = ao.xyz;
+        //OUT.illum_col.xyz = float3(ao.w * 5e-3f, 0, 0);
+        //OUT.illum_col.xyz = float3(ao.y * 1e-2f, 0, 0);
+        //OUT.illum_col.xyz = ao.xyz;
 
         OUT.illum_col.w = col.w;

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

@@ -179 +179 @@
                          sampler2D colors,
                          sampler2D noiseTex,
+                         //float2 samples[NUM_PRECOMPUTED_SAMPLES],
                          sampler2D samples,
                          float3 normal,
@@ -204 +205 @@
 
                 const float2 ssaoOffset = tex2Dlod(samples, float4((0.5f + i + idx) / NUM_PRECOMPUTED_SAMPLES, 0.5f, .0f, .0f)).xy;
-
+                //const float2 ssaoOffset = samples[i];
 
                 ////////////////////
@@ -455 +456 @@
                         uniform sampler2D noiseTex,
                         uniform sampler2D samples,
+                        //uniform float2 samples[NUM_PRECOMPUTED_SAMPLES],
                         uniform sampler2D oldTex,
                         uniform float4x4 modelViewProj,
@@ -511 +513 @@
 
         const float oldSsao = temporalVals.x;
-        float oldWeight = temporalVals.y;
-        float oldIdx = temporalVals.z;
+        const float oldWeight = temporalVals.y;
+        const float oldIdx = 0;//temporalVals.z;
 
         float3 ao;
@@ -520 +522 @@
         {
                 if (0)
+                {
                         ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject);
+                }
                 else
+                {
                         ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, 
                                    bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, 
                                            isMovingObject, normals, oldIdx);
+                }
         }
         else
@@ -574 +580 @@
         OUT.illum_col.w = eyeSpaceDepth;
 
+        //if (OUT.illum_col.z > 1000) OUT.illum_col.z = 0;
+
         // this value can be used to check if this pixel belongs to a moving object
         OUT.col.x = SqrLen(diffVec);
         //OUT.illum_col.z = SqrLen(diffVec);
 
-        OUT.illum_col.xyz = normal.xyz;
+        //OUT.illum_col.xyz = normal.xyz;
         return OUT;
 }