Changeset 3225

Timestamp:

12/19/08 01:56:47 (16 years ago)

Author:

mattausch

Message:

versio for paper submission

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• default.env (modified) (1 diff)
• src/chcdemo.cpp (modified) (6 diffs)
• src/shaderenv.h (modified) (2 diffs)
• src/shaders/combineSsao.cg (modified) (3 diffs)
• src/shaders/ssao.cg (modified) (10 diffs)
• toto.txt (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -112 +112 @@
                                 EnableFiberSafeOptimizations="true"
                                 AdditionalIncludeDirectories="libs;libs/GL;libs/Devil/include;src;libs/Zlib/include;"$(CG_INC_PATH)""
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SET"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SET;NOT_USE_GTX"
                                 StringPooling="true"
                                 RuntimeLibrary="2"

GTP/trunk/App/Demos/Vis/FriendlyCulling/default.env

@@ -88 +88 @@
 
 # use full resolution ssao (vs. half resoltion)
-ssaoUseFullResolution=0
+ssaoUseFullResolution=1
 # ssao kernel radius
 ssaoKernelRadius=8e-1f

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

@@ -131 +131 @@
 StatsWriter *statsWriter = NULL;
 
+bool makeSnapShot = false;
+
 
 /// the technique used for rendering
@@ -1038 +1040 @@
         //-- update animations
 
-        Matrix4x4 rotMatrix = RotationZMatrix(M_PI * 1e-3f);
+        //const float rotAngle = M_PI * 1e-3f;
+        const float rotAngle = 1.0f * M_PI / 180.0f;
+
+        Matrix4x4 rotMatrix = RotationZMatrix(rotAngle);
         dynamicObjects[1]->GetTransform()->MultMatrix(rotMatrix);
 
         motionPath->Move(0.01f);
-
 
 
@@ -1263 +1267 @@
                 }
 
+                static int snapShotIdx = 0;
+
                 deferredShader->SetSunVisiblePixels(sunVisiblePixels);
                 deferredShader->SetShadingMethod(shadingMethod);
@@ -1271 +1277 @@
                 deferredShader->SetUseTemporalCoherence(useTemporalCoherence);
                 deferredShader->SetSortSamples(sortSamples);
-                deferredShader->SetSaveFrame(recordedFramesSuffix, (recordFrames && replayPath) ? currentReplayFrame : -1);
+
+                if (recordFrames && replayPath)
+                        deferredShader->SetSaveFrame(recordedFramesSuffix, currentReplayFrame);
+                else if (makeSnapShot)
+                        deferredShader->SetSaveFrame("snap", snapShotIdx ++);           
+                else
+                        deferredShader->SetSaveFrame("", -1);           
+
+                if (makeSnapShot) makeSnapShot = false;
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
@@ -1503 +1517 @@
                 // move light source instead of camera tilt
                 moveLight = !moveLight;
+                break;
+        case '#':
+                // make a snapshot of the current frame
+                makeSnapShot = true;
                 break;
         default:
@@ -2379 +2397 @@
         cout << "\nloading model " << filename << endl;
         if (resourceManager->Load(filename, entities))
+        {
                 cout << "model " << filename << " successfully loaded" << endl;
+        }
         else
         {
                 cerr << "loading model " << filename << " failed" << endl;
+
                 CleanUp();
                 exit(0);

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
+#define NUM_SAMPLES 24
 //#define NUM_SAMPLES 48
 
@@ -58 +58 @@
 #define DYNAMIC_OBJECTS_THRESHOLD 1e-8f
 
-#define USE_GTX
 
 #endif // __SHADERENV_H

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

@@ -138 +138 @@
         const float minConvergence = min(m1, m2);
 
-        const float convergence = minConvergence;
+        //const float convergence = minConvergence;
         //const float convergence = 0;
-        //const float convergence = ao.y;
+        const float convergence = ao.y;
 
         // filter reaches size 1 pixel when sample size reaches threshold 
@@ -159 +159 @@
         }
 
+        // just apply ssao if we are not in the sky
         if (col.w < 1e10f)
                 OUT.illum_col.xyz = col.xyz * max(1e-1f, 1.0f - ao.x);
@@ -164 +165 @@
                 OUT.illum_col.xyz = col.xyz;
 
+
+        //OUT.illum_col.xyz = float3(abs(ao.y * 1e2f), abs(ao.z * 1e2f), abs(ao.w * 1e2f));
+
+        //if (convergence < (1.0f + NUM_SAMPLES * 10))
+        //      OUT.illum_col.xyz = float3(1 - convergence / (NUM_SAMPLES * 10), convergence / (NUM_SAMPLES * 10), 0);
+        
+        //OUT.illum_col.xyz = float3(ao.z * 1e4f, ao.z * 1e4f, ao.z * 1e4f);
+
         //OUT.illum_col.xyz = float3(ao.x, ao.x, step(thres, convergence));
-        //OUT.illum_col.xyz = float3(0, convergence, 0);
         //OUT.illum_col.xyz = float3(abs(center.x - IN.texCoord.x) * 16.0f, abs(center.y - IN.texCoord.y) * 12.0f, 0);
-        
-        //OUT.illum_col.xyz = float3(0, clamp(1.0f - ao.y * 1e-3f, 0, 1), 1);
         //OUT.illum_col.xyz = float3(0, 1.0f - step(0.5f + NUM_SAMPLES, convergence), 1);
+
         OUT.illum_col.w = col.w;
 

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

