Changeset 2898 for GTP/trunk

Timestamp:

09/03/08 10:37:03 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (1 diff)
• src/RndGauss.h (deleted)
• src/SampleGenerator.cpp (modified) (1 diff)
• src/SampleGenerator.h (modified) (1 diff)
• src/common.h (modified) (1 diff)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/ssao.cg (modified) (1 diff)

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

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

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

@@ -130 +130 @@
         case DeferredRenderer::GAUSS:
                 {
-                        const float radius = 1.0f;
-                        const float sigma = 0.25f;//ComputeSigmaFromRadius(1.0f);
-
-                        static HaltonSequence halton;
-
-                        for (int i = 0; i < NUM_SAMPLES; ++ i)
-                        {
-                                Sample2 s;
-                                Vector3 input;
-
-                                halton.GetNext(3, (float *)&input.x);
-
-                                //GaussianOn2D(cinput, // input (RND in interval [0-1)x[0-1))
-                                //               sigma,            // standard deviation of gaussian distribution
-                                //                       outputVec)   // resulting vector according to gaussian distr.
-
-                                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;
-                        }
+                        static GaussianSampleGenerator gauss(NUM_SAMPLES, 0.5f);
+                        gauss.Generate((Sample2 *)samples);
                 }
                 break;

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

@@ -87 +87 @@
         //cout << "minDist after= " << minDist << endl;
 }
+
+
+
+GaussianSampleGenerator::GaussianSampleGenerator(int numSamples, float radius):
+SampleGenerator(numSamples, radius)
+{}
+
+
+void GaussianSampleGenerator::Generate(Sample2 *samples) const
+{
+        static HaltonSequence halton;
+        float r[2];
+
+        const float sigma = mRadius;
+
+        const float p0 = 1.0f / (sigma * sqrt(2.0f * M_PI));
+        const float p1 = 1.0f / (sigma * sqrt(2.0f * M_PI));
+
+        for (int i = 0; i < mNumSamples; ++ i)
+        {
+                halton.GetNext(2, r);
+
+                float exp_x = -(r[0] * r[0]) / (2.0f * sigma * sigma);
+                float exp_y = -(r[1] * r[1]) / (2.0f * sigma * sigma);
+
+                samples[i].x = p0 * pow(M_E, exp_x);
+                samples[i].y = p1 * pow(M_E, exp_y);
+        }
+
+        //cout << "minDist after= " << minDist << endl;
+}

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

@@ -42 +42 @@
 };
 
+
+class GaussianSampleGenerator: public SampleGenerator
+{
+public:
+        
+        GaussianSampleGenerator(int numSamples, float radius);
+
+        virtual void Generate(Sample2 *samples) const;
+};
+
+
 #endif

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

@@ -61 +61 @@
 #include <values.h>
 #else // __WATCOMC__
-#define M_PI        3.14159265358979323846F
-#define MAXFLOAT    3.40282347e+37F
+#define M_PI 3.14159265358979323846F
+#define M_E 2.71828182845904523536F
+#define MAXFLOAT 3.40282347e+37F
 #endif // __WATCOMC__
 

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

@@ -8 +8 @@
 //#define SAMPLE_INTENSITY 0.14f
 #define SAMPLE_INTENSITY 0.28f
+//#define SAMPLE_INTENSITY 0.9f
 
-//#define AREA_SIZE 50e-1f
+//#define AREA_SIZE 20e-1f
 #define AREA_SIZE 5e-1f
 

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

@@ -194 +194 @@
 
         OUT.illum_col = col * ao.x;
-        //OUT.illum_col = ao;
-
-        //OUT.illum_col.z = ao.z;
+        //OUT.illum_col = (float4)ao.x;
+
         OUT.illum_col.w = ao.w;