Changeset 3027

Timestamp:

10/12/08 16:44:53 (16 years ago)

Author:

mattausch

Message:

implemented shader program wrapper

Location:

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

Files:

• DeferredRenderer.cpp (modified) (7 diffs)
• DeferredRenderer.h (modified) (1 diff)

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

@@ -291 +291 @@
         const string fullName = "src/shaders/" + filename + ".cg";
 
-        cout << "fullname: " << fullName << endl;
-
         *program = new ShaderProgram(context, fullName, RenderState::sCgFragmentProfile, functionName);
 
@@ -299 +297 @@
         if (!(*program)->IsValid())
         {
-                cerr << "Program" << functionName << " in " << fullName << " failed to load" << endl;
+                cerr << "Program " << functionName << " in " << fullName << " failed to load" << endl;
                 return false;
         }
+        
+        cout << "Program " << functionName << " in " << fullName << " loaded" << endl;
 
         return true;
@@ -388 +388 @@
                 DownSample(fbo, 1, mDownSampleFbo, 1);
 
-                ComputeSsao(fbo, tempCohFactor, oldProjViewMatrix, projViewMatrix);
+                ComputeSsao(fbo, tempCohFactor, projViewMatrix, oldProjViewMatrix);
                 CombineSsao(fbo);
                 break;
@@ -432 +432 @@
 void DeferredRenderer::ComputeSsao(FrameBufferObject *fbo, 
                                                                    float tempCohFactor,
-                                                                   const Matrix4x4 &oldProjViewMatrix,
-                                                                   const Matrix4x4 &projViewMatrix
+                                                                   const Matrix4x4 &projViewMatrix,
+                                                                   const Matrix4x4 &oldProjViewMatrix
                                                                    )
 {
-        sCgSsaoProgram->SetMatrix("modelViewProj", projViewMatrix);
-        sCgSsaoProgram->SetMatrix("oldModelViewProj", oldProjViewMatrix);
-
 #if 0
         GLuint colorsTex = fbo->GetColorBuffer(colorBufferIdx)->GetTexture();
@@ -456 +453 @@
         glDrawBuffers(1, mrt + mIllumFboIndex);
 
-        Vector3 pos = mCamera->GetPosition();
-
+        const Vector3 pos = mCamera->GetPosition();
         sCgSsaoProgram->SetValue3f("eyePos", pos.x, pos.y, pos.z);
+
         sCgSsaoProgram->SetTexture("colors", colorsTex);
         sCgSsaoProgram->SetTexture("normals", normalsTex);
-        sCgSsaoProgram->SetTexture("oldTex", colorsTex);
+        sCgSsaoProgram->SetTexture("oldTex", oldTex);
         sCgSsaoProgram->SetTexture("noise", noiseTex);
 
         sCgSsaoProgram->SetValue1f("temporalCoherence", (mUseTemporalCoherence && !mRegenerateSamples) ? tempCohFactor : 0);
-        
+
+        sCgSsaoProgram->SetMatrix("modelViewProj", projViewMatrix);
+        sCgSsaoProgram->SetMatrix("oldModelViewProj", oldProjViewMatrix);
 
         if (mUseTemporalCoherence || mRegenerateSamples)
@@ -743 +742 @@
         sCgDeferredShadowProgram->SetTexture("shadowMap", shadowTex);
         sCgDeferredShadowProgram->SetTexture("noise", noiseTex);
+
         sCgDeferredShadowProgram->SetMatrix("shadowMatrix", shadowMatrix);
+
         sCgDeferredShadowProgram->SetValue1f("sampleWidth", 2.0f / shadowMap->GetSize());
 
@@ -846 +847 @@
 
         stopil();
-
-        // cout << "exported buffer" << endl;
 }
 

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

@@ -79 +79 @@
         void ComputeSsao(FrameBufferObject *fbo, 
                                          float tempCohFactor, 
-                                         const Matrix4x4 &oldProjViewMatrix, 
-                                         const Matrix4x4 &projViewMatrix);
+                                         const Matrix4x4 &projViewMatrix,
+                                         const Matrix4x4 &oldProjViewMatrix
+                                         );
 
-        void ComputeGlobIllum(FrameBufferObject *fbo, float tempCohFactor, const Matrix4x4 &projViewMatrix, const Matrix4x4 &oldProjViewMatrix);
+        void ComputeGlobIllum(FrameBufferObject *fbo,
+                                  float tempCohFactor,
+                                                  const Matrix4x4 &projViewMatrix,
+                                                  const Matrix4x4 &oldProjViewMatrix);
 
         void FirstPass(FrameBufferObject *fbo, DirectionalLight *light);