Changeset 3321

Timestamp:

02/19/09 17:41:20 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• chcdemo.cpp (modified) (2 diffs)
• shaders/ssao.cg (modified) (5 diffs)

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

@@ -650 +650 @@
         positions.push_back(Vector3(6.07307, 8.20723, 6.62));
         positions.push_back(Vector3(-17.1935, 11.1687, 8.8781));
-        //positions.push_back(Vector3(499.648, 264.358, 181.7));
-        //positions.push_back(Vector3(487.913, 285.162, 181.7));
+        positions.push_back(Vector3(1.50032, 31.1943, 19.1f));
 
 #endif
@@ -658 +657 @@
         Matrix4x4 transl = TranslationMatrix(positions[0]);
         
-        LoadModel("hbuddha.dem", dynamicObjects);
+        //LoadModel("hbuddha.dem", dynamicObjects);
+        LoadModel("venusm.dem", dynamicObjects);
 
         buddha = dynamicObjects.back();

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

@@ -49 +49 @@
         // will be interpolated when upsampling and filter size does not match!
 
-        float4 texelCenterConv;
         const float2 invRes = float2(1.0f / res.x, 1.0f / res.y);
 
         // get position exactly between texel centers
-        float2 center = (floor(texCoord * res) + float2(.5f)) * texelCenterConv;
+        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;
@@ -231 +230 @@
 
                 // the normal of the current sample
+                //const float3 sampleNormal = normalize(tex2Dlod(normalTex, float4(texcoord, 0, 0)).xyz);
                 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;
+                //float cosAngle2 = dot(-dirSample, sampleNormal);
                 
                 //const float aoContrib = sampleIntensity / sqrLen;
@@ -240 +241 @@
 
                 //const float aoContrib = (1.0f > lengthToSample) ? occlusionPower(9e-2f, DISTANCE_SCALE + lengthToSample): .0f;
-                total_ao += max(cosAngle, .0f) * aoContrib * cosAngle2;
+                total_ao += max(cosAngle, .0f) * max(cosAngle2, .0f) * aoContrib;
 
                 ++ numSamples;
@@ -257 +258 @@
 #if 1
                 const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
-                if (pixelValid < 2.0f)
+
+                const float partlyResetThres = 1.0f;
+                if (0)//pixelValid <= partlyResetThres)
                         validSamples = max(validSamples, pixelValid * (1.0f - tooFarAway) * step(-0.1f, cosAngle));
                 else
@@ -389 +392 @@
                 // to have any influence in the current or last frame
 #if 1
+                const float partlyResetThres = 1.0f;
+
                 const float tooFarAway = step(0.5f, lengthToSample - changeFactor);
-                if (pixelValid < 2.0f)
+                if (0)//pixelValid <= partlyResetThres)
                         validSamples = max(validSamples, pixelValid * (1.0f - tooFarAway) * step(-0.1f, cosAngle));
                 else