Changeset 3326 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

02/23/09 18:33:26 (15 years ago)

Author:

mattausch

Message:

strange texture error!!

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (16 diffs)

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

@@ -268 +268 @@
 
 
+static void UpdateSampleTex(Sample2 *samples, int numSamples)
+{
+        glEnable(GL_TEXTURE_2D);
+        glBindTexture(GL_TEXTURE_2D, sampleTex2D);
+                
+        const int w = numSamples; const int h = 1;
+
+        float *tempBuffer = new float[numSamples * 3];
+
+        for (int i = 0; i < numSamples; ++ i)
+        {
+                tempBuffer[i * 3 + 0] = samples[i].x;
+                tempBuffer[i * 3 + 1] = samples[i].y;
+                tempBuffer[i * 3 + 2] = 0;
+                
+        }
+
+        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGB, GL_FLOAT, (float *)tempBuffer);
+
+        glBindTexture(GL_TEXTURE_2D, 0);
+        glDisable(GL_TEXTURE_2D);
+
+        cout << "updated sample texture" << endl;
+
+        delete [] tempBuffer;
+
+        PrintGLerror("noisetexture");
+}
+
+
 static void CreateSampleTex(Sample2 *samples, int numSamples)
 {
@@ -279 +309 @@
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
-        int w = numSamples;
-        int h = 1;
+        const int w = numSamples; const int h = 1;
 
         float *tempBuffer = new float[numSamples * 3];
@@ -506 +535 @@
 
         string combineSsaoParams[] = 
-                //{"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "res", "maxConvergence"};
                 {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "res", "maxConvergence", "spatialWeight"};
 
-        //sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 13);
         sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 9);
 
@@ -517 +544 @@
         string filterSsaoParams[] = 
                 {"colorsTex", "ssaoTex", "bl", "br", "tl", "tr", "res", "maxConvergence", "spatialWeight"};
-
         sCgFilterSsaoProgram->AddParameters(filterSsaoParams, 0, 9);
 
@@ -549 +575 @@
         
         string prepareSsaoParams[] = 
-                {"colorsTex", "normalsTex", "diffVals", "oldTex", "oldTex2", 
+                {"colorsTex", "normalsTex", "diffVals", "oldTex", 
                  "oldEyePos", "modelViewProj", "oldModelViewProj",
-                 "oldbl", "oldbr", "oldtl", "oldtr"};
-
+                 "oldbl", "oldbr", "oldtl", "oldtr", "myTex"};
         sCgPrepareSsaoProgram->AddParameters(prepareSsaoParams, 0, 12);
 
@@ -673 +698 @@
         // if it hasn't been done yet => just output the latest buffer
         if (!mUseAntiAliasing || !displayAfterAA)
+        {
                 Output(fbo); 
+        }
 
         glEnable(GL_LIGHTING);
@@ -801 +828 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod);
-                CreateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+
+                if (!sampleTex2D)
+                {
+                        CreateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+                }
+                else
+                {
+                        UpdateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+                }
+
                 //if (mSortSamples) { SortSamples(); }
                 //sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
@@ -936 +972 @@
         // read the second buffer, write to the first buffer
         mIllumFbo->Bind();
-
         glDrawBuffers(2, mrt + mIllumFboIndex);
 
+        // bind the old buffers for temporal coherence
         GLuint oldSsaoTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
         GLuint oldIllumTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex + 1)->GetTexture();
@@ -1012 +1048 @@
         GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex)->GetTexture();
         
-        //mIllumFbo->Bind();
-        //glDrawBuffers(1, mrt + mIllumFboIndex + 1);
         mTempFbo->Bind();
         glDrawBuffers(1, mrt);
@@ -1040 +1074 @@
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
-        //GLuint ssaoTex = mIllumFbo->GetColorBuffer(mIllumFboIndex + 1)->GetTexture();
         GLuint ssaoTex = mTempFbo->GetColorBuffer(0)->GetTexture();
         
@@ -1173 +1206 @@
         // flip flop between illumination buffers
         GLuint oldTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex)->GetTexture();
-        GLuint oldTex2 = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex + 1)->GetTexture();
+        GLuint myTex = mIllumFbo->GetColorBuffer(2 - mIllumFboIndex + 1)->GetTexture();
 
         int i = 0;
@@ -1181 +1214 @@
         sCgPrepareSsaoProgram->SetTexture(i ++, diffVals);
         sCgPrepareSsaoProgram->SetTexture(i ++, oldTex);
-        sCgPrepareSsaoProgram->SetTexture(i ++, oldTex2);
 
         Vector3 de;
@@ -1193 +1225 @@
         sCgPrepareSsaoProgram->SetMatrix(i ++, mOldProjViewMatrix);
 
+
         for (int j = 0; j < 4; ++ j, ++ i)
         {
                 sCgPrepareSsaoProgram->SetValue3f(i, mOldCornersView[j].x, mOldCornersView[j].y, mOldCornersView[j].z);
         }
+
+        sCgPrepareSsaoProgram->SetTexture(i ++, myTex);
 
         glPushAttrib(GL_VIEWPORT_BIT);
@@ -1244 +1279 @@
         ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
         GLuint colorsTex = colorBuffer->GetTexture();
-        //FrameBufferObject::Release();
+        
 
         FlipFbos(fbo);
@@ -1272 +1307 @@
         DrawQuad(sCgDownSampleProgram);
 
-        PrintGLerror("output");
+        PrintGLerror("Output");
 }
 
@@ -1279 +1314 @@
 {
         for (int i = 0; i < 4; ++ i)
+        {
                 mOldCornersView[i] = mCornersView[i];
+        }
 
         mOldProjViewMatrix = mProjViewMatrix;