Changeset 3326 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

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

Author:

mattausch

Message:

strange texture error!!

Location:

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

Files:

• DeferredRenderer.cpp (modified) (16 diffs)
• Material.h (modified) (1 diff)
• shaderenv.h (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (4 diffs)
• shaders/deferred.cg (modified) (11 diffs)
• shaders/ssao.cg (modified) (8 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;

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

@@ -153 +153 @@
         */
         void Render(RenderState *state, SceneEntity *parent);
-
+        /** Adds a new technique to the material
+        */
         void AddTechnique(Technique *t);
-
+        /** Returns the default technique (usually the first)
+        */
         Technique *GetDefaultTechnique() const;
 
         Technique *GetTechnique(int i) const;
-
+        /** Returns the number of techniques associated with this material
+        */
         int GetNumTechniques() const;
-
 
 

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

@@ -61 +61 @@
 #define NUM_DOF_TABS 16
 
-#define USE_GTX
+//#define USE_GTX
 
 #define SSAO_FILTER_RADIUS 5

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

@@ -192 +192 @@
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                //OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -223 +223 @@
         const float convergence = ao.y;
 
-        const float2 xyStep = float2(0, 1.0f / res.y);
+        const float2 xyStep = float2(.0f, 1.0f / res.y);
         
         // filter reaches size 1 pixel when sample size reaches threshold 
@@ -232 +232 @@
         {
                 // the filtered ssao value
-                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                //ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -249 +249 @@
         }
 
+        //OUT.illum_col.xyz = float3(col.w * 5e-3f, 0, 0);
+        OUT.illum_col.xyz = ao.xyz;
+
         OUT.illum_col.w = col.w;
 

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

@@ -15 +15 @@
         float4 color: COLOR0;
         float3 normal: COLOR1;
-        float3 diffVal: COLOR2;
+        //float3 diffVal: COLOR2;
 };
 
@@ -37 +37 @@
         float4 outColor;
 
-        // hack: prevent shading the sky
+        // hack: prevent to shade the sky
         if (color.w > DEPTH_THRESHOLD)
         {
@@ -171 +171 @@
                 lightSpacePos /= lightSpacePos.w;
 
-                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTex);
+                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, 
+                                                      lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTex);
                 diffuse *= shadowTerm;
         }
@@ -209 +210 @@
         */
 inline float2 PixelValid(sampler2D oldTex,
-                                                 sampler2D oldTex2,
                                                  float4 color,
                                                  float3 difVec,
@@ -220 +220 @@
                                                  float3 oldbr,
                                                  float3 oldtl,
-                                                 float3 oldtr
+                                                 float3 oldtr,
+                                                 sampler2D myTex
                                                  )
 {
@@ -249 +250 @@
         
         // fit from unit cube into 0 .. 1
-        const float2 oldTexCoords = backProjPos.xy * 0.5f + 0.5f;
-        //const float2 oldTexCoords = texCoord;
+        const float2 oldTexCoords = backProjPos.xy * .5f + .5f;
+        
         // retrieve the sample from the last frame
-        const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
-        const float4 oldPixel2 = tex2Dlod(oldTex2, float4(oldTexCoords, .0f, .0f));
+        const float4 oldPixel = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f));
+        const float oldDiff = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f)).x;
 
         // calculate eye space position of sample in old frame
@@ -266 +267 @@
         const float squaredLen = SqrLen(difVec);
         
+
         // test if this pixel was valid in the old frame
         float isPixelValid;
 
         // check if the pixel belonged to a dynamic object in the last frame
-        const bool newDynamic = (squaredLen > DYNAMIC_OBJECTS_THRESHOLD);
-        const bool oldDynamic = (oldPixel2.x > DYNAMIC_OBJECTS_THRESHOLD);
+        const bool newDynamic = (squaredLen > 100000);//DYNAMIC_OBJECTS_THRESHOLD);
+        const bool oldDynamic = (oldDiff > 1000000);//DYNAMIC_OBJECTS_THRESHOLD);
+
 
         // actually 0 means pixel is valid
-        const float pixelIsValid = 0.0f;
+        const float pixelIsValid = .0f;
         // means that we only use slight temporal coherence over some frames
         // so that there is no noticeable drag
@@ -281 +284 @@
         const float pixelIsNotValid = 100.0f;
 
+
         // check if the pixel was outside of the frame buffer
