Changeset 3339 for GTP/trunk/App/Demos

Timestamp:

04/10/09 15:46:35 (16 years ago)

Author:

mattausch

Message:

commiting changes after a long time (kenn mi nimma aus)

Location:

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

Files:

• SampleGenerator.cpp (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (4 diffs)

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

@@ -91 +91 @@
                                         (s[j].y - ry) * (s[j].y - ry);
                         
-                                if (dist < sqrMinDist)
-                                        sampleValid = false;
+                                if (dist < sqrMinDist) sampleValid = false;
                         }
 

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

@@ -109 +109 @@
         const float3 centerPos = ReconstructSamplePos(colorsTex, texCoord, bl, br, tl, tr);
 
-        const float scale = 1.0f;//saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
+        const float scale = saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
         //const int radius = SSAO_FILTER_RADIUS * saturate((SSAO_CONVERGENCE_THRESHOLD - convergence) / SSAO_CONVERGENCE_THRESHOLD);
         
@@ -115 +115 @@
         for (int i = -SSAO_FILTER_RADIUS; i <= SSAO_FILTER_RADIUS; ++ i)
         {
-                float4 sampleTexCoord = float4(texCoord + i * xyStep * scale, .0f, .0f);
+                const float4 sampleTexCoord = float4(texCoord + i * xyStep * scale, .0f, .0f);
                 result += FilterSample(sampleTexCoord, ssaoTex, colorsTex, centerPos, bl, br, tl, tr, maxConvergence, spatialWeight);
         }
 
         result.x /= max(result.y, 1e-6f);
-
         return saturate(result.x);
 }

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

@@ -16 +16 @@
 };
 
-
-/*struct pixel
-{
-        float4 illum_col: COLOR0;
-};
-*/
 
 struct pixel2
@@ -251 +245 @@
                 // angle between current normal and direction to sample controls AO intensity.
                 //const float cosAngle2 = dot(-dirSample, sampleNormal);
-                const float cosAngle2 = .5f + dot(sampleNormal, -normal) * 0.5f;
+                const float cosAngle2 = .5f + dot(sampleNormal, -normal) * .5f;
 
                 dirSample *= minDist;
@@ -257 +251 @@
 
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
-                total_ao += max(cosAngle, .0f) * max(cosAngle2, .0f) * aoContrib;
+                //total_ao += max(cosAngle, .0f) * max(cosAngle2, .0f) * aoContrib;
+                total_ao += max(cosAngle, .0f) * cosAngle2 * aoContrib;
 
                 ++ numSamples;
@@ -274 +269 @@
 #if 1
                 const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
-
                 const float partlyResetThres = 1.0f;