Changeset 2874 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp

Timestamp:

08/27/08 16:14:10 (16 years ago)

Author:

mattausch

Message:

implemented glob-illum solution

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/SsaoShader.cpp (modified) (6 diffs)

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

@@ -106 +106 @@
 mScaleFactor(scaleFactor)
 {
-        
         ///////////
         //-- the flip-flop fbos
@@ -222 +221 @@
                 sNoiseMultiplierGiParam = cgGetNamedParameter(sCgGiProgram, "noiseMultiplier");
                 
-                sOldModelViewProjMatrixParam = cgGetNamedParameter(sCgGiProgram, "oldModelViewProj");
+                sOldModelViewProjMatrixGiParam = cgGetNamedParameter(sCgGiProgram, "oldModelViewProj");
                 sMaxDepthGiParam = cgGetNamedParameter(sCgGiProgram, "maxDepth");
                 sExpFactorGiParam = cgGetNamedParameter(sCgGiProgram, "expFactor");
@@ -272 +271 @@
         swap(mNewFbo, mOldFbo); 
 
-        cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
 
         glPushAttrib(GL_VIEWPORT_BIT);
@@ -300 +298 @@
         FirstPass(fbo);
         
-        ComputeSsao(fbo, expFactor);
-        //ComputeGlobIllum(fbo, expFactor);
+        //ComputeSsao(fbo, expFactor, oldProjViewMatrix);
+        ComputeGlobIllum(fbo, expFactor, oldProjViewMatrix);
 
         //Combine(fbo);
@@ -321 +319 @@
 
 
-void SsaoShader::ComputeSsao(FrameBufferObject *fbo, float expFactor)
-{
+void SsaoShader::ComputeSsao(FrameBufferObject *fbo, 
+                                                         float expFactor,
+                                                         const Matrix4x4 &oldProjViewMatrix
+                                                         )
+{
+        cgGLSetMatrixParameterfc(sOldModelViewProjMatrixParam, (const float *)oldProjViewMatrix.x);
+
         GLuint colorsTex = mFbo3->GetColorBuffer(0)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();
@@ -582 +585 @@
 
 
-void SsaoShader::ComputeGlobIllum(FrameBufferObject *fbo, float expFactor)
-{
+void SsaoShader::ComputeGlobIllum(FrameBufferObject *fbo, 
+                                                                  float expFactor,
+                                                                  const Matrix4x4 &oldProjViewMatrix
+                                                                  )
+{
+        cgGLSetMatrixParameterfc(sOldModelViewProjMatrixGiParam, (const float *)oldProjViewMatrix.x);
+
         GLuint colorsTex = mFbo3->GetColorBuffer(0)->GetTexture();
         GLuint positionsTex = fbo->GetColorBuffer(1)->GetTexture();