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

Timestamp:

09/03/08 01:57:45 (16 years ago)

Author:

mattausch

Message:

improved shadow mapping

File:

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

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

@@ -50 +50 @@
 static CGparameter sNoiseTexParam;
 static CGparameter sNoiseMultiplierParam;
-static CGparameter sExpFactorParam;
-
+static CGparameter sTemporalCoherenceParam;
 
 
@@ -69 +68 @@
 static CGparameter sNoiseTexGiParam;
 static CGparameter sNoiseMultiplierGiParam;
-static CGparameter sExpFactorGiParam;
+static CGparameter sTemporalCoherenceGiParam;
 
 
@@ -299 +298 @@
                 cgGLLoadProgram(sCgSsaoProgram);
 
-                // we need size of texture for scaling
                 sPositionsTexParam = cgGetNamedParameter(sCgSsaoProgram, "positions");  
                 sColorsTexParam = cgGetNamedParameter(sCgSsaoProgram, "colors");  
@@ -308 +306 @@
                 sOldModelViewProjMatrixParam = cgGetNamedParameter(sCgSsaoProgram, "oldModelViewProj");
                 sMaxDepthParam = cgGetNamedParameter(sCgSsaoProgram, "maxDepth");
-                sExpFactorParam = cgGetNamedParameter(sCgSsaoProgram, "expFactor");
+                sTemporalCoherenceParam = cgGetNamedParameter(sCgSsaoProgram, "temporalCoherence");
 
                 sOldTexParam = cgGetNamedParameter(sCgSsaoProgram, "oldTex");  
@@ -339 +337 @@
                 sOldModelViewProjMatrixGiParam = cgGetNamedParameter(sCgGiProgram, "oldModelViewProj");
                 sMaxDepthGiParam = cgGetNamedParameter(sCgGiProgram, "maxDepth");
-                sExpFactorGiParam = cgGetNamedParameter(sCgGiProgram, "expFactor");
+                sTemporalCoherenceGiParam = cgGetNamedParameter(sCgGiProgram, "temporalCoherence");
 
                 sSamplesGiParam = cgGetNamedParameter(sCgGiProgram, "samples");
@@ -437 +435 @@
 
 void DeferredRenderer::Render(FrameBufferObject *fbo, 
-                                                const Matrix4x4 &oldProjViewMatrix,
-                                                float expFactor,
-                                                ShadowMap *shadowMap)
-{
-        
+                                                          const Matrix4x4 &oldProjViewMatrix,
+                                                          float expFactor,
+                                                          ShadowMap *shadowMap)
+{
         // switch roles of old and new fbo
         // the algorihm uses two input fbos, where the one
         // contais the color buffer from the last frame, 
         // the other one will be written
+
+        mFboIndex = 2 - mFboIndex;
         //swap(mNewFbo, mOldFbo);       
-        mFboIndex = 2 - mFboIndex;
+
         FrameBufferObject::Release();
 
@@ -463 +462 @@
         glLoadIdentity();
 
+        const float offs = 0.5f;
+        glOrtho(-offs, offs, -offs, offs, 0, 1);
+
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
         glLoadIdentity();
-
-        const float offs = 0.5f;
-        glOrtho(-offs, offs, -offs, offs, 0, 1);
 
         if (shadowMap)
@@ -557 +556 @@
         cgGLSetParameter1f(sMaxDepthParam, mScaleFactor);
         
+        cgGLSetParameter1f(sTemporalCoherenceParam, (mUseTemporalCoherence && !mRegenerateSamples) ? 255 : 0);
 
         if (mUseTemporalCoherence || mRegenerateSamples)
@@ -570 +570 @@
         }
 
-        cgGLSetParameter1f(sExpFactorParam, mUseTemporalCoherence ? expFactor : 1.0f);
-
         Vector3 tl, tr, bl, br;
         ComputeViewVectors(tl, tr, bl, br);
@@ -782 +780 @@
         cgGLSetParameter1f(sMaxDepthGiParam, mScaleFactor);
 
+        cgGLSetParameter1f(sTemporalCoherenceGiParam, (mUseTemporalCoherence && !mRegenerateSamples) ? 255 : 0);
+
 
         if (mUseTemporalCoherence || mRegenerateSamples)
@@ -787 +787 @@
                 mRegenerateSamples = false;
                 cgGLSetParameter1f(sNoiseMultiplierGiParam, RandomValue(3.0f, 17.0f));
-                cgGLSetParameter1f(sExpFactorGiParam, expFactor);
 
                 // q: should we generate new samples or only rotate the old ones?
@@ -796 +795 @@
         }
 
-        cgGLSetParameter1f(sExpFactorParam, mUseTemporalCoherence ? expFactor : 1.0f);
 
         Vector3 tl, tr, bl, br;
@@ -1004 +1002 @@
 }
 
+
+void DeferredRenderer::SetShadingMethod(SHADING_METHOD s)
+{
+        if (s != mShadingMethod)
+        {
+                mShadingMethod = s; 
+                mRegenerateSamples = true;
+        }
+}
+
 } // namespace