Changeset 3343

Timestamp:

04/13/09 12:01:13 (16 years ago)

Author:

mattausch

Message:

working really nicely

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• sibenik.env (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (2 diffs)
• src/SampleGenerator.cpp (modified) (4 diffs)
• src/SampleGenerator.h (modified) (1 diff)
• src/shaderenv.h (modified) (1 diff)
• src/shaders/combineSsaoSep.cg (modified) (1 diff)
• src/shaders/ssao.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/sibenik.env

@@ -101 +101 @@
 ssaoUseFullResolution=1
 # ssao kernel radius
-ssaoKernelRadius=1.0f
+ssaoKernelRadius=0.5f
 # ssao sample intensity
-ssaoSampleIntensity=0.9f
+ssaoSampleIntensity=2.0f
 #ssaoSampleIntensity=0.8f
 # ssao temporal coherence factor

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

@@ -234 +234 @@
         default: // SAMPLING_DEFAULT
                 {
-                        RandomSampleGenerator2D g(NUM_SAMPLES, 1.0f);
+                        RandomSampleGenerator2D g(NUM_PRECOMPUTED_SAMPLES, 1.0f);
                         g.Generate((float *)samples2);
                 }
@@ -845 +845 @@
                 {
                         CreateSampleTex(samples2, NUM_PRECOMPUTED_SAMPLES);
-                        cout<<"here34"<<endl;
                 }
                 else

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

@@ -41 +41 @@
         // the maximal possible radius: our radius is a fraction of this radius
         // this is used as a measure of the quality of distribution of the point samples
-        const float rmax = 2.0f * mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
+        //const float rmax = 2.0f * mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
+        float rmax = 0.5f; //mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
 
         // generates poisson distribution on disc
         // start with some thresholds: all samples lie on the circumference of circle
          
-        float minDist = 2.0f * rmax;
+        //float minDist = 2.0f * rmax;
+        float minDist = rmax;
         float sqrMinDist = minDist * minDist;
 
         int tries = 0;
 
-        cout << "minDist before= " << minDist << endl;
+        //cout << "minDist before= " << minDist / rmax << endl;
+        cout << "minDist before= " << rmax << endl;
+
         Sample2 *s = (Sample2 *)samples;
 
@@ -124 +128 @@
         }
 
-        cout << "minDist after= " << (float)minDist / mNumSamples<< " #tries: " << tries << endl;
+        rmax = mRadius * sqrt(1.0f / (2.0f * sqrt(3.0f) * mNumSamples));
+        cout << "minDist after= " << (float)minDist * mNumSamples << " #tries: " << tries << " samples: " << mNumSamples << endl;
+        cout << "minDist after= " << (float)minDist / rmax << " #tries: " << tries << endl;
 }
 
@@ -225 +231 @@
 
 
-QuadraticDiscSampleGenerator2D::QuadraticDiscSampleGenerator2D(int numSamples, float radius):
+QuadraticDiscSampleGenerator2D::QuadraticDiscSampleGenerator2D(int numSamples, 
+                                                                                                                           float radius):
 //PoissonDiscSampleGenerator2D(numSamples, radius)
 RandomSampleGenerator2D(numSamples, radius)
-{}
+{
+}
 
 
@@ -237 +245 @@
         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)

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

@@ -29 +29 @@
 
 /** Class generating random samples on a disc or in a sphere, respectively.
+        Note: Rewrite this!! it does not work well enough, rather, sample generator should
+        be either poisson or halton or random that can be used to create samples on a disc ...
 */
 class SampleGenerator

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

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

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

@@ -249 +249 @@
         }
 
-        OUT.illum_col.xyz = float3(ao.w * 5e-1f, 0, 0);
+        //OUT.illum_col.xyz = float3(ao.w * 5e-1f, 0, 0);
         //OUT.illum_col.xyz = float3(ao.z * 1e-1f);
-        OUT.illum_col.xyz = float3(ao.y * 1e-1f);//, 0, 0);
+        //OUT.illum_col.xyz = float3(ao.y * 1e-1f);//, 0, 0);
         //OUT.illum_col.xyz = ao.xyz;
 

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

@@ -522 +522 @@
         
         float oldWeight = temporalVals.y;
-        float oldIdx = /*temporalCoherence > 1 ? */temporalVals.z/* : 0*/;
+        float oldIdx = temporalCoherence > 1 ? temporalVals.z : 0;
         
 #else