Changeset 3352 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

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

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (3 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);