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

Timestamp:

07/09/09 10:21:25 (15 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (5 diffs)

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

@@ -537 +537 @@
         string deferredShadowParams[] = 
                 {"colors", "normals", "shadowMap", "noiseTex", "shadowMatrix", 
-                 "sampleWidth", "lightDir", "eyePos", "samples", "weights"};
-        
-        sCgDeferredShadowProgram->AddParameters(deferredShadowParams, 0, 10);
+                 "sampleWidth", "lightDir", "eyePos", "samples", "weights",
+             "aoTex", "useAO"};
+        
+        sCgDeferredShadowProgram->AddParameters(deferredShadowParams, 0, 12);
         
         ////////////////
@@ -630 +631 @@
         //-- pcf tabs for depth of field
 
-        // todo matt: it is stupid to put num samples and width of kernel into constructor => change this!!!
+        // todo matt: bad style to put #samples and width of kernel into constructor => change this!!!
         PoissonDiscSampleGenerator2D poisson3(NUM_DOF_TABS, 1.0f);
         poisson3.Generate((float *)dofSamples);
@@ -639 +640 @@
                 dofSamples[i].y *= 1.0f / mHeight;
         }
-
-        //float dofWeights[NUM_PCF_TABS];
-        //sCgDOFProgram->SetArray1f(2, (float *)dofWeights, NUM_DOF_TABS);
 
         PrintGLerror("init");
@@ -1148 +1146 @@
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
         GLuint normalsTex = fbo->GetColorBuffer(1)->GetTexture();
+        GLuint aoTex = mTempFbo->GetColorBuffer(1)->GetTexture();
 
         GLuint shadowTex = shadowMap->GetDepthTexture();
@@ -1167 +1166 @@
         sCgDeferredShadowProgram->SetValue3f(6, lightDir.x, lightDir.y, lightDir.z);
         sCgDeferredShadowProgram->SetValue3f(7, mEyePos.x, mEyePos.y, mEyePos.z);
+
+        sCgDeferredShadowProgram->SetTexture(10, aoTex);
+        sCgDeferredShadowProgram->SetValue1f(11, float(mShadingMethod == SSAO));
 
         DrawQuad(sCgDeferredShadowProgram);