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

Timestamp:

05/19/09 19:17:41 (16 years ago)

Author:

mattausch

Message:

reverted but now a good version

Location:

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

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• Halton.cpp (modified) (1 diff)
• ResourceManager.cpp (modified) (2 diffs)
• SampleGenerator.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (2 diffs)
• shaderenv.h (modified) (4 diffs)
• shaders/combineSsaoSep.cg (modified) (1 diff)
• shaders/deferred.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (9 diffs)

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

@@ -226 +226 @@
         case DeferredRenderer::SAMPLING_QUADRATIC:
                 {
-                        //PoissonDiscSampleGenerator2D poisson(NUM_PRECOMPUTED_SAMPLES, 1.0f);
-                        //poisson.Generate((float *)samples2);
                         QuadraticDiscSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);
@@ -845 +843 @@
 
         //if (mRegenerateSamples)
-        if (//mUseTemporalCoherence || 
-                mRegenerateSamples)
+        if (1)//mUseTemporalCoherence || mRegenerateSamples)
         {
                 mRegenerateSamples = false;
@@ -861 +858 @@
                 else
                 {
-                        UpdateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
+                        //UpdateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
                 }
 

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

@@ -79 +79 @@
         }
 
-        // only even prime number
+        // only even prime numbers
         if (idx == 1) return 2;
 

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

@@ -356 +356 @@
     str.read(reinterpret_cast<char *>(vertices), sizeof(Vector3) * vertexCount);
         
-        //cout << "vertexCount: " << vertexCount << endl;
-
         normals = new Vector3[vertexCount];
         str.read(reinterpret_cast<char *>(normals), sizeof(Vector3) * vertexCount);
 
-
         Vector3 *tangents;
 
@@ -377 +374 @@
         str.read(reinterpret_cast<char *>(&texCoordCount), sizeof(int));
 
-        //cout << "texCoordCount: " << texCoordCount << endl;
 
         if (texCoordCount)

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

@@ -248 +248 @@
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
-                //mHalton->GetNext(x);
+                //x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
+                mHalton->GetNext(x);
                 
                 const float a = 2.0f * M_PI * x[0];
                 const float r = sqrt(x[1]);
-                //const float rad = mRadius * r * r * r * r;
-                const float rad = mRadius * r;// * r;
+                
+                const float rad = mRadius * r;
 
                 s[i].x = rad * cos(a);

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

@@ -645 +645 @@
         VertexArray positions;
         //const float factor2 = 1.6f;
-        const float factor2 = 1.5f;
+        const float factor2 = .0f;
+        //const float factor2 = 1.5f;
 
         // for buddha (lowres)
@@ -835 +836 @@
         // another color buffer
         fbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR, ColorBufferObject::FILTER_NEAREST);
-
 
         for (int i = 0; i < 4; ++ i)

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

@@ -8 +8 @@
 //#define NUM_PRECOMPUTED_SAMPLES 8124
 #define NUM_PRECOMPUTED_SAMPLES 4096
-//#define NUM_PRECOMPUTED_SAMPLES 1024
+//#define NUM_PRECOMPUTED_SAMPLES 16
 
-//#define NUM_SAMPLES 16
-#define NUM_SAMPLES 16
+#define NUM_SAMPLES 32
+//#define NUM_SAMPLES 24
 //#define NUM_SAMPLES 32
 //#define NUM_SAMPLES 64
 
-#define MIN_SAMPLES 16
+#define MIN_SAMPLES 8
 //#define MIN_SAMPLES 48
 
@@ -26 +26 @@
 
 //#define SSAO_CONVERGENCE_THRESHOLD 300.0f
-#define SSAO_CONVERGENCE_THRESHOLD 700.0f
-//#define SSAO_CONVERGENCE_THRESHOLD 1300.0f
+//#define SSAO_CONVERGENCE_THRESHOLD 700.0f
+#define SSAO_CONVERGENCE_THRESHOLD 1300.0f
 //#define SSAO_CONVERGENCE_THRESHOLD 1500.0f
 
@@ -66 +66 @@
 #define NUM_DOF_TABS 16
 
-//#define USE_GTX
+#define USE_GTX
 
 #define SSAO_FILTER_RADIUS 5
@@ -74 +74 @@
 #define PERFORMANCE_TEST 1
 
-#define USE_OPTIMIZATION 0
+#define USE_OPTIMIZATION 1
 
 

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

@@ -3 +3 @@
 
 
-/*************************************************/
-/*     Filter for combining ssao with image      */
-/*************************************************/
+/********************************************************/
+/*         Filter for combining ssao with image         */
+/********************************************************/
 
 

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

@@ -315 +315 @@
         float3 translatedPos = -oldEyePos + worldPos.xyz + difVec;
         
+
         /////////////////
         //-- reproject into old frame and calculate texture position of sample in old frame
@@ -381 +382 @@
         pix.color.z = color.w;
 */
-        const float3 translatedPos = ComputeTranslatedPos(color, difVec.xyz, IN.view, oldEyePos, oldModelViewProj);
+        const float3 translatedPos = 
+                ComputeTranslatedPos(color, difVec.xyz, IN.view, oldEyePos, oldModelViewProj);
 
         pix.color.xyz = translatedPos;

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

@@ -53 +53 @@
 
         // get position exactly between texel centers
