Changeset 2901 for GTP/trunk/App/Demos

Timestamp:

09/04/08 10:14:18 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling

Files:

• FriendlyCulling.vcproj (modified) (1 diff)
• default.env (modified) (1 diff)
• src/DeferredRenderer.cpp (modified) (13 diffs)
• src/DeferredRenderer.h (modified) (2 diffs)
• src/SampleGenerator.cpp (modified) (4 diffs)
• src/SampleGenerator.h (modified) (4 diffs)
• src/chcdemo.cpp (modified) (5 diffs)
• src/shaderenv.h (modified) (2 diffs)
• src/shaders/ssao3d.cg (added)

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

@@ -808 +808 @@
                         </File>
                         <File
-                                RelativePath=".\src\shaders\ssao2.cg"
+                                RelativePath=".\src\shaders\ssao3d.cg"
                                 >
                         </File>

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

@@ -19 +19 @@
 # shader stuff
 
-# ssao exponential smoothing factor
-expFactor=0.1f
-#numSsaoSamples=8
+# ssao temporal coherence factor
+tempCohFactor=100.0f

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

@@ -119 +119 @@
 static void GenerateSamples(int sampling)
 {
-        static SphericalSampleGenerator gauss(NUM_SAMPLES, 0.5f);
+        SphericalSampleGenerator gauss(NUM_SAMPLES, 1.0f);
         gauss.Generate((float *)samples3);
-/*
+        
+        /*
         switch (sampling)
         {
@@ -150 +151 @@
         float *randomNormals = new float[w * h * 3];
 
+        //SphericalSampleGenerator gauss(w * h, 1.0f);
+        //gauss.Generate(randomNormals);
+
         static HaltonSequence halton;
         float r[2];
@@ -158 +162 @@
                 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;*/
+                
+                //const float theta = 2.0f * acos(sqrt(1.0f - rx));
+                //randomNormals[i + 0] = cos(theta);
+                //randomNormals[i + 1] = sin(theta);
+                //randomNormals[i + 2] = 0;
 
                 const float theta = 2.0f * acos(sqrt(1.0f - r[0]));
@@ -272 +275 @@
                                                                 CG_SOURCE,
                                                                 //"src/shaders/ssao.cg", 
-                                                                "src/shaders/ssao2.cg", 
+                                                                "src/shaders/ssao3d.cg", 
                                                                 RenderState::sCgFragmentProfile,
                                                                 "main",
@@ -294 +297 @@
                 sOldTexParam = cgGetNamedParameter(sCgSsaoProgram, "oldTex");  
                 
-                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
+                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(1.0f, 3.0f));
                 sSamplesParam = cgGetNamedParameter(sCgSsaoProgram, "samples");
         }
@@ -328 +331 @@
                 sOldIllumTexGiParam = cgGetNamedParameter(sCgGiProgram, "oldIllumTex");  
 
-                cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
+                cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(1.0f, 3.0f));
         }
         else
@@ -421 +424 @@
                                                           const Matrix4x4 &oldProjViewMatrix,
                                                           const Matrix4x4 &projViewMatrix,
