Changeset 3189

Timestamp:

11/27/08 02:14:31 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (7 diffs)
• DeferredRenderer.h (modified) (2 diffs)
• SkyPreetham.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (5 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/antialiasing.cg (modified) (1 diff)
• shaders/combineSsao.cg (modified) (3 diffs)
• shaders/deferred.cg (modified) (1 diff)

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

@@ -287 +287 @@
 mSamplingMethod(SAMPLING_POISSON),
 mShadingMethod(DEFAULT),
-mIllumFboIndex(0)
+mIllumFboIndex(0),
+mSortSamples(true)
 {
         ///////////
         //-- the flip-flop fbos
 
-        const int dsw = w / 2; const int dsh = h / 2;
-        //const int dsw = w; const int dsh = h;
+        //const int dsw = w / 2; const int dsh = h / 2;
+        const int dsw = w; const int dsh = h;
 
         mIllumFbo = new FrameBufferObject(dsw, dsh, FrameBufferObject::DEPTH_NONE);
@@ -515 +516 @@
         }
 
-        // antialiasing of the color buffer
-        //AntiAliasing(fbo, light);
+        // multisampling is difficult / costly with deferred shading
+        // at least do some edge blurring 
+        if (useAntiAliasing) AntiAliasing(fbo, light);
 
         switch (mShadingMethod)
@@ -543 +545 @@
         // multisampling is difficult / costly with deferred shading
         // at least do some edge blurring 
-
-        if (useAntiAliasing)
-                AntiAliasing(fbo, light);
-        else
-                Output(fbo); // just output the latest buffer
+        //if (useAntiAliasing) AntiAliasing(fbo, light); else 
+        Output(fbo); // just output the latest buffer
 
         glEnable(GL_LIGHTING);
@@ -590 +589 @@
 void DeferredRenderer::SortSamples()
 {
-        //for (int i = 0; i < NUM_SAMPLES; ++ i)cout << SqrDist(samples2[i-1], samples2[i]) << "|";
-        float dist = 0;
-        for (int i = 1; i < NUM_SAMPLES; ++ i)
-                dist += SqrDist(samples2[i-1], samples2[i]);
-                //cout << samples2[i].x << " " << samples2[i].y 
-
-        //cout << "\nbefore: " << dist << endl;
-
-        //sort(samples2, samples2 + sizeof(samples2) / sizeof(Sample2), lt2);
-
-
         static Sample2 tempSamples[NUM_SAMPLES];
         static bool checked[NUM_SAMPLES];
@@ -636 +624 @@
         for (int i = 0; i < NUM_SAMPLES; ++ i)
                 samples2[i] = tempSamples[i];
-
-        dist = 0;
-        for (int i = 1; i < NUM_SAMPLES; ++ i)
-                dist += SqrDist(samples2[i-1], samples2[i]);
-                //cout << samples2[i].x << " " << samples2[i].y << " " << SqrDist(samples2[i-1], samples2[i]) << "|";
-
-        //cout << "after:  " << dist << endl;
 }
 
@@ -693 +674 @@
                 GenerateSamples(mSamplingMethod);
 
-                SortSamples();
+                if (mSortSamples) { SortSamples(); }
                 sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
         }
@@ -749 +730 @@
 
         // read the second buffer, write to the first buffer
-        //FlipFbos(fbo);
+        FlipFbos(fbo);
         // end of the pipeline => just draw image to screen
-        FrameBufferObject::Release();
+        //FrameBufferObject::Release();
 
         // the neighbouring texels

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

@@ -56 +56 @@
         */
         void SetShadingMethod(SHADING_METHOD s);
+
+        void SetSortSamples(bool sortSamples) { mSortSamples = sortSamples; }
 
         // hack: store the color buffer idx for the currently used flip flop-MRT here
@@ -146 +148 @@
         Vector3 mEyePos;
         Vector3 mOldEyePos;
+
+        bool mSortSamples;
 };
 

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

@@ -293 +293 @@
         // downscale ambient color
         if (scaleToRange)
-                ambient *= 5e-6f;
+                ambient *= 8e-6f;
         else
                 ambient *= 1e-1f;
@@ -333 +333 @@
         // calculate final sun diffuse color.
         if (scaleToRange)
-                diffuse = color * 1e-5f;
+                diffuse = color * 3e-5f;
         else
                 diffuse = color * 3e-1f;

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

@@ -106 +106 @@
 
 MotionPath *motionPath = NULL;
