Changeset 3151 for GTP

Timestamp:

11/20/08 18:40:28 (16 years ago)

Author:

mattausch

Message:

worked on ssao for interpolated normals

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (1 diff)
• shaderenv.h (modified) (1 diff)
• shaders/ssao.cg (modified) (6 diffs)

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

@@ -291 +291 @@
         //-- 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);

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

@@ -477 +477 @@
         //LoadModel("hbuddha.dem", dynamicObjects);
         //LoadModel("venusm.dem", dynamicObjects);
-        //LoadModel("objects.dem", dynamicObjects);
+        LoadModel("camel.dem", dynamicObjects);
         //LoadModel("toyplane2.dem", dynamicObjects);
-        LoadModel("elephal.dem", dynamicObjects);
+        //LoadModel("elephal.dem", dynamicObjects);
 
         resourceManager->mUseNormalMapping = false;

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

@@ -11 +11 @@
 // for quadratic falloff
 //#define SAMPLE_INTENSITY 0.2f
-#define SAMPLE_INTENSITY 0.07f
-//#define SAMPLE_INTENSITY 0.015f
+//#define SAMPLE_INTENSITY 0.07f
+
+#define SAMPLE_INTENSITY 0.075f
 
 #define SAMPLE_RADIUS 8e-1f

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

@@ -245 +245 @@
 
 /** The ssao shader returning the an intensity value between 0 and 1
+        This version of the ssao shader uses the dotproduct between pixel and 
+        sample normal as weight.
 */
 float2 ssao2(fragment IN,
@@ -287 +289 @@
                 //if ((texcoord.x <= 1.0f) && (texcoord.x >= 0.0f) && (texcoord.y <= 1.0f) && (texcoord.y >= 0.0f)) ++ numSamples;
                 const float3 samplePos = ReconstructSamplePos(colors, texcoord, bl, br, tl, tr);
-                const float3 sampleNormal = normalize(tex2Dlod(normalTex, float4(IN.texCoord * 4.0f, 0, 0)).xyz);
+                const float3 sampleNormal = normalize(tex2Dlod(normalTex, float4(texcoord, 0, 0)).xyz);
 
 
@@ -299 +301 @@
 
                 // angle between current normal and direction to sample controls AO intensity.
-                float cosAngle = max(dot(sampleNormal, normal), .0f);
+                //const float cosAngle = max(-dot(sampleNormal, normal), .0f);
+                //const float cosAngle = .5f - dot(sampleNormal, normal) * 0.5f;
+                float cosAngle = .5f + dot(sampleNormal, -normal) * 0.5f;
+
+                float dirAngle = dot(dirSample, normal);
+
+                cosAngle *= step(0.0f, dirAngle);
+
+                //cosAngle *= step(0.5f, cosAngle);
+                //const float cosAngle = .5f * dot(sampleNormal, normal) + 1.0f;
         
                 // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
@@ -321 +332 @@
 
 
-/** The ssao shader returning the an intensity value between 0 and 1
+/** The ssao shader returning the an intensity value between 0 and 1.
+        This version of the ssao shader uses the dotproduct between 
+        pixel-to-sample direction and sample normal as weight.
 */
 float2 ssao(fragment IN,
@@ -374 +387 @@
 
                 // angle between current normal and direction to sample controls AO intensity.
-                float cosAngle = max(dot(dirSample, normal), .0f);
+                const float cosAngle = max(dot(dirSample, normal), .0f);
         
                 // the distance_scale offset is used to avoid singularity that occurs at global illumination when 
@@ -465 +478 @@
         if (eyeSpaceDepth < 1e10f)
         {
-                ao = ssao(IN, colors, noiseTex, samples, normal, 
-                          eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));
+                //ao = ssao(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir));
+                ao = ssao2(IN, colors, noiseTex, samples, normal, eyeSpacePos.xyz, scaleFactor, bl, br, tl, tr, normalize(viewDir), normals);
         }
         else