Changeset 2903 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

Timestamp:

09/04/08 15:00:42 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp (modified) (20 diffs)

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

@@ -47 +47 @@
 static CGparameter sOldTexParam;
 static CGparameter sNoiseTexParam;
-static CGparameter sNoiseMultiplierParam;
 static CGparameter sTemporalCoherenceParam;
 
@@ -65 +64 @@
 static CGparameter sOldIllumTexGiParam;
 static CGparameter sNoiseTexGiParam;
-static CGparameter sNoiseMultiplierGiParam;
 static CGparameter sTemporalCoherenceGiParam;
 
@@ -92 +90 @@
 static CGparameter sSampleWidthParam;
 
+//#define USE_3D_SSAO
 
 
@@ -97 +96 @@
 
 // ssao random spherical samples
+#ifdef USE_3D_SSAO
+
+static Sample2 samples3[NUM_SAMPLES];
+
+#else
+
 static Sample2 samples2[NUM_SAMPLES];
-static Sample2 samples3[NUM_SAMPLES];
+
+#endif
 
 static int colorBufferIdx = 0;
@@ -119 +125 @@
 static void GenerateSamples(int sampling)
 {
-        SphericalSampleGenerator gauss(NUM_SAMPLES, 1.0f);
-        gauss.Generate((float *)samples3);
-        
-        /*
+#ifdef USE_3D_SSAO
+
+        SphericalSampleGenerator sph(NUM_SAMPLES, 1.0f);
+        sph.Generate((float *)samples3);
+
+#else
         switch (sampling)
         {
         case DeferredRenderer::POISSON:
                 {
-                        static PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
+                        PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
                         poisson.Generate((float *)samples2);
                 }
@@ -133 +141 @@
         case DeferredRenderer::GAUSS:
                 {
-                        //static GaussianSampleGenerator gauss(NUM_SAMPLES, 0.5f);
-                        //gauss.Generate((float *)samples2);
-
-                        static SphericalSampleGenerator gauss(NUM_SAMPLES, 0.5f);
-                        gauss.Generate((float *)samples3);
+                        //PoissonDiscSampleGenerator poisson(NUM_SAMPLES, 1.0f);
+                        //poisson.Generate((float *)samples2);
+
+                        PseudoRandomGenerator pseudo(NUM_SAMPLES, 1.0f);
+                        pseudo.Generate((float *)samples2);
                 }
                 break;
         default:
+                cout << "should not come here" << endl;
                 break;
-        }*/
+        }
+#endif
 }
 
@@ -151 +161 @@
         float *randomNormals = new float[w * h * 3];
 
-        //SphericalSampleGenerator gauss(w * h, 1.0f);
-        //gauss.Generate(randomNormals);
-
         static HaltonSequence halton;
         float r[2];
@@ -159 +166 @@
         for (int i = 0; i < w * h * 3; i += 3)
         {
-                // create random samples on a circle
-                halton.GetNext(2, r);
-
                 
-                //const float theta = 2.0f * acos(sqrt(1.0f - rx));
-                //randomNormals[i + 0] = cos(theta);
-                //randomNormals[i + 1] = sin(theta);
-                //randomNormals[i + 2] = 0;
+#ifdef USE_3D_SSAO
+                //halton.GetNext(2, r);
+                r[0] = RandomValue(0, 1);
+                r[1] = RandomValue(0, 1);
 
                 const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
@@ -174 +178 @@
                 randomNormals[i + 1] = sin(theta) * sin(phi);
                 randomNormals[i + 2] = cos(theta);
+#else
+                // create random samples on a circle
+                r[0] = RandomValue(0, 1);
+                //halton.GetNext(1, r);
+
+                const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
+                
+                randomNormals[i + 0] = cos(theta);
+                randomNormals[i + 1] = sin(theta);
+                randomNormals[i + 2] = 0;
+#endif
         }
 
@@ -274 +289 @@
                 cgCreateProgramFromFile(context, 
                                                                 CG_SOURCE,
-                                                                //"src/shaders/ssao.cg", 
+#ifdef USE_3D_SSAO
                                                                 "src/shaders/ssao3d.cg", 
+
+#else
+                                                                "src/shaders/ssao.cg", 
+#endif
                                                                 RenderState::sCgFragmentProfile,
                                                                 "main",
@@ -288 +307 @@
                 sNormalsTexParam = cgGetNamedParameter(sCgSsaoProgram, "normals");  
                 sNoiseTexParam = cgGetNamedParameter(sCgSsaoProgram, "noiseTexture");
-                sNoiseMultiplierParam = cgGetNamedParameter(sCgSsaoProgram, "noiseMultiplier");
                 
                 sOldModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "oldModelViewProj");
@@ -297 +315 @@
                 sOldTexParam = cgGetNamedParameter(sCgSsaoProgram, "oldTex");  
                 
-                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(1.0f, 3.0f));
                 sSamplesParam = cgGetNamedParameter(sCgSsaoProgram, "samples");
         }
@@ -320 +337 @@
                 sNormalsTexGiParam = cgGetNamedParameter(sCgGiProgram, "normals");  
                 sNoiseTexGiParam = cgGetNamedParameter(sCgGiProgram, "noiseTexture");
-                sNoiseMultiplierGiParam = cgGetNamedParameter(sCgGiProgram, "noiseMultiplier");
                 
                 sOldModelViewProjMatrixGiParam = cgGetNamedParameter(sCgGiProgram, "oldModelViewProj");
@@ -330 +346 @@
                 sOldSsaoTexGiParam = cgGetNamedParameter(sCgGiProgram, "oldSsaoTex");  
                 sOldIllumTexGiParam = cgGetNamedParameter(sCgGiProgram, "oldIllumTex");  
-
-                cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(1.0f, 3.0f));
         }
         else
@@ -500 +514 @@
                                                                    )
 {
+#ifdef USE_3D_SSAO
         static Matrix4x4 biasMatrix(0.5f, 0.0f, 0.0f, 0.5f,
                                                                 0.0f, 0.5f, 0.0f, 0.5f,
@@ -507 +522 @@
         Matrix4x4 m = projViewMatrix * biasMatrix; 
 
+        cgGLSetMatrixParameterfc(sModelViewProjMatrixParam, (const float *)m.x);
+#endif
+
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
-        cgGLSetMatrixParameterfc(sModelViewProjMatrixParam, (const float *)m.x);
 
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
@@ -558 +575 @@
         {
                 mRegenerateSamples = false;
-                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
 
                 // q: should we generate new samples or only rotate the old ones?
@@ -565 +581 @@
                 GenerateSamples(mSamplingMethod); 
 
-                //cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples2);
+#ifdef USE_3D_SSAO
                 cgGLSetParameterArray3f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples3);
+#else
+                cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples2);
+#endif
         }
 
@@ -779 +798 @@
         {
                 mRegenerateSamples = false;
-                cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
 
                 // q: should we generate new samples or only rotate the old ones?
@@ -785 +803 @@
                 // needs longer to converge
                 GenerateSamples(mSamplingMethod); 
+
+#ifdef USE_3D_SSAO
+                cgGLSetParameterArray3f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples3);
+#else
                 cgGLSetParameterArray2f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples2);
+#endif
         }