Changeset 3235 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Timestamp:

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

Author:

mattausch

Message:

 

Location:

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

Files:

• Bvh.cpp (modified) (1 diff)
• DeferredRenderer.cpp (modified) (7 diffs)
• DeferredRenderer.h (modified) (3 diffs)
• SampleGenerator.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (3 diffs)
• irradiance.cpp (modified) (2 diffs)
• shaders/depthOfField.cg (modified) (5 diffs)

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

@@ -1326 +1326 @@
         {
                 while (mGeometry[i]->GetWorldCenter()[axis] < position) ++ i;
+                //while ((j > 0) && (position < mGeometry[j]->GetWorldCenter()[axis])) -- j;
                 while (position < mGeometry[j]->GetWorldCenter()[axis]) -- j;
 

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)
 {

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

@@ -88 +88 @@
         void SetSaveFrame(const std::string &suffix, int frameNumber);
 
+        void SetMaxDistance(float maxDist);
+
 
         // hack: store the color buffer idx for the currently used flip flop-MRT here
@@ -158 +160 @@
 
 
+
         ////////////
 
@@ -205 +208 @@
         int mSavedFrameNumber;
         std::string mSavedFrameSuffix;
+
+        float mMaxDistance;
 };
 

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

@@ -109 +109 @@
         }
 
-        cout << "minDist after= " << (float)minDist / mNumSamples<< " #tries: " << tries << endl;
+        //cout << "minDist after= " << (float)minDist / mNumSamples<< " #tries: " << tries << endl;
 }
 

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

@@ -541 +541 @@
         //LoadModel("fisch.dem", dynamicObjects);
         LoadModel("hbuddha.dem", dynamicObjects);
+
         //LoadModel("venusm.dem", dynamicObjects);
         //LoadModel("camel.dem", dynamicObjects);
@@ -575 +576 @@
                 dynamicObjects.push_back(ent);
         }
+
+
+        //LoadModel("vienna_full_hp.dem", dynamicObjects);
+        //dynamicObjects.back()->GetTransform()->SetMatrix(transl);
 
 
@@ -2276 +2281 @@
                 {
                         // usethe maximal visible distance to focus shadow map
-                        float maxVisibleDist = min(camera->GetFar(), traverser->GetMaxVisibleDistance());
-                        RenderShadowMap(maxVisibleDist);
+                        const float newFar = min(camera->GetFar(), traverser->GetMaxVisibleDistance());
+                        RenderShadowMap(newFar);
                 }
                 // initialize deferred rendering

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

@@ -1153 +1153 @@
                 deferredShader->SetUseTemporalCoherence(useTemporalCoherence);
                 deferredShader->SetSortSamples(sortSamples);
+                deferredShader->SetMaxDistance(traverser->GetMaxVisibleDistance());
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
@@ -2017 +2018 @@
                 {
                         // usethe maximal visible distance to focus shadow map
-                        float maxVisibleDist = min(camera->GetFar(), traverser->GetMaxVisibleDistance());
+                        const float maxVisibleDist = min(camera->GetFar(), traverser->GetMaxVisibleDistance());
                         RenderShadowMap(maxVisibleDist);
                 }

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

@@ -7 +7 @@
 
 
-float2 ComputeBlurFactors(float4 color, float sceneRange)
+float2 ComputeBlurFactors(float4 color, float sceneRange, float zFocus)
 {
         float2 result;
 
+        const float m = 1.0f;
+        const float focalLen = 1.0f;
+
+        const float scale = 5e4f;
+
         // Compute blur factor based on the CoC size scaled and normalized to 0..1 range
-        //float pixCoC = abs(Dlens * focalLen * (Zfocus - v.fDepth) / (Zfocus * (v.fDepth - focalLen)));
+        //float blur = abs(dLens * focalLen * (zFocus - color.w)) / (1e-6f + abs(zFocus * (color.w - focalLen)));
+
+        const float dist = abs(zFocus - color.w);
+        const float blur = scale * m * focalLen * dist / (sceneRange * (1e-6f + abs(color.w + dist * step(0, zFocus - color.w))));
         
-        //float blur = saturate(pixCoC * scale / maxCoC);
+        //float blur = saturate(blur * scale / maxCoC);
         
         // Depth/blurriness value scaled to 0..1 range
-        //result = float2(v.fDepth / sceneRange, blur);
+        result = float2(color.w / sceneRange, blur);
 
         return result;
@@ -30 +38 @@
                         )
 {
-        float average = .0f;
+        float4 avgCol = float4(.0f);
         float total_w = .0f;
 
         for (int i = 0; i < NUM_DOF_TABS; ++ i)
         {
-                float2 sampleTexCoord = texCoords + filterOffs[i];
+                float2 sampleTexCoord = texCoords + filterOffs[i] * blurFactors.y;
                 float4 sampleCol = tex2Dlod(colorsTex, float4(sampleTexCoord, 0, 0));
                 
@@ -41 +49 @@
                 float w = 1;
                 
-                average += sampleCol * w;
+                avgCol += sampleCol * w;
                 total_w += w;
         }
 
-        average /= max(total_w, 1e-6f);
+        avgCol /= max(total_w, 1e-6f);
 
-        return saturate(average);
+        return avgCol;
 }
 
@@ -54 +62 @@
                                         uniform sampler2D colorsTex,
                                         uniform float2 filterOffs[NUM_DOF_TABS],
-                                        uniform float sceneRange
+                                        uniform float sceneRange,
+                                        uniform float zFocus
                                          ): COLOR
 {
@@ -60 +69 @@
         const float4 color = tex2Dlod(colorsTex, float4(IN.texCoords, 0, 0));
         
-        float2 blurFactors = ComputeBlurFactors(color, sceneRange);
+        zFocus = min(zFocus, sceneRange * 0.5f);
+        float2 blurFactors = ComputeBlurFactors(color, sceneRange, zFocus);
+
+        //float4 outCol = float4(color.x, color.y, blurFactors.y, color.w);
         float4 outCol = Blur(color, IN.texCoords, blurFactors, colorsTex, filterOffs);