Changeset 2875

Timestamp:

08/27/08 17:22:34 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• SsaoShader.cpp (modified) (7 diffs)
• SsaoShader.h (modified) (2 diffs)
• chcdemo.cpp (modified) (2 diffs)
• shaders/globillum.cg (added)

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

@@ -104 +104 @@
 mWidth(w), mHeight(h), 
 mCamera(cam),
-mScaleFactor(scaleFactor)
+mScaleFactor(scaleFactor),
+mUseTemporalCoherence(true),
+mUseGlobIllum(false)
 {
         ///////////
@@ -140 +142 @@
 
         glDeleteTextures(1, &noiseTex);
+}
+
+
+void SsaoShader::SetUseGlobIllum(bool useGlobIllum)
+{
+        mUseGlobIllum = useGlobIllum;
+}
+
+
+void SsaoShader::SetUseTemporalCoherence(bool temporal)
+{
+        mUseTemporalCoherence = temporal;
 }
 
@@ -198 +212 @@
                 GenerateSamples(); 
                 cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples);
+
+                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
         }
         else
@@ -233 +249 @@
                 GenerateSamples(); 
                 cgGLSetParameterArray2f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples);
+
+                cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
         }
         else
@@ -298 +316 @@
         FirstPass(fbo);
         
-        //ComputeSsao(fbo, expFactor, oldProjViewMatrix);
-        ComputeGlobIllum(fbo, expFactor, oldProjViewMatrix);
-
-        //Combine(fbo);
+        if (!mUseGlobIllum)
+                ComputeSsao(fbo, expFactor, oldProjViewMatrix);
+        else
+                ComputeGlobIllum(fbo, expFactor, oldProjViewMatrix);
+
         AntiAliasing(fbo);
 
@@ -363 +382 @@
         cgGLSetTextureParameter(sOldTexParam, oldTex);
         cgGLEnableTextureParameter(sOldTexParam);
-
-        cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
         
         cgGLSetParameter1f(sMaxDepthParam, mScaleFactor);
-        cgGLSetParameter1f(sExpFactorParam, expFactor);
-
-
-        // q: should we generate new samples or only rotate the old ones?
-        // in the first case, the sample patterns look nicer, but the kernel
-        // needs longer to converge
-        GenerateSamples(); 
-        cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples);
+        
+        if (mUseTemporalCoherence)
+        {
+                cgGLSetParameter1f(sNoiseMultiplierParam, RandomValue(3.0f, 17.0f));
+                cgGLSetParameter1f(sExpFactorParam, expFactor);
+
+
+                // q: should we generate new samples or only rotate the old ones?
+                // in the first case, the sample patterns look nicer, but the kernel
+                // needs longer to converge
+                GenerateSamples(); 
+                cgGLSetParameterArray2f(sSamplesParam, 0, NUM_SAMPLES, (const float *)samples);
+        }
+        else
+        {
+                        cgGLSetParameter1f(sExpFactorParam, 1.0f);
+        }
 
         Vector3 tl, tr, bl, br;
@@ -638 +664 @@
         cgGLEnableTextureParameter(sOldIllumTexGiParam);
 
-        cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
-        
         cgGLSetParameter1f(sMaxDepthGiParam, mScaleFactor);
-        cgGLSetParameter1f(sExpFactorGiParam, expFactor);
-
-
-        // q: should we generate new samples or only rotate the old ones?
-        // in the first case, the sample patterns look nicer, but the kernel
-        // needs longer to converge
-        GenerateSamples(); 
-        cgGLSetParameterArray2f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples);
+
+
+        if (mUseTemporalCoherence)
+        {
+                cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
+                cgGLSetParameter1f(sExpFactorGiParam, expFactor);
+
+
+                // q: should we generate new samples or only rotate the old ones?
+                // in the first case, the sample patterns look nicer, but the kernel
+                // needs longer to converge
+                GenerateSamples(); 
+                cgGLSetParameterArray2f(sSamplesGiParam, 0, NUM_SAMPLES, (const float *)samples);
+        }
+        else
+        {
+                        cgGLSetParameter1f(sExpFactorGiParam, 1.0f);
+        }
 
         Vector3 tl, tr, bl, br;

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

@@ -44 +44 @@
         ~SsaoShader();
 
-        void SetType(bool useGlobIllum, bool useTemporalCoherence);
+        void SetUseGlobIllum(bool useGlobIllum);
+        void SetUseTemporalCoherence(bool temporal);
+
 
 protected:
@@ -73 +75 @@
         FrameBufferObject *mNewFbo;
         FrameBufferObject *mFbo3;
+
+        bool mUseGlobIllum;
+        bool mUseTemporalCoherence;
 };
 

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

@@ -154 +154 @@
 bool ascendKeyPressed = false;
 
+bool useGlobIllum = false;
 bool useSsao = false;
+bool useTemporalCoherence = true;
+
 static float ssaoExpFactor = 0.1f;
 
@@ -1096 +1099 @@
                 SceneEntity::SetUseLODs(useLODs);
                 break;
+        case 'g':
+        case 'G':
+                useGlobIllum = !useGlobIllum;
+                ssaoShader->SetUseGlobIllum(useGlobIllum);
+                break;
+        case 't':
+        case 'T':
+                useTemporalCoherence = !useTemporalCoherence;
+                ssaoShader->SetUseTemporalCoherence(useTemporalCoherence);
+                break;
         case 'o':
         case 'O':