Changeset 2902

Timestamp:

09/04/08 12:55:36 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• SampleGenerator.cpp (modified) (4 diffs)
• SampleGenerator.h (modified) (1 diff)
• shaders/ssao3d.cg (modified) (1 diff)

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

@@ -8 +8 @@
 HaltonSequence PoissonDiscSampleGenerator::sHalton;
 HaltonSequence GaussianSampleGenerator::sHalton;
+HaltonSequence PseudoRandomGenerator::sHalton;
 
 
@@ -125 +126 @@
 
 
+PseudoRandomGenerator::PseudoRandomGenerator(int numSamples, float radius):
+SampleGenerator(numSamples, radius)
+{}
+
+
+void PseudoRandomGenerator::Generate(float *samples) const
+{
+        sHalton.GetNext(2 * mNumSamples, samples);
+}
+
+
 SphericalSampleGenerator::SphericalSampleGenerator(int numSamples, float radius):
 SampleGenerator(numSamples, radius)
@@ -134 +146 @@
         float r[2];
         Sample3 *s = (Sample3 *)samples;
+/*      
+        // idea: use poisson distribution to generate samples
 
-        // idea: use poisson distribution to generate samples
         PoissonDiscSampleGenerator poisson(mNumSamples, 1.0f);
         Sample2 *pSamples = new Sample2[mNumSamples];
-
         poisson.Generate((float *)pSamples);
-
+*/
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                //sHalton.GetNext(2, r);
-                r[0] = pSamples[i].x; r[1] = pSamples[i].y;
+                sHalton.GetNext(2, r);
+                //r[0] = pSamples[i].x; r[1] = pSamples[i].y;
 
                 // create stratified samples over sphere
@@ -155 +167 @@
         }
 
-        delete [] pSamples;
+        //delete [] pSamples;
 }

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

@@ -47 +47 @@
 
 
+class PseudoRandomGenerator: public SampleGenerator
+{
+public:
+        
+        PseudoRandomGenerator(int numSamples, float radius);
+
+        virtual void Generate(float *samples) const;
+
+protected:
+
+        static HaltonSequence sHalton;
+};
+
+
 class PoissonDiscSampleGenerator: public SampleGenerator
 {

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

@@ -59 +59 @@
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
-                const float3 offset = samples[i] * AREA_SIZE;
+                const float3 offset = samples[i];
 
                 ////////////////////
                 // add random noise: r stores costheta, g stores sintheta
 
-                float3 mynoise = (float3)tex2D(noiseTexture, IN.texCoord.xy * noiseMultiplier);
-                const float3 offsetTransformed = reflect(offset, mynoise);
-                //const float3 offsetTransformed = offset;
+                float3 mynoise = (float3)tex2D(noiseTexture, IN.texCoord.xy);// * noiseMultiplier);
+                //const float3 offsetTransformed = myreflect(offset, mynoise) * AREA_SIZE;
+                const float3 offsetTransformed = offset * AREA_SIZE;
 
                 // compute position