Changeset 3352

Timestamp:

04/14/09 11:59:23 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (3 diffs)
• shaders/deferred.cg (modified) (4 diffs)

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

@@ -563 +563 @@
         //////////////
 
-        string deferredParams[] = {"colors", "normals", "lightDir", "aoTex"};
-        sCgDeferredProgram->AddParameters(deferredParams, 0, 4);
+        string deferredParams[] = {"colors", "normals", "lightDir", "aoTex", "useAO"};
+        sCgDeferredProgram->AddParameters(deferredParams, 0, 5);
 
         ///////////////////
@@ -859 +859 @@
                 }
 
-
                 //if (mSortSamples) { SortSamples(); }
                 //sCgSsaoProgram->SetArray2f(i, (float *)samples2, NUM_SAMPLES);
@@ -972 +971 @@
         const Vector3 lightDir = -light->GetDirection();
 
-        sCgDeferredProgram->SetTexture(0, colorsTex);
-        sCgDeferredProgram->SetTexture(1, normalsTex);
-        sCgDeferredProgram->SetValue3f(2, lightDir.x, lightDir.y, lightDir.z);
-        sCgDeferredProgram->SetTexture(3, aoTex);
+        int i = 0;
+        sCgDeferredProgram->SetTexture(i ++, colorsTex);
+        sCgDeferredProgram->SetTexture(i ++, normalsTex);
+        sCgDeferredProgram->SetValue3f(i ++, lightDir.x, lightDir.y, lightDir.z);
+        sCgDeferredProgram->SetTexture(i ++, aoTex);
+        sCgDeferredProgram->SetValue1f(i ++, float(mShadingMethod == SSAO));
 
         DrawQuad(sCgDeferredProgram);

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

@@ -25 +25 @@
                          uniform float3 normal,
                          float3 lightDir,
-                         float4 ao)
+                         float4 ao,
+                         float useAO)
 {
         // diffuse intensity
@@ -45 +46 @@
         else 
         {
-                outColor = (ambient * ao + diffuse) * color;
-                //outColor = ambient + diffuse * color;
+                if (useAO > 0.5f)
+                        outColor = (ambient * ao + diffuse) * color;
+                else
+                        outColor = (ambient + diffuse) * color;
         }
 
@@ -60 +63 @@
                    uniform sampler2D normals,
                    uniform float3 lightDir,
-                   uniform sampler2D aoTex
+                   uniform sampler2D aoTex,
+                   uniform float useAO
                    )
 {
@@ -70 +74 @@
         
         float3 normal = normalize(norm.xyz);
-        float4 col = shade(IN, color, normal, lightDir, ao);
+        float4 col = shade(IN, color, normal, lightDir, ao, useAO);
         
         OUT.color = col;