-        if ((oldTexCoords.x <= 0) || (oldTexCoords.x >= 1.0f) || 
-                (oldTexCoords.y <= 0) || (oldTexCoords.y >= 1.0f)
+        if ((oldTexCoords.x <= .0f) || (oldTexCoords.x >= 1.0f) || 
+                (oldTexCoords.y <= .0f) || (oldTexCoords.y >= 1.0f)
                 )
         {
                 isPixelValid = pixelIsNotValid;
         }
-        else if (// check if changed from dynamic to not dynamic object
-                ((oldDynamic && !newDynamic) || (!oldDynamic && newDynamic) ||
-                (
-                (oldEyeSpaceDepth < DEPTH_THRESHOLD) && (projectedEyeSpaceDepth < DEPTH_THRESHOLD) &&
-                // check if we have a dynamic object 
-                (oldDynamic || newDynamic) && 
-                // and there is a depth discontinuity
-                (depthDif > MIN_DEPTH_DIFF))))
+        else if ( // check if changed from dynamic to not dynamic object
+                 ((oldDynamic && !newDynamic) || (!oldDynamic && newDynamic) ||
+                         (
+                          (oldEyeSpaceDepth < DEPTH_THRESHOLD) && (projectedEyeSpaceDepth < DEPTH_THRESHOLD) &&
+                          (oldDynamic || newDynamic) &&  // check if we have a dynamic object 
+                          (depthDif > MIN_DEPTH_DIFF)))) // and there is a depth discontinuity
         {       
-                isPixelValid = pixelCouldBeValid; 
+                isPixelValid = pixelCouldBeValid;
         }
         else 
@@ -303 +305 @@
                 isPixelValid = pixelIsValid;
         }
-
+        
+        //isPixelValid = 2e20f;
         return float2(isPixelValid, abs(oldEyeSpaceDepth - projectedEyeSpaceDepth));
 }
@@ -312 +315 @@
 */
 pixel PrepareSsao(fragment IN,
-                                   uniform sampler2D colorsTex,
-                                   uniform sampler2D normalsTex,
-                                   uniform sampler2D diffVals,
-                                   uniform sampler2D oldTex,
-                                   uniform sampler2D oldTex2,
-                                   uniform float4x4 modelViewProj,
-                                   uniform float4x4 oldModelViewProj,
-                                   uniform float3 oldbl,
-                                   uniform float3 oldbr,
-                                   uniform float3 oldtl,
-                                   uniform float3 oldtr,
-                                   uniform float3 oldEyePos
-                                   )
+                                  uniform sampler2D colorsTex,
+                                  uniform sampler2D normalsTex,
+                                  uniform sampler2D diffVals,
+                                  uniform sampler2D oldTex,
+                                  uniform float4x4 modelViewProj,
+                                  uniform float4x4 oldModelViewProj,
+                                  uniform float3 oldbl,
+                                  uniform float3 oldbr,
+                                  uniform float3 oldtl,
+                                  uniform float3 oldtr,
+                                  uniform float3 oldEyePos,
+                                  uniform sampler2D myTex
+                                  )
 {   
         pixel pix;
 
-        float4 color = tex2Dlod(colorsTex, float4(IN.texCoord, 0, 0));
+        float4 color = tex2Dlod(colorsTex, float4(IN.texCoord, .0f, .0f));
         // store scaled view vector so wie don't have to normalize for e.g., ssao
         color.w /= length(IN.view);
@@ -337 +340 @@
 
         // do reprojection and filter out the pixels that are not save
-        float2 pValid = PixelValid(oldTex,
-                                       oldTex2,
-                                       color, 
-                                                           difVec.xyz,
-                                                           IN.texCoord,
-                                                           IN.view,
-                                                           oldEyePos,
-                                                           modelViewProj,
-                                                           oldModelViewProj,
-                                                           oldbl, oldbr, oldtl, oldtr
-                                                           );
+        const float2 pValid = PixelValid(oldTex,
+                                             color, 
+                                                                         difVec.xyz,
+                                                                         IN.texCoord,
+                                                                         IN.view,
+                                                                         oldEyePos,
+                                                                         modelViewProj,                                                   
+                                                                         oldModelViewProj,
+                                                                         oldbl, oldbr, oldtl, oldtr,
+                                                                         myTex
+                                                                         );
 
         pix.color = color;

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

@@ -273 +273 @@
                 // to the current pixel or if the angle is small enough
                 // to have any influence in the current or last frame
-#if 1
+#if 0
                 const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
 
@@ -281 +281 @@
                 else
                         validSamples = max(validSamples, pixelValid);
-#else
-                validSamples = max(validSamples, pixelValid);
 #endif
 
@@ -408 +406 @@
                 // or if the angle is small enough
                 // to have any influence in the current or last frame
-#if 1
+#if 0
                 const float partlyResetThres = 1.0f;
 
@@ -416 +414 @@
                 else
                         validSamples = max(validSamples, pixelValid);
-#else
-                validSamples = max(validSamples, pixelValid);
 #endif
 
@@ -523 +519 @@
         if (eyeSpaceDepth < DEPTH_THRESHOLD)
         {
-                //ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject);
-                ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject, normals, oldIdx);
+                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
@@ -545 +545 @@
         
         // don't check for moving objects, otherwise almost no coherence
-        if (!isMovingObject)
+        /*if (!isMovingObject)
         {
                 if (ao.y > completelyResetThres) 
@@ -558 +558 @@
                         oldIdx = .0f;
                 }
-        }
+        }*/
+
 
         //////////
@@ -573 +574 @@
         OUT.illum_col.w = eyeSpaceDepth;
 
-        // can be used to check if this pixel belongs to a moving object
+        // 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;
         return OUT;
 }