@@ -119 +119 @@
         const float depthDif = abs(1.0f - oldEyeSpaceDepth / projectedEyeSpaceDepth);
 
-        const float xOffs = 1.0f / 1024.0f;
-        const float yOffs = 1.0f / 768.0f;
-        const float eps = 1e-6f;
-
-        // the weight of the old value
+        //const float xOffs = 1.0f / 1024.0f; const float yOffs = 1.0f / 768.0f; const float eps = 1e-6f;
+
+        // the weight of the accumulated samples from the previous frames
         float w;
 
@@ -130 +128 @@
 
         if (1
-                && (oldTexCoords.x + eps >= xOffs) && (oldTexCoords.x <= 1.0f - xOffs + eps)
-                && (oldTexCoords.y + eps >= yOffs) && (oldTexCoords.y <= 1.0f - yOffs + eps)
+        //      && (oldTexCoords.x + eps >= xOffs) && (oldTexCoords.x <= 1.0f - xOffs + eps)
+        //      && (oldTexCoords.y + eps >= yOffs) && (oldTexCoords.y <= 1.0f - yOffs + eps)
+                && (oldTexCoords.x > 0) && (oldTexCoords.x < 1.0f)
+                && (oldTexCoords.y > 0) && (oldTexCoords.y < 1.0f)
                 && (depthDif <= MIN_DEPTH_DIFF) 
                 )
@@ -215 +215 @@
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
 
-#if 1
-                // if surface normal perpenticular to view dir, approx. half of the samples will not count
-                // => compensate for this (on the other hand, projected sampling area could be larger!)
-
-                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * max(dot(viewDir, normal), 0.0f);
-                total_ao += cosAngle * aoContrib * viewCorrection;
-#else
                 total_ao += cosAngle * aoContrib;
-#endif
+
                 // check if the samples have been valid in the last frame
                 validSamples += (1.0f - step(1.0f, lengthToSample)) * sampleColor.x;
@@ -231 +224 @@
 
         total_ao /= numSamples;
+
+#if 1
+        // if surface normal perpenticular to view dir, approx. half of the samples will not count
+        // => compensate for this (on the other hand, projected sampling area could be larger!)
+        const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * max(dot(viewDir, normal), 0.0f);
+        total_ao += cosAngle * aoContrib * viewCorrection;
+
+#endif
 
         return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
@@ -302 +303 @@
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
 
-#if 1
-                // if surface normal perpenticular to view dir, approx. half of the samples will not count
-                // => compensate for this (on the other hand, projected sampling area could be larger!)
-
-                const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * max(dot(viewDir, normal), 0.0f);
-                total_ao += cosAngle * aoContrib * viewCorrection;
-#else
                 total_ao += cosAngle * aoContrib;
-#endif
 
                 ++ numSamples;
@@ -325 +318 @@
                 validSamples = max(validSamples, (1.0f - tooFarAway) * pixelValid);
 
-#ifdef QWQ//USE_GTX
+#ifdef USE_GTX
                 // we can bail out early and use a minimal #samples)
                 // if some conditions are met as long as the hardware supports it
@@ -337 +330 @@
                 }
 #endif
-
-        }
-
-        // scale ao contribution
+        }
+
+        // "normalize" ao contribution
         total_ao /= numSamples;
+
+#if 1
+        // if surface normal perpenticular to view dir, approx. half of the samples will not count
+        // => compensate for this (on the other hand, projected sampling area could be larger!)
+        const float viewCorrection = 1.0f + VIEW_CORRECTION_SCALE * max(dot(viewDir, normal), 0.0f);
+        total_ao *= viewCorrection;
+#endif
 
         return float3(total_ao, validSamples, numSamples);
@@ -434 +433 @@
         const float newWeight = ao.z;
 
+        // completely reset the ao in this pixel
         const float completelyResetThres = 4.0f;
+        // don't fully reset the ao in this pixel, but give low weight to old solution
         const float partlyResetThres = 1.0f;
         
@@ -440 +441 @@
         {
                 if (ao.y > completelyResetThres) 
+                {
                         oldWeight = .0f; 
+                }
                 else if (ao.y > partlyResetThres)
-                        oldWeight = min(oldWeight, 4.0f * newWeight);
+                {
+                        //oldWeight = min(oldWeight, 4.0f * newWeight);
+                        oldWeight = .0f; 
+                }
         }
 
@@ -448 +454 @@
         const float combinedWeight = clamp(newWeight + oldWeight, .0f, temporalCoherence);
 
+
         //////////
         //-- blend ao between old and new samples (and avoid division by zero)
+
         OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight) / max(1e-6f, newWeight + oldWeight);
 
+        OUT.illum_col.y = combinedWeight;
+        // can be used to check if this pixel belongs to a moving object
         OUT.illum_col.z = SqrLen(diffVec);
-        OUT.illum_col.y = combinedWeight;
         OUT.illum_col.w = eyeSpaceDepth;
 
+        //OUT.illum_col.yzw = diffVec;
+
         return OUT;
 }

GTP/trunk/App/Demos/Vis/FriendlyCulling/toto.txt

@@ -146 +146 @@
 scenequery
 
-fix walk speed
+fix walk speed for deferred shading
+
+fix color bleeding
+fix ao2
+fix full resolution mode
+
+for the paper: make ao more efficient, for example we do not need to downsample normal texture for ao version 1
+also for full resolution mode: test what happens if we do not use downsampling, look why currently so slow with full resolution (was previously > 80 frame or so!!)