-                                                          float expFactor,
+                                                          float tempCohFactor,
                                                           ShadowMap *shadowMap)
 {
@@ -462 +465 @@
         {
         case SSAO:
-                ComputeSsao(fbo, expFactor, oldProjViewMatrix, projViewMatrix);
+                ComputeSsao(fbo, tempCohFactor, oldProjViewMatrix, projViewMatrix);
                 CombineSsao(fbo);
                 break;
         case GI:
-                ComputeGlobIllum(fbo, expFactor, oldProjViewMatrix);
+                ComputeGlobIllum(fbo, tempCohFactor, oldProjViewMatrix);
                 CombineIllum(fbo);
                 break;
@@ -492 +495 @@
 
 void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, 
-                                                                   float expFactor,
+                                                                   float tempCohFactor,
                                                                    const Matrix4x4 &oldProjViewMatrix,
                                                                    const Matrix4x4 &projViewMatrix
@@ -550 +553 @@
         cgGLSetParameter1f(sMaxDepthParam, mScaleFactor);
         
-        cgGLSetParameter1f(sTemporalCoherenceParam, (mUseTemporalCoherence && !mRegenerateSamples) ? 255 : 0);
+        cgGLSetParameter1f(sTemporalCoherenceParam, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
 
         if (mUseTemporalCoherence || mRegenerateSamples)
@@ -716 +719 @@
 
 void DeferredRenderer::ComputeGlobIllum(FrameBufferObject *fbo, 
-                                                                  float expFactor,
-                                                                  const Matrix4x4 &oldProjViewMatrix
-                                                                  )
+                                                                                float tempCohFactor,
+                                                                                const Matrix4x4 &oldProjViewMatrix)
 {
         cgGLSetMatrixParameterfc(sOldModelViewProjMatrixGiParam, (const float *)oldProjViewMatrix.x);
 
-        //GLuint colorsTex = mFbo->GetColorBuffer(0)->GetTexture();
         GLuint colorsTex = fbo->GetColorBuffer(3)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
@@ -740 +741 @@
 
         // read the second buffer, write to the first buffer
-        //mNewFbo->Bind();
         mFbo->Bind();
 
         glDrawBuffers(2, mrt + mFboIndex);
 
-        //GLuint oldSsaoTex = mOldFbo->GetColorBuffer(0)->GetTexture();
-        //GLuint oldIllumTex = mOldFbo->GetColorBuffer(1)->GetTexture();
-        
         GLuint oldSsaoTex = mFbo->GetColorBuffer(2 - mFboIndex)->GetTexture();
         GLuint oldIllumTex = mFbo->GetColorBuffer(2 - mFboIndex + 1)->GetTexture();
@@ -776 +773 @@
         cgGLSetParameter1f(sMaxDepthGiParam, mScaleFactor);
 
-        cgGLSetParameter1f(sTemporalCoherenceGiParam, (mUseTemporalCoherence && !mRegenerateSamples) ? 255 : 0);
+        cgGLSetParameter1f(sTemporalCoherenceGiParam, (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
 
 

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

@@ -41 +41 @@
                         const Matrix4x4 &oldProjViewMatrix, 
                                 const Matrix4x4 &projViewMatrix, 
-                                float expFactor, 
+                                float tempCohFactor, 
                                 ShadowMap *shadowMap = NULL);
 
@@ -62 +62 @@
 protected:
 
-        void ComputeSsao(FrameBufferObject *fbo, float expFactor, const Matrix4x4 &oldProjViewMatrix, const Matrix4x4 &projViewMatrix);
+        void ComputeSsao(FrameBufferObject *fbo, float tempCohFactor, const Matrix4x4 &oldProjViewMatrix, const Matrix4x4 &projViewMatrix);
 
-        void ComputeGlobIllum(FrameBufferObject *fbo, float expFactor, const Matrix4x4 &oldProjViewMatrix);
+        void ComputeGlobIllum(FrameBufferObject *fbo, float tempCohFactor, const Matrix4x4 &oldProjViewMatrix);
 
         void FirstPass(FrameBufferObject *fbo);

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

@@ -1 +1 @@
 #include "common.h"
 #include "SampleGenerator.h"
-#include "Halton.h"
+
 
 using namespace std;
 
-//SampleGenerator::SampleGenerator() {}
+HaltonSequence SphericalSampleGenerator::sHalton;
+HaltonSequence PoissonDiscSampleGenerator::sHalton;
+HaltonSequence GaussianSampleGenerator::sHalton;
+
 
 SampleGenerator::SampleGenerator(int numSamples, float radius):
@@ -98 +101 @@
 void GaussianSampleGenerator::Generate(float *samples) const
 {
-        static HaltonSequence halton;
         float r[2];
 
@@ -110 +112 @@
         for (int i = 0; i < mNumSamples; ++ i)
         {
-                halton.GetNext(2, r);
+                sHalton.GetNext(2, r);
 
                 float exp_x = -(r[0] * r[0]) / (2.0f * sigma * sigma);
@@ -130 +132 @@
 void SphericalSampleGenerator::Generate(float *samples) const
 {
-        static HaltonSequence halton;
         float r[2];
+        Sample3 *s = (Sample3 *)samples;
 
-        Sample3 *s = (Sample3 *)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)
         {
-                halton.GetNext(2, r);
+                //sHalton.GetNext(2, r);
+                r[0] = pSamples[i].x; r[1] = pSamples[i].y;
 
                 // 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];
+ 
+                s[i].x = mRadius * sin(theta) * cos(phi);
+                s[i].y = mRadius * sin(theta) * sin(phi);
+                s[i].z = mRadius * cos(theta);
+        }
 
-                s[i].x = sin(theta) * cos(phi);
-                s[i].y = sin(theta) * sin(phi);
-                s[i].z = cos(theta);
-        }
+        delete [] pSamples;
 }

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

@@ -1 +1 @@
 #ifndef __SAMPLEGENERATOR_H
 #define __SAMPLEGENERATOR_H
+
+#include "Halton.h"
 
 
@@ -52 +54 @@
 
         virtual void Generate(float *samples) const;
+
+protected:
+
+        static HaltonSequence sHalton;
 };
 
@@ -62 +68 @@
 
         virtual void Generate(float *samples) const;
+
+protected:
+
+        static HaltonSequence sHalton;
 };
 
@@ -72 +82 @@
 
         virtual void Generate(float *samples) const;
+
+protected:
+
+        static HaltonSequence sHalton;
 };
 

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

@@ -156 +156 @@
 bool useTemporalCoherence = true;
 
-static float ssaoExpFactor = 0.1f;
+static float ssaoTempCohFactor = 255.0;
 
 bool showAlgorithmTime = false;
@@ -303 +303 @@
 
                 env.GetBoolParam(string("useFullScreen"), useFullScreen);
-                env.GetFloatParam(string("expFactor"), ssaoExpFactor);
+                env.GetFloatParam(string("tempCohFactor"), ssaoTempCohFactor);
                 env.GetVectorParam(string("camPosition"), camPos);
                 env.GetVectorParam(string("camDirection"), camDir);
@@ -324 +324 @@
                 cout << "useLODs: " << useLODs << endl;
                 cout << "camPosition: " << camPos << endl;
-                cout << "expFactor: " << ssaoExpFactor << endl;
+                cout << "temporal coherence: " << ssaoTempCohFactor << endl;
 
                 //cout << "model path: " << model_path << endl;
@@ -1032 +1032 @@
 
                 ShadowMap *sm = showShadowMap ? shadowMap : NULL;
-                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoExpFactor, sm);
+                ssaoShader->Render(fbo, oldViewProjMatrix, matProjectionView, ssaoTempCohFactor, sm);
         }
 
