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

Timestamp:

12/26/08 02:44:45 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -301 +301 @@
 mSunVisiblePixels(0),
 mSavedFrameNumber(-1),
-mSavedFrameSuffix("")
+mSavedFrameSuffix(""),
+mMaxDistance(1e6f)
 {
         ///////////
@@ -488 +489 @@
         ////////////////
         
-        string dofParams[] = {"colorsTex", "filterOffs", "sceneRange"};
-
-        sCgDOFProgram->AddParameters(dofParams, 0, 3);
+        string dofParams[] = {"colorsTex", "filterOffs", "sceneRange", "zFocus"};
+
+        sCgDOFProgram->AddParameters(dofParams, 0, 4);
 
 
@@ -520 +521 @@
         // todo matt: it is stupid to put num samples and width of kernel into constructor => change this!!!
         PoissonDiscSampleGenerator2D poisson3(NUM_DOF_TABS, 1.0f);
-        poisson2.Generate((float *)dofSamples);
+        poisson3.Generate((float *)dofSamples);
+
+        for (int i = 0; i < NUM_DOF_TABS; ++ i)
+        {
+                dofSamples[i].x *= 1.0f / mWidth;
+                dofSamples[i].y *= 1.0f / mHeight;
+        }
 
         //float dofWeights[NUM_PCF_TABS];
@@ -567 +574 @@
         }
 
+        /// do depth of field
+        DepthOfField(fbo);
+
         if (useToneMapping)
         {
@@ -574 +584 @@
                 ToneMap(fbo, imageKey, whiteLum, middleGrey);
         }
-
-
-        /// do depth of field
-        DepthOfField(fbo);
 
         /// compute lense flare
@@ -1312 +1318 @@
         FlipFbos(fbo);
 
-        float sceneRange = 1.0f;
-
         int i = 0;
+
+        const float zFocus = 7.0f;
 
         sCgDOFProgram->SetTexture(i ++, colorsTex);
         sCgDOFProgram->SetArray2f(i ++, (float *)dofSamples, NUM_DOF_TABS);
-        sCgDOFProgram->SetValue1f(i ++, mCamera->GetFar() - mCamera->GetNear());
+        sCgDOFProgram->SetValue1f(i ++, min(mCamera->GetFar(), mMaxDistance) - mCamera->GetNear());
+        sCgDOFProgram->SetValue1f(i ++, zFocus);
 
         DrawQuad(sCgDOFProgram);
@@ -1442 +1449 @@
 
 
+void DeferredRenderer::SetMaxDistance(float maxDist) 
+{
+        mMaxDistance = maxDist;
+}
+
+
 void DeferredRenderer::SetSaveFrame(const string &suffix, int frameNumber)
 {