Changeset 2874 for GTP/trunk/App

Timestamp:

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

Author:

mattausch

Message:

implemented glob-illum solution

Location:

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

Files:

• SsaoShader.cpp (modified) (6 diffs)
• SsaoShader.h (modified) (3 diffs)
• chcdemo.cpp (modified) (1 diff)
• shaders/deferred.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (2 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();

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

@@ -22 +22 @@
 {
 public:
-        /** constructor for a deferred shader taking the requested output image size,
+        /** Constructor for a deferred shader taking the requested output image size,
                 the current camera,     and a scaling factor.
                         
@@ -30 +30 @@
         */
         SsaoShader(int w, int h, Camera *cam, float scaleFactor);
-        /** 
-        
-                The algorithm renders the scene given an fbo consists of 1 color buffer, 
+        /** The algorithm renders the scene given an fbo consists of 1 color buffer, 
                 1 position buffer, and 1 normal buffer.
                 We also need the  projection view matrix of the last frame for reprojection, and
@@ -46 +44 @@
         ~SsaoShader();
 
+        void SetType(bool useGlobIllum, bool useTemporalCoherence);
+
 protected:
 
-        void ComputeSsao(FrameBufferObject *fbo, float expFactor);
+        void ComputeSsao(FrameBufferObject *fbo, float expFactor, const Matrix4x4 &oldProjViewMatrix);
 
-        void ComputeGlobIllum(FrameBufferObject *fbo, float expFactor);
+        void ComputeGlobIllum(FrameBufferObject *fbo, float expFactor, const Matrix4x4 &oldProjViewMatrix);
 
         void FirstPass(FrameBufferObject *fbo);

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

@@ -539 +539 @@
 
         // the diffuse color buffer
-        //fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_MIPMAP_LINEAR, true);
-        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
+        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_MIPMAP_LINEAR, true);
+        //fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, false);
 
         // the positions buffer

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/deferred.cg

@@ -63 +63 @@
         float3 normal = normalize(norm.xyz);// * 2.0f - float4(1.0f));
 
-        float4 col = shade(IN, color, position, normal.xyz, amb);
+        float4 col = shade(IN, color, position, normal, amb);
         
         //OUT.color = float4(1.0f);
         OUT.color = col;
+        OUT.color.w = color.w;
 
         return OUT;

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/ssao.cg

@@ -151 +151 @@
         realPos.w = 1.0f;
 
+        // reproject
         float4 oldPos = mul(oldModelViewProj, realPos);
 
@@ -176 +177 @@
         OUT.illum_col.w = currentDepth;
 
-        
+        //OUT.combined_col = float4(newDepth / oldDepth * 100, 0, 0, 1) ;
+        //OUT.combined_col = float4(newDepth, 0, 0, 1) ;
 
         return OUT;