-
+/// max depth where candidates for tighter bounds are searched
 int maxDepthForTestingChildren = 3;
 
@@ -213 +213 @@
 PerformanceGraph *perfGraph = NULL;
 
-static float ssaoTempCohFactor = 255.0;
-static int sCurrentMrtSet = 0;
+float ssaoTempCohFactor = 255.0;
+bool sortSamples = true;
+int sCurrentMrtSet = 0;
 
 static Matrix4x4 invTrafo = IdentityMatrix();
@@ -1138 +1139 @@
                 deferredShader->SetSamplingMethod(samplingMethod);
                 deferredShader->SetUseTemporalCoherence(useTemporalCoherence);
+                deferredShader->SetSortSamples(sortSamples);
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
@@ -1311 +1313 @@
                 useRenderQueue = !useRenderQueue;
                 traverser->SetUseRenderQueue(useRenderQueue);
-                
                 break;
         case 'b':
@@ -1329 +1330 @@
         case 'I':
                 useAntiAliasing = !useAntiAliasing;
+                break;
+        case '9':
+                sortSamples = !sortSamples;
                 break;
         default:

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

@@ -6 +6 @@
 //-- ssao + gi parameters
 
-#define NUM_SAMPLES 8
+//#define NUM_SAMPLES 8
+#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
 
 // for quadratic falloff
 //#define SAMPLE_INTENSITY 0.2f
-#define SAMPLE_INTENSITY 0.07f
-//#define SAMPLE_INTENSITY 0.01f
+//#define SAMPLE_INTENSITY 0.07f
+#define SAMPLE_INTENSITY 0.008f
 
 //#define SAMPLE_INTENSITY 0.075f
 //#define SAMPLE_INTENSITY 0.2f
 
-#define SAMPLE_RADIUS 8e-1f
+//#define SAMPLE_RADIUS 8e-1f
+#define SAMPLE_RADIUS 4e-1f
 
 //#define DISTANCE_SCALE 1e-1f

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

@@ -76 +76 @@
 
         //const float de = saturate(dot(dd, weights.y));
-        const float de = weights.y * dd.x + dd.y + dd.z + dd.w;
+        const float de = weights.y * dd.x * dd.y * dd.z * dd.w;
 
 

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

@@ -130 +130 @@
                 spatialFactor = 1.0f / max(len, 1e-3f);
 
-                //normalFactor = max(step(0.6f, dot(sampleNorm, centerNormal)), 1e-3f);
-                normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
+                normalFactor = max(step(.0f, dot(sampleNorm, centerNormal)), 1e-3f);
+                //normalFactor = max(dot(sampleNorm, samplePos), 1e-3f);
                 //convergenceFactor = min(100.0f, aoSample.y);
                 convergenceFactor = aoSample.y;
@@ -137 +137 @@
                 // combine the weights
                 w = convergenceFactor * spatialFactor * normalFactor;
+                //w = convergenceFactor * spatialFactor;
 
                 average += aoSample.x * w;
@@ -169 +170 @@
         float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
-        // reconstruct position from the eye space depth
-        /*const float4 worldPos = float4(-IN.view * eyeSpaceDepth, 1.0f);
-        // compute w factor from projection in order to control filter size
-        const float4 projPos = mul(modelViewProj, worldPos);
-        const float distanceScale = 1.0f / projPos.w;
-*/
-
         // filter up to a certain convergance value and leave out background (sky) by checking depth
         if ((ao.y < 100.0f) && (col.w < 1e10f))

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

@@ -290 +290 @@
         float validPixel;
 
-        if ((((squaredLen <= DYNAMIC_OBJECTS_THRESHOLD) && (oldPixel.z <= DYNAMIC_OBJECTS_THRESHOLD)) || 
-                (depthDif <= MIN_DEPTH_DIFF))
+        const bool oldDynamic = (squaredLen <= DYNAMIC_OBJECTS_THRESHOLD);
+        const bool newDynamic = (oldPixel.z <= DYNAMIC_OBJECTS_THRESHOLD);
+
+        if (!(oldDynamic && !newDynamic) && !(!oldDynamic && newDynamic) &&
+                !(oldDynamic && newDynamic && (depthDif > MIN_DEPTH_DIFF))
                 && (oldTexCoords.x >= 0.0f) && (oldTexCoords.x < 1.0f)
                 && (oldTexCoords.y >= 0.0f) && (oldTexCoords.y < 1.0f)