Changeset 3322 for GTP

Timestamp:

02/20/09 18:21:24 (15 years ago)

Author:

mattausch

Message:

found out what is wrong with halton sequence

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• Halton.cpp (modified) (1 diff)
• SampleGenerator.cpp (modified) (3 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/combineSsaoSep.cg (modified) (2 diffs)
• shaders/ssao.cg (modified) (1 diff)

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

@@ -196 +196 @@
 }
 
+QuadraticDiscSampleGenerator2D nixgibts(NUM_SAMPLES, 1.0f);
 
 /** Generate poisson disc distributed sample points on the unit disc
@@ -212 +213 @@
                 {
                         //static QuadraticDiscSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
+                        //static QuadraticDiscSampleGenerator2D g(NUM_SAMPLES, 1.0f);
                         static QuadraticDiscSampleGenerator2D g(NUM_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);

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

@@ -49 +49 @@
         }
 
-        mIndex %= 100000000;
+        //mIndex %= 100000000;
         return result;
 }

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

@@ -118 +118 @@
 
 
+#if 0
 void RandomSampleGenerator2D::Generate(float *samples) const
 {
@@ -144 +145 @@
 }
 
+#else
+
+void RandomSampleGenerator2D::Generate(float *samples) const
+{
+        Sample2 *s = (Sample2 *)samples;
+
+        int numSamples = 0;
+        float x[2];
+
+        static float total1 = 0;
+        static float total2 = 0;
+        static int totalSamples = 0;
+
+        for (int i = 0; i < mNumSamples; ++ i)
+        {
+                //x[0] = RandomValue(0, 1); x[1] = RandomValue(0, 1);
+                mHalton->GetNext(x);
+                
+                const float a = 2.0f * M_PI * x[0];
+                const float r = mRadius * sqrt(x[1]);
+
+                s[i].x = r * cos(a);
+                s[i].y = r * sin(a);
+
+                total1 += x[0];
+                total2 += x[1];
+                totalSamples ++;
+
+                if (totalSamples % 1000 == 1)
+                {
+                        float n1 = (float)total1 / totalSamples;
+                        float n2 = (float)total2 / totalSamples;
+
+                        cout << "here3 " << n1 << " " << n2 << endl;
+                }
+        }
+}
+
+#endif
 
 SphericalSampleGenerator3D::SphericalSampleGenerator3D(int numSamples, float radius):
@@ -160 +200 @@
                 r[1] = RandomValue(0, 1);
 
-                // create stratified samples over sphere
                 const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
                 const float phi = 2.0f * M_PI * r[1];

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

@@ -9 +9 @@
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-#define NUM_SAMPLES 48
+#define NUM_SAMPLES 8
 
 //#define MIN_SAMPLES 48

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

@@ -192 +192 @@
         {
                 // the filtered ssao value
-                OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                //OUT.illum_col.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 
@@ -232 +232 @@
         {
                 // the filtered ssao value
-                ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
+                //ao.x = FilterXY(IN.texCoord, ssaoTex, colorsTex, bl, br, tl, tr, xyStep, convergence, maxConvergence, spatialWeight);
         }
 

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

@@ -194 +194 @@
                 //-- (affects performance for some reason!)
 
-                if (convergence < SSAO_CONVERGENCE_THRESHOLD)
+                if (1)//convergence < SSAO_CONVERGENCE_THRESHOLD)
                 {
                         float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;