Changeset 3226

Timestamp:

12/20/08 09:00:10 (16 years ago)

Author:

mattausch

Message:

worked on submission

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• default.env (modified) (3 diffs)
• src/ResourceManager.cpp (modified) (2 diffs)
• src/ResourceManager.h (modified) (1 diff)
• src/chcdemo.cpp (modified) (3 diffs)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/combineSsao.cg (modified) (3 diffs)
• src/shaders/deferred.cg (modified) (1 diff)
• src/shaders/ssao.cg (modified) (9 diffs)

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

@@ -41 +41 @@
 #camDirection=1 0 0
 
-camPosition=468.025 267.591 182.478
-camDirection=0.937282 0.348573 -0
+#camPosition=468.025 267.591 182.478
+#camDirection=0.937282 0.348573 -0
+
+#camPosition=470.548 265.479 181.578
+#camDirection=-0.0383892 0.999263 -0
+
+camPosition=470.541 267.286 181.978
+camDirection=-0.100954 0.993856 -0.045363
 
 #lightDirection=-0.8f 1.0f -0.7f
@@ -51 +57 @@
 ## window options
 
-#winWidth=800
-#winHeight=600
+winWidth=800
+winHeight=600
 
-winWidth=1024
-winHeight=768
+#winWidth=1024
+#winHeight=768
+#winWidth=512
+#winHeight=384
 
 useFullScreen=0
@@ -92 +100 @@
 ssaoKernelRadius=8e-1f
 # ssao sample intensity
-ssaoSampleIntensity=0.2f
+ssaoSampleIntensity=0.1f
 # ssao temporal coherence factor
 tempCohFactor=1000.0f

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

@@ -40 +40 @@
 { 
         mUseNormalMapping = false;
+        mUseSpecialColors = false;
 }
 
@@ -278 +279 @@
         }
 
+        if (mUseSpecialColors)
+        {
+                tech->mAmbientColor.r = tech->mAmbientColor.g = tech->mAmbientColor.b = 0.2f;
+                tech->mDiffuseColor.r = 0.7f; tech->mDiffuseColor.g = 0.5f; tech->mDiffuseColor.b = 0.2f;
+        }
+
 
         ///////////////

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

@@ -62 +62 @@
         /// giant hack: set this to true if the geometry to load has tangent data for normal mapping
         bool mUseNormalMapping;
+        bool mUseSpecialColors;
 
 

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

@@ -536 +536 @@
         //resourceManager->mUseNormalMapping = false;
 
+        resourceManager->mUseSpecialColors = true;
+
         //LoadModel("fisch.dem", dynamicObjects);
         LoadModel("hbuddha.dem", dynamicObjects);
@@ -544 +546 @@
 
         resourceManager->mUseNormalMapping = false;
+        resourceManager->mUseSpecialColors = false;
 
         buddha = dynamicObjects.back();
@@ -1285 +1288 @@
                         deferredShader->SetSaveFrame("", -1);           
 
-                if (makeSnapShot) makeSnapShot = false;
+                //if (makeSnapShot) makeSnapShot = false;
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;

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

@@ -7 +7 @@
 
 //#define NUM_SAMPLES 8
-//#define NUM_SAMPLES 16
-#define NUM_SAMPLES 24
+#define NUM_SAMPLES 16
+//#define NUM_SAMPLES 24
 //#define NUM_SAMPLES 48
 

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

@@ -124 +124 @@
 
         // get position exactly between old texel centers
-        float2 center;
+        /*float2 center;
         center.x = (floor(IN.texCoord.x * w - .5f) + 1.0f) / w;
         center.y = (floor(IN.texCoord.y * h - .5f) + 1.0f) / h;
@@ -137 +137 @@
 
         const float minConvergence = min(m1, m2);
-
-        //const float convergence = minConvergence;
+        const float convergence = minConvergence;*/
         //const float convergence = 0;
         const float convergence = ao.y;
@@ -161 +160 @@
         // 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);
+                OUT.illum_col.xyz = col.xyz * max(2e-2f, 1.0f - ao.x);
+                //OUT.illum_col.xyz = col.xyz * ao.x;
         else
                 OUT.illum_col.xyz = col.xyz;

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

@@ -315 +315 @@
 
         const float4 difVec = tex2Dlod(diffVals, float4(IN.texCoord, 0, 0));
+        // normalize normal once more because of bilinear interpolation
         const float3 normal = normalize(tex2Dlod(normalsTex, float4(IN.texCoord, 0, 0)).xyz);
 

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

@@ -225 +225 @@
         total_ao /= numSamples;
 
-#if 1
+#if 0
         // 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;
+        total_ao *= viewCorrection;
 
 #endif
 
-        return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
+        //return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
+        return float3(total_ao, validSamples, numSamples);
 }
 
@@ -260 +261 @@
                         float newWeight,
                         float sampleIntensity,
-                        bool isMovingObject
+                        bool isMovingObject,
+                        sampler2D normalTex
                         )
 {
@@ -288 +290 @@
                 
 
+                // the normal of the current sample
+                //const float3 sampleNormal = tex2Dlod(normalTex, float4(texcoord, 0, 0)).xyz;
+                // angle between current normal and direction to sample controls AO intensity.
+                //float cosAngle2 = .5f + dot(sampleNormal, -normal) * 0.5f;
+
                 ////////////////
                 //-- compute contribution of sample using the direction and angle
@@ -303 +310 @@
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
 
+                //total_ao += cosAngle2 * cosAngle * aoContrib;
                 total_ao += cosAngle * aoContrib;
 
@@ -318 +326 @@
                 validSamples = max(validSamples, (1.0f - tooFarAway) * pixelValid);
 
-#ifdef USE_GTX
+#if 1//#ifdef U//USE_GTX
                 // we can bail out early and use a minimal #samples)
                 // if some conditions are met as long as the hardware supports it
@@ -343 +351 @@
 
         return float3(total_ao, validSamples, numSamples);
+        //return float3(max(0.0f, 1.0f - total_ao), validSamples, numSamples);
 }
 
@@ -417 +426 @@
         if (eyeSpaceDepth < 1e10f)
         {
-                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject);
+                ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), oldWeight, sampleIntensity, isMovingObject, normals);
                 //ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals, sampleIntensity);
         }
@@ -446 +455 @@
                 else if (ao.y > partlyResetThres)
                 {
-                        //oldWeight = min(oldWeight, 4.0f * newWeight);
-                        oldWeight = .0f; 
+                        oldWeight = min(oldWeight, 4.0f * newWeight);
+                        //oldWeight = .0f; 
                 }
         }
@@ -458 +467 @@
         //-- 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.x = (ao.x * newWeight + oldSsao * oldWeight) / max(1e-6f, newWeight + oldWeight);
+        OUT.illum_col.x = (ao.x * newWeight + oldSsao * oldWeight) / (newWeight + oldWeight);
 
         OUT.illum_col.y = combinedWeight;