Changeset 3233

Timestamp:

12/24/08 01:36:00 (15 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• SampleGenerator.cpp (modified) (2 diffs)
• ShadowMapping.cpp (modified) (1 diff)
• ShadowMapping.h (modified) (4 diffs)

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

@@ -1318 +1318 @@
         sCgDOFProgram->SetTexture(i ++, colorsTex);
         sCgDOFProgram->SetArray2f(i ++, (float *)dofSamples, NUM_DOF_TABS);
-        sCgDOFProgram->SetValue1f(i ++, sceneRange);
+        sCgDOFProgram->SetValue1f(i ++, mCamera->GetFar() - mCamera->GetNear());
 
         DrawQuad(sCgDOFProgram);

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

@@ -27 +27 @@
 void PoissonDiscSampleGenerator2D::Generate(float *samples) const
 {
-        // this is a hacky poisson sampling generator which does random dart-throwing on a disc.
-        // as a savety criterium, the min distance requirement is relaxed if we are not 
+        // Poisson disc sampling generator using relaxation 
+        // dart-throwing as proposed by McCool et al.
+        // the min distance requirement is relaxed if we are not 
         // able to place any dart for a number of tries
-        // the solution is a possion sampling with respect to the adjusted min distance
-        // better solutions have been proposed, i.e., using hierarchical sampling
-        const int maxTries = 1000;
+        // the solution is a possion sampling with respect 
+        // to the adjusted min distance
+        // this sampling scheme has the benefit that it is hierarchical 
+        int maxTries = 1000;
         const float f_reduction = 0.9f;
-
-
+        
         float r[2];
 
         // generates poisson distribution on disc
-        // start with some threshold. best case: all samples lie on the circumference
-        //const float minDist = 2.0f * mRadius / sqrt((float)mNumSamples);
+        // start with some threshold
+        // best case: all samples lie on the circumference of circle
+         
         const float eps = 0.2f;
         const float minDist = 2.0f * mRadius * M_PI * (1.0f - eps) / (float)mNumSamples;
@@ -105 +107 @@
         }
 
-        //cout << "minDist after= " << sqrt(sqrMinDist) << " #tries: " << totalTries << endl;
+        cout << "minDist after= " << sqrt(sqrMinDist) << " #tries: " << totalTries << endl;
 }
 

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

@@ -454 +454 @@
 
         transform2LispSM.x[0][0] =  1.0f;
-        transform2LispSM.x[1][2] =  -1.0f; // y => -z
+        transform2LispSM.x[1][2] = -1.0f; // y => -z
         transform2LispSM.x[2][1] =  1.0f; // z => y
         transform2LispSM.x[3][3] =  1.0f;

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

@@ -26 +26 @@
 public:
         /** Constructor taking the scene boundig box and the current camera. 
-                The shadow map has resolution size squared.
+                The shadow map is quadratic and has resolution mapSize squared.
         */
-        ShadowMap(DirectionalLight *light, int size, const AxisAlignedBox3 &sceneBox, PerspectiveCamera *cam);
+        ShadowMap(DirectionalLight *light, int mapSize, const AxisAlignedBox3 &sceneBox, PerspectiveCamera *cam);
 
         ~ShadowMap();
@@ -34 +34 @@
         */
         void ComputeShadowMap(RenderTraverser *traverser, const Matrix4x4 &projView);
+        /** Renders the scene from shadow view using conventional shading.
+        */
+        void RenderShadowView(RenderTraverser *renderer, const Matrix4x4 &projView);
         /** Returns computed shadow color texture.
         */
@@ -48 +51 @@
         */
         void GetTextureMatrix(Matrix4x4 &m) const;
-        /** Return shadow size.
+        /** Returns shadow map size.
         */
         int GetSize() const { return mSize; }
@@ -54 +57 @@
         */
         PerspectiveCamera *GetShadowCamera() const { return mShadowCam; }
-        /** Renders the scene from shadow view using conventional shading.
-        */
-        void RenderShadowView(RenderTraverser *renderer, const Matrix4x4 &projView);
+
         /** Draws LispSM intersection body B and the used light frustrum
         */