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

Timestamp:

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

Author:

mattausch

Message:

 

File:

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

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);