-        float2 center = (floor(texCoord * res) + float2(.5f)) * texCoord;
-        //center.x = (floor(texCoord.x * res.x - .5f) + 1.0f) / res.x;
-        //center.y = (floor(texCoord.y * res.y - .5f) + 1.0f) / res.y;
-        //center.y = (floor(texCoord.y * res.y) + .5f) * yOffs;
-
-        /*texelCenterConv.x = tex2Dlod(tex, float4(center + float2( xoffs,  yoffs), 0, 0)).y;
-        texelCenterConv.y = tex2Dlod(tex, float4(center + float2( xoffs, -yoffs), 0, 0)).y;
-        texelCenterConv.z = tex2Dlod(tex, float4(center + float2(-xoffs, -yoffs), 0, 0)).y;
-        texelCenterConv.w = tex2Dlod(tex, float4(center + float2(-xoffs,  yoffs), 0, 0)).y;
-
-        const float m1 = min(texelCenterConv.x, texelCenterConv.y);
-        const float m2 = min(texelCenterConv.z, texelCenterConv.w);
-
-        const float convergence = min(m1, m2);*/
-
+        float2 center = (floor(texCoord * res) + float2(.5f)) * invRes;
+        
         //const float convergence = tex2Dlod(tex, float4(center, 0, 0)).y;
         const float convergence = tex2Dlod(tex, float4(texCoord, 0, 0)).y;
@@ -133 +120 @@
 
         if (1
-                && (oldTexCoords.x > 0) && (oldTexCoords.x < 1.0f)
-                && (oldTexCoords.y > 0) && (oldTexCoords.y < 1.0f)
+                && (oldTexCoords.x > .0f) && (oldTexCoords.x < 1.0f)
+                && (oldTexCoords.y > .0f) && (oldTexCoords.y < 1.0f)
                 && (depthDif <= MIN_DEPTH_DIFF) 
                 )
         {
-                // pixel valid => retrieve the convergence weight
-                /*float w1 = tex2Dlod(oldTex, float4(oldTexCoords + float2(0.5f / 1024.0f, 0), .0f, .0f)).y;
-                float w2 = tex2Dlod(oldTex, float4(oldTexCoords - float2(0.5f / 1024.0f, 0), .0f, .0f)).y;
-                float w3 = tex2Dlod(oldTex, float4(oldTexCoords + float2(0, 0.5f / 768.0f), .0f, .0f)).y;
-                float w4 = tex2Dlod(oldTex, float4(oldTexCoords - float2(0, 0.5f / 768.0f), .0f, .0f)).y;
-
-                w = min(min(w1, w2), min(w3, w4));*/
+#if 0
+                idx = floor(oldPixel.z);
+#else
+
+                // nearest neighbour
+                float2 center;
+                center.x = (floor(oldTexCoords.x * 1024) + .5f) / 1024;
+                center.y = (floor(oldTexCoords.y * 768) + .5f) / 768;
                 
-                //w = ComputeConvergence(oldTex, oldTexCoords, float2(1024.0f, 768.0f));
-                w   = oldPixel.y;
-                idx = floor(oldPixel.z);
-                //idx = oldPixel.z;
+                const float4 oldPixelExact = tex2Dlod(oldTex, float4(center, .0f, .0f)); 
+                idx = oldPixelExact.z;
+#endif
+
+                w = oldPixel.y;
         }
         else
@@ -487 +476 @@
                 float2 offset;
 
-                const float2 ssaoOffset = tex2Dlod(samples, float4((0.5f + i + oldIdx) / NUM_PRECOMPUTED_SAMPLES, .5f, .0f, .0f)).xy;
+                const float2 ssaoOffset = tex2Dlod(samples, float4((.5f + i + floor(oldIdx)) / NUM_PRECOMPUTED_SAMPLES, .5f, .0f, .0f)).xy;
                 //const float2 ssaoOffset = dummySamples[i];
 
@@ -494 +483 @@
                 //-- (affects performance for some reason!)
 
-                if (1)//!USE_OPTIMIZATION ||
-                        //(convergence < SSAO_CONVERGENCE_THRESHOLD))
+                if (!USE_OPTIMIZATION ||
+                        (convergence < SSAO_CONVERGENCE_THRESHOLD))
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
@@ -521 +510 @@
                 float3 dirSample = samplePos - centerPosition;
 
-                const float minDist = 1e-6f;
                 const float eps = 1e-3f;
 
@@ -527 +515 @@
                 const float sampleWeight = 1.0f / max(lengthToSample, eps);
 
-                dirSample /= max(length(dirSample), minDist); // normalize
+                dirSample /= max(length(dirSample), eps); // normalize
 
                 // angle between current normal and direction to sample controls AO intensity.
@@ -540 +528 @@
 
 
-//#ifdef PERFORMANCE_TEST
-#if 1
+#ifdef PERFORMANCE_TEST
                 // check if the samples have been valid in the last frame
                 // only mark sample as invalid if in the last / current frame
@@ -552 +539 @@
                 const float distanceDiff = abs(oldDistance - lengthToSample);
 
-                float pixelValid = (oldSamplePos.x > 1e14f) ? 100.0f : .0f;
-
-                if ((cosAngle >= 0) && (pixelValid < 90.0f))// || (cosAngle2 >= 0))
-                {
-                        pixelValid = (distanceDiff > 1e-3f) ? 100.0f : .0f;
-                        //pixelValid = (distanceDiff > 1e-3f) ? 5.0f : .0f;
+                float pixelValid = .0f;
+
+                if ((texcoord.x > .0f) && (texcoord.x < 1.0f) && (texcoord.y > .0f) && (texcoord.y < 1.0f))
+                {
+                        if ((oldSamplePos.x > 1e14f))// || ((cosAngle >= 0) && (distanceDiff > 1e-3f)))
+                        {
+                                pixelValid = 100.0f;
+                        }
+                        else if ((cosAngle >= 0) && (distanceDiff > 1e-3f))
+                        {
+                                pixelValid = 5.0f;
+                        }
                 }
 
@@ -742 +735 @@
 
                 oldWeight = min(oldWeight, factor * NUM_SAMPLES);
+
                 if (newIdx >= factor * NUM_SAMPLES) 
                 {