Changeset 2886 for GTP/trunk

Timestamp:

08/29/08 20:33:21 (16 years ago)

Author:

mattausch

Message:

using gaussian distribution for sampling

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/RndGauss.h (added)
• src/SampleGenerator.h (modified) (2 diffs)
• src/SsaoShader.cpp (modified) (3 diffs)
• src/SsaoShader.h (modified) (1 diff)
• src/shaderenv.h (added)
• src/shaders/ssao.cg (modified) (2 diffs)

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

@@ -292 +292 @@
                         </File>
                         <File
+                                RelativePath=".\src\RndGauss.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\src\SampleGenerator.cpp"
                                 >

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

@@ -8 +8 @@
 struct Sample2
 {
+        Sample2() {}
+        Sample2(float _x, float _y): x(_x), y(_y) {}
+
         float x; 
         float y;
@@ -33 +36 @@
 {
 public:
+        
         PoissonDiscSampleGenerator(int numSamples, float radius);
 

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

@@ -6 +6 @@
 #include "Camera.h"
 #include "shaderenv.h"
+#include "RndGauss.h"
+#include "Halton.h"
 
 
@@ -11 +13 @@
 
 static GLenum mymrt[] = {GL_COLOR_ATTACHMENT0_EXT, GL_COLOR_ATTACHMENT1_EXT, GL_COLOR_ATTACHMENT2_EXT, GL_COLOR_ATTACHMENT3_EXT};
+
 
 namespace CHCDemoEngine
@@ -103 +106 @@
 static void GenerateSamples()
 {
+#if 0
         static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
         poisson.Generate((Sample2 *)samples);
+#else
+        
+        const float radius = 1.0f;
+        const float sigma = ComputeSigmaFromRadius(1.0f);
+        
+        static HaltonSequence halton;
+
+        for (int i = 0; i < NUM_SAMPLES; ++ i)
+        {
+                Sample2 s;
+                Vector3 input;
+
+                halton.GetNext(3, (float *)&input.x);
+
+                PolarGaussianOnDisk(input,  // input (RND in interval [0-1)x[0-1))
+                                                    sigma,  // standard deviation of gaussian distribution
+                                                        radius, // standard deviation of gaussian distribution
+                                                        s);     // result
+                samples[i] = s;
+        }
+#endif
 }
 

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

@@ -83 +83 @@
 
 } // namespace 
+
 #endif // _SsaoShader_H__

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

@@ -28 +28 @@
         // reflect around plane
         float2 rpt = pt - d * 2.0f * n;
+
         return rpt;
 }
@@ -178 +179 @@
 
         OUT.illum_col = col * ao.x;
+        //OUT.illum_col = ao;
         OUT.illum_col.w = ao.w;