Changeset 3338 for GTP/trunk/App/Demos

Timestamp:

03/13/09 17:42:47 (16 years ago)

Author:

mattausch

Message:

worked on sampling

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• MainApp.vcproj (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (4 diffs)
• src/SampleGenerator.cpp (modified) (4 diffs)
• src/chcdemo.cpp (modified) (1 diff)

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

@@ -156 +156 @@
                                 IgnoreAllDefaultLibraries="false"
                                 IgnoreDefaultLibraryNames="LIBCMT"
-                                GenerateDebugInformation="false"
+                                GenerateDebugInformation="true"
                                 SubSystem="1"
                                 LargeAddressAware="2"

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

@@ -212 +212 @@
 }
 
-QuadraticDiscSampleGenerator2D nixgibts(NUM_SAMPLES, 1.0f);
-
 /** Generate poisson disc distributed sample points on the unit disc
 */
@@ -222 +220 @@
         case DeferredRenderer::SAMPLING_POISSON:
                 {
-                        static PoissonDiscSampleGenerator2D poisson(NUM_SAMPLES, 1.0f);
+                        PoissonDiscSampleGenerator2D poisson(NUM_PRECOMPUTED_SAMPLES, 1.0f);
                         poisson.Generate((float *)samples2);
                 }
@@ -228 +226 @@
         case DeferredRenderer::SAMPLING_QUADRATIC:
                 {
+                        //PoissonDiscSampleGenerator2D poisson(NUM_PRECOMPUTED_SAMPLES, 1.0f);
+                        //poisson.Generate((float *)samples2);
                         QuadraticDiscSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
-                        //static QuadraticDiscSampleGenerator2D g(NUM_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);
                 }
@@ -235 +234 @@
         default: // SAMPLING_DEFAULT
                 {
-                        static RandomSampleGenerator2D g(NUM_SAMPLES, 1.0f);
+                        RandomSampleGenerator2D g(NUM_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);
                 }

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

@@ -51 +51 @@
         int tries = 0;
 
-        //cout << "minDist before= " << minDist << endl;
+        cout << "minDist before= " << minDist << endl;
         Sample2 *s = (Sample2 *)samples;
 
@@ -64 +64 @@
                         //mHalton->GetNext(r);
 
+#if 0
                         // scale to -1 .. 1
                         const float rx = r[0] * 2.0f - 1.0f;
@@ -70 +71 @@
                         // check if in disk, else exit early
                         const float distanceSquared = rx * rx + ry * ry;
-
-                        if ((rx * rx + ry * ry > mRadius * mRadius) 
-                                // also avoid case that sample exactly in center                        
+                        if (rx * rx + ry * ry > mRadius * mRadius) 
+                                // also avoid case that sample exactly in center
                                 //|| (distanceSquared <= 1e-3f)
-                                )
+                        {
                                 continue;
+                        }
+#else
+                        const float rx = r[0];
+                        const float ry = r[1];
+#endif
 
                         bool sampleValid = true;
@@ -109 +114 @@
         }
 
-        //cout << "minDist after= " << (float)minDist / mNumSamples<< " #tries: " << tries << endl;
+        for (int i = 0; i < mNumSamples; ++ i)
+        {
+                const float a = 2.0f * M_PI * s[i].x;
+                const float r = sqrt(s[i].y);
+                
+                const float rad = mRadius * r;
+
+                s[i].x = rad * cos(a);
+                s[i].y = rad * sin(a);
+        }
+
+        cout << "minDist after= " << (float)minDist / mNumSamples<< " #tries: " << tries << endl;
 }
 

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

@@ -1179 +1179 @@
                 Matrix4x4 rotMatrix2 = RotationZMatrix(rotAngle);
                 // hack: second buddha
-                dynamicObjects[3]->GetTransform()->MultMatrix(rotMatrix2);
+                //dynamicObjects[3]->GetTransform()->MultMatrix(rotMatrix2);