@@ -1142 +1142 @@
                 break;
         case '7':
-                ssaoExpFactor *= 0.5f;
+                ssaoTempCohFactor *= 0.5f;
                 break;
         case '8':
-                ssaoExpFactor *= 2.0f;
-                if (ssaoExpFactor > 1.0f) ssaoExpFactor = 1.0f;
+                ssaoTempCohFactor *= 2.0f;
+                //if (ssaoTempCohFactor > 1.0f) ssaoExpFactor = 1.0f;
                 break;
         case '9':

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

@@ -5 +5 @@
 //#define NUM_SAMPLES 16
 
-// rule of thumb: approx 1 / NUM_SAMPLES
-//#define SAMPLE_INTENSITY 0.14f
+
+// for linear falloff
+//#define SAMPLE_INTENSITY 500.0f
+//#define SAMPLE_INTENSITY 100.0f
+
+// for quadradtc falloff
 //#define SAMPLE_INTENSITY 0.28f
-#define SAMPLE_INTENSITY 0.32f
+//#define SAMPLE_INTENSITY 0.32f
+#define SAMPLE_INTENSITY 2.4f
 
-//#define AREA_SIZE 18e-1f
+//#define AREA_SIZE 25e-1f
+//#define AREA_SIZE 6e-1f
 #define AREA_SIZE 8e-1f
 //#define AREA_SIZE 5e-1f
@@ -17 +23 @@
 //#define VIEW_CORRECTION_SCALE 0.1f
 
-//#define DISTANCE_SCALE 1e-6f
+//#define DISTANCE_SCALE 5e-7f
 #define DISTANCE_SCALE 1e-6f
+//#define DISTANCE_SCALE 1.0f
 
 #define ILLUM_INTENSITY 5e-1f;