Changeset 3232

Timestamp:

12/23/08 17:39:27 (16 years ago)

Author:

mattausch

Message:

started dof implementation (not working yet!)

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (10 diffs)
• src/DeferredRenderer.h (modified) (1 diff)
• src/SampleGenerator.cpp (modified) (1 diff)
• src/shaderenv.h (modified) (2 diffs)
• src/shaders/combineSsao.cg (modified) (3 diffs)
• src/shaders/common.h (modified) (2 diffs)
• src/shaders/depthOfField.cg (added)
• src/shaders/temporal.cg (deleted)

GTP/trunk/App/Demos/Vis/FriendlyCulling/FriendlyCulling.vcproj

@@ -776 +776 @@
                         </File>
                         <File
+                                RelativePath=".\src\shaders\depthOfField.cg"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\shaders\globillum.cg"
                                 >

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

@@ -65 +65 @@
 static ShaderProgram *sCgLenseFlareProgram = NULL;
 
+static ShaderProgram *sCgDOFProgram = NULL;
+
 
 static GLuint noiseTex2D = 0;
@@ -74 +76 @@
 #define NUM_PRECOMPUTED_SAMPLES 240
 static Sample2 samples2[NUM_PRECOMPUTED_SAMPLES];
-// number of pcf tabs
+// pcf samples
 static Sample2 pcfSamples[NUM_PCF_TABS];
+// dof samples
+static Sample2 dofSamples[NUM_DOF_TABS];
 
 
@@ -392 +396 @@
         sCgPrepareSsaoProgram = sm->CreateFragmentProgram("deferred", "PrepareSsao", "PrepareSsao");
         sCgLenseFlareProgram = sm->CreateFragmentProgram("lenseFlare", "LenseFlare", "LenseFlare");
+        sCgDOFProgram = sm->CreateFragmentProgram("depthOfField", "DepthOfField", "DepthOfField");
 
 
@@ -408 +413 @@
                  "temporalCoherence", "samples", "bl", "br", "tl", 
                  "tr", "oldModelViewProj", "modelViewProj"};
+
         sCgGiProgram->AddParameters(giParams, 0, 13);
 
@@ -433 +439 @@
                 "ssaoFilterRadius", "modelViewProj", "bl", "br", "tl", 
                 "tr", "w", "h"};
+
         sCgCombineSsaoProgram->AddParameters(combineSsaoParams, 0, 13);
 
@@ -471 +478 @@
 
         ////////////////
-
         
         string lenseFlareParams[] = 
@@ -479 +485 @@
         sCgLenseFlareProgram->AddParameters(lenseFlareParams, 0, 9);
 
-
+        
         ////////////////
-        //-- prepare filters for ssao
+        
+        string dofParams[] = {"colorsTex", "filterOffs", "sceneRange"};
+
+        sCgDOFProgram->AddParameters(dofParams, 0, 3);
+
+
+        ////////////////
+        //-- prepare filter for ssao
 
         PrepareSsaoFilter();
@@ -500 +513 @@
         sCgDeferredShadowProgram->SetArray2f(8, (float *)pcfSamples, NUM_PCF_TABS);
         sCgDeferredShadowProgram->SetArray1f(9, (float *)filterWeights, NUM_PCF_TABS);
+
+
+        /////////
+        //-- pcf tabs for depth of field
+
+        // 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);
+
+        //float dofWeights[NUM_PCF_TABS];
+        //sCgDOFProgram->SetArray1f(2, (float *)dofWeights, NUM_DOF_TABS);
 
         PrintGLerror("init");
@@ -551 +575 @@
         }
 
+
+        /// do depth of field
+        DepthOfField(fbo);
+
         /// compute lense flare
         LenseFlare(fbo, light);
@@ -1277 +1305 @@
 
 
+void DeferredRenderer::DepthOfField(FrameBufferObject *fbo)
+{
+        ColorBufferObject *colorBuffer = fbo->GetColorBuffer(colorBufferIdx);
+        GLuint colorsTex = colorBuffer->GetTexture();
+        
+        FlipFbos(fbo);
+
+        float sceneRange = 1.0f;
+
+        int i = 0;
+
+        sCgDOFProgram->SetTexture(i ++, colorsTex);
+        sCgDOFProgram->SetArray2f(i ++, (float *)dofSamples, NUM_DOF_TABS);
+        sCgDOFProgram->SetValue1f(i ++, sceneRange);
+
+        DrawQuad(sCgDOFProgram);
+
+        PrintGLerror("LenseFlare");
+}
+
+
 void DeferredRenderer::SaveFrame(FrameBufferObject *fbo)
 {

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

@@ -155 +155 @@
         void SaveFrame(FrameBufferObject *fbo);
 
+        void DepthOfField(FrameBufferObject *fbo);
+
 
         ////////////

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

@@ -189 +189 @@
 #else
 
-        //static PoissonDiscSampleGenerator2D poisson(mNumSamples, 1.0f);
-        //poisson.Generate(samples);
-
         PoissonDiscSampleGenerator2D::Generate(samples);
 

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

@@ -6 +6 @@
 //-- ssao + gi parameters
 
-//#define NUM_SAMPLES 8
+#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 48
+//#define NUM_SAMPLES 48
 
 #define MIN_SAMPLES 8
@@ -60 +60 @@
 #define NUM_DOWNSAMPLES 9
 
+#define NUM_DOF_TABS 16
 
 
+//#define USE_GTX
+
 #endif // __SHADERENV_H

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

@@ -115 +115 @@
         float4 ao =  tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
 
+#if 0 // use half size
+
         // the following has to be done for half resolution ssao:
         // get the minimum convergence by exactly sampling the 4 surrounding
@@ -124 +126 @@
 
         // get position exactly between old texel centers
-        /*float2 center;
+        float2 center;
         center.x = (floor(IN.texCoord.x * w - .5f) + 1.0f) / w;
         center.y = (floor(IN.texCoord.y * h - .5f) + 1.0f) / h;
@@ -137 +139 @@
 
         const float minConvergence = min(m1, m2);
-        const float convergence = minConvergence;*/
-        //const float convergence = 0;
+        const float convergence = minConvergence;
+
+#else
+        
+        // just take unfiltered convergence in current pixel
         const float convergence = ao.y;
 
+#endif
+        
         // filter reaches size 1 pixel when sample size reaches threshold 
         // afterwards we do not use the filter anymore

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/common.h

@@ -47 +47 @@
 
 
-
-
 inline float2 myrotate(float2 pt, float angle)
 {
@@ -60 +58 @@
 }
 
-
-#define